Changeset 1362 for trunk/lib/CopyrightStats.cc

Timestamp:

Jun 4, 2011, 5:42:45 PM (10 years ago)

Author:

Peter Johansson

Message:

svncopyright: avoid parsing commit if alias already have copyright for that year.

File:

• trunk/lib/CopyrightStats.cc (modified) (3 diffs)

trunk/lib/CopyrightStats.cc

@@ -84 +84 @@
     while (commit->revision() < first_rev)
       ++commit;
+    assert(commit->revision() >= first_rev);
     log_iterator end = log.commits().end();
     // loop over all commits
@@ -92 +93 @@
         assert(yearrev!=year2rev.end());
       }
+      assert(yearrev!=year2rev.end());
+      assert(yearrev->second >= commit->revision());
       
-      // skip if author already has copyright for this year.
-      std::map<int, std::set<Alias> >::const_iterator year_aliases = 
-        year2alias_.find(yearrev->first);
-      
-      SVNblame svn_blame(path_, commit->revision());
-      LineTypeParser parser(path_);
       const std::string& name = commit->author();
-      
       // find username in map of aliases
       std::map<std::string, Alias>::iterator alias = 
@@ -114 +110 @@
         author2alias_[name] = a;
         alias = author2alias_.find(name);
-        assert(alias!=author2alias_.end());
       }
+      assert(alias!=author2alias_.end());
       
+      // skip if alias already has copyright for this year.
+      std::map<int, std::set<Alias> >::const_iterator year_aliases = 
+        year2alias_.find(yearrev->first);
+      if (year_aliases!=year2alias_.end() 
+          && year_aliases->second.count(alias->second))
+        continue;
+      
+      SVNblame svn_blame(path_, commit->revision());
+      LineTypeParser parser(path_);
+
       // loop over lines
       while (svn_blame.valid()) {