Changeset 818

Timestamp:

Aug 9, 2009, 5:27:34 AM (13 years ago)

Author:

Peter Johansson

Message:

fixes #161 and also fixes a bug relate with partial cache in BlameStats. Added two revisions in test repository.

Location:

trunk

Files:

• lib/BlameStats.cc (modified) (2 diffs)
• lib/Configuration.cc (modified) (2 diffs)
• test/repo/db/current (modified) (1 diff)
• test/repo/db/revprops/63 (added)
• test/repo/db/revprops/64 (added)
• test/repo/db/revs/63 (added)
• test/repo/db/revs/64 (added)

trunk/lib/BlameStats.cc

@@ -96 +96 @@
     }
     
-    // filling in pristine revisions
+    // filling in pristine revisions, i.e., revs that are larger than
+    // first_rev and not occuring in revs.
     RevSet::iterator rev_iter=revs.begin();
-    for (svn_revnum_t rev = first_rev; rev<=revision(); ++rev){
-      if (rev==*rev_iter)
+    svn_revnum_t rev = first_rev;
+    while (rev<=revision()) {
+      if (rev_iter!=revs.end() && rev>*rev_iter)
         ++rev_iter;
+      else if (rev_iter!=revs.end() && rev==*rev_iter) {
+        ++rev_iter;
+        ++rev;
+      }
       else {
         fill_in(code_stats(),rev);
@@ -106 +112 @@
         fill_in(other_stats(),rev);
         fill_in(copyright_stats(),rev);
+        ++rev;
       }
     }

trunk/lib/Configuration.cc

@@ -187 +187 @@
         }
       }
+      else if (section == "author-color") {
+        author_color_[lhs] = rhs;
+      }     
       else if (section == "parsing-codons") {
         if (!parsing_found) {
@@ -464 +467 @@
 
     os << "\n"
+       << "### Section for author color in blame output\n"
+       << "[author-color]\n"
+       << "# jdoe = 000000\n";
+    typedef std::map<std::string,std::string> str_map;
+    for (str_map::const_iterator i(conf.author_color_.begin());
+         i!=conf.author_color_.end(); ++i) {
+      os << i->first << " = " << i->second << " \n";
+    }
+
+    os << "\n"
        << "### Section for setting trac environment\n"
        << "[trac]\n"

trunk/test/repo/db/current

@@ -1 @@
-62 1q 4
+64 1y 4