Changeset 537 for trunk/lib

Timestamp:

Dec 27, 2007, 7:37:39 AM (16 years ago)

Author:

Peter Johansson

Message:

Blame stats is implemented - fixes #24

Location:

trunk/lib

Files:

• BlameStats.cc (modified) (2 diffs)
• BlameStats.h (modified) (1 diff)
• ClassicStats.cc (modified) (1 diff)
• Stats.cc (modified) (4 diffs)
• Stats.h (modified) (4 diffs)

trunk/lib/BlameStats.cc

@@ -29 +29 @@
 #include "SVNblame.h"
 #include "SVNinfo.h"
+#include "SVNlog.h"
 #include "utility.h"
 
@@ -62 +63 @@
 
 
+  void BlameStats::fill_in(Author2Vector& a2v, svn_revnum_t rev)
+  {
+    assert(rev);
+    for (std::set<std::string>::const_iterator iter(authors().begin());
+         iter!=authors().end(); ++iter) {
+      std::vector<u_int>& vec = a2v[*iter];
+      vec.resize(revision()+1);
+      assert(rev<static_cast<svn_revnum_t>(vec.size()));
+      vec[rev]=vec[rev-1];
+    }
+  }
+
+
   void BlameStats::do_parse(const std::string& path)
   {
     Parser parser(path);
-    SVNblame svn_blame(path);
-    while (svn_blame.valid()) {
-      add(svn_blame.author(), svn_blame.revision(), 
-          parser.parse(svn_blame.line()));
-      svn_blame.next_line();
+    SVNlog log(path);
+    typedef std::set<svn_revnum_t> RevSet;
+    RevSet revs;
+    std::copy(log.revision().begin(), log.revision().end(),
+              std::inserter(revs, revs.begin()));
+    for (RevSet::iterator rev_iter=revs.begin();rev_iter!=revs.end();++rev_iter){
+      SVNblame svn_blame(path, *rev_iter);
+      while (svn_blame.valid()) {
+        add(svn_blame.author(), *rev_iter, parser.parse(svn_blame.line()));
+        // I dont trust blame and log behave consistent (stop-on-copy).
+        revs.insert(svn_blame.revision());
+        svn_blame.next_line();
+      }
+    }
+    
+    // filling in pristine revisions
+    RevSet::iterator rev_iter=revs.begin();
+    for (svn_revnum_t rev = 1; rev<=revision(); ++rev){
+      if (rev==*rev_iter)
+        ++rev_iter;
+      else {
+        fill_in(code_,rev);
+        fill_in(comments_,rev);
+        fill_in(other_,rev);
+      }
     }
   }

trunk/lib/BlameStats.h

@@ -47 +47 @@
   private:
     void do_parse(const std::string&);
+    void fill_in(Author2Vector&, svn_revnum_t rev);
 
   };

trunk/lib/ClassicStats.cc

@@ -71 +71 @@
       svn_blame.next_line();
     }
+    accumulate_stats();
+
   }
 

trunk/lib/Stats.cc

@@ -87 +87 @@
       std::vector<u_int>& other = other_[*iter];
       accumulate(other);
-
-      VectorPlus<u_int> vp;
-      total_[*iter] = vp(vp(code, comments),other);
-    }
-    std::vector<u_int> init(revision()+1);
-    code_["all"]=std::accumulate(code_.begin(), code_.end(), init,
-                                 PairValuePlus<std::string,u_int>());
-    comments_["all"]=std::accumulate(comments_.begin(), comments_.end(), init,
-                                     PairValuePlus<std::string,u_int>());
-    other_["all"]=std::accumulate(other_.begin(), other_.end(), init,
-                                  PairValuePlus<std::string,u_int>());
-    VectorPlus<u_int> vp;
-    total_["all"] = vp(vp(code_["all"], comments_["all"]), other_["all"]);
+    }
   }
 
@@ -108 +96 @@
     assert(user.size());
     add_author(user);
-
-    std::vector<u_int>& total = total_[user];
-    if (total.size() < rev+1){
-      total.reserve(revision() + 1);
-      total.insert(total.end(), rev - total.size(), 0);
-      total.push_back(n);
-    }
-    else
-      total[rev]+=n;
 
     std::vector<u_int>& code = code_[user];
@@ -172 +151 @@
   {
     return authors_;
+  }
+
+
+  void Stats::calc_all(void)
+  {
+    std::vector<u_int> init(revision()+1);
+    code_["all"]=std::accumulate(code_.begin(), code_.end(), init,
+                                 PairValuePlus<std::string,u_int>());
+    comments_["all"]=std::accumulate(comments_.begin(), comments_.end(), init,
+                                     PairValuePlus<std::string,u_int>());
+    other_["all"]=std::accumulate(other_.begin(), other_.end(), init,
+                                  PairValuePlus<std::string,u_int>());
+    VectorPlus<u_int> vp;
+    total_["all"] = vp(vp(code_["all"], comments_["all"]), other_["all"]);
+  }
+
+
+  void Stats::calc_total(void)
+  {
+    for (std::set<std::string>::const_iterator iter(authors().begin());
+         iter!=authors().end(); ++iter) {
+      std::vector<u_int>& code = code_[*iter];
+      std::vector<u_int>& comments = comments_[*iter];
+      std::vector<u_int>& other = other_[*iter];
+
+      VectorPlus<u_int> vp;
+      total_[*iter] = vp(vp(code, comments),other);
+    }
+
   }
 
@@ -323 +331 @@
   {
     do_parse(path);
-    accumulate_stats();
+    calc_total();
+    calc_all();
   }
 

trunk/lib/Stats.h

@@ -143 +143 @@
     typedef Author2Vector::const_iterator A2VConstIter;
 
+    void accumulate_stats(void);
     void add_author(std::string);
     void add_authors(std::set<std::string>::const_iterator, 
@@ -169 +170 @@
   private:
     void accumulate(std::vector<u_int>& vec) const;
-    void accumulate_stats(void);
     virtual void do_parse(const std::string&)=0;
     
@@ -175 +175 @@
     // that all old cache files are obsolete.
     inline std::string end_of_cache(void) const 
-    {return "END OF OK CACHE FILE VERSION 300";} 
+    {return "END OF OK CACHE FILE VERSION 4";} 
     inline std::string code_cache(void) const {return "CACHE CODE";} 
     inline std::string comments_cache(void) const {return "CACHE COMMENTS";} 
@@ -183 +183 @@
     
 
+    void calc_all(void);
+    void calc_total(void);
     u_int get_back(const Author2Vector&, std::string user) const;
     void load(std::istream& is, Author2Vector& m);