Changeset 654 for trunk/lib/File.cc

Timestamp:

Jun 8, 2008, 6:58:38 AM (15 years ago)

Author:

Peter Johansson

Message:

Hopefully fixes #328 - need to be tested though

File:

• trunk/lib/File.cc (modified) (2 diffs)

trunk/lib/File.cc

@@ -60 +60 @@
 
   std::map<int, std::set<Alias> >
-  File::copyright_map(std::map<std::string, Alias>& alias) const
+  File::copyright_map(std::map<std::string, Alias>& alias,
+                      const std::map<int, svn_revnum_t>& year2rev) const
   {
     using namespace std;
     map<int, set<Alias> > year_authors;
-    SVNlog log(path());
     const Stats& stats = stats_["add"];
-    
-    typedef std::vector<Commitment>::iterator LogIterator;
-    for (LogIterator i=log.commits().begin(); i<log.commits().end(); ++i){
-      if (i->revision() && 
-          (stats(LineTypeParser::code, i->author(), i->revision()) >
-           stats(LineTypeParser::code, i->author(), i->revision()-1) || 
-           stats(LineTypeParser::comment, i->author(), i->revision()) >
-           stats(LineTypeParser::comment, i->author(), i->revision()-1))
-          ) {
+
+    // loop over all years
+    for (std::map<int, svn_revnum_t>::const_iterator rev_iter=year2rev.begin();
+         rev_iter!=year2rev.end(); ++rev_iter) {
+
+      svn_revnum_t last_rev_this_year = rev_iter->second;
+      svn_revnum_t last_rev_last_year = 0;
+      if (rev_iter != year2rev.begin()) {
+        last_rev_last_year = (--rev_iter)->second;
+        ++rev_iter;
+      }
+      // loop over authors
+      for (std::set<std::string>::const_iterator a_iter=stats.authors().begin();
+           a_iter!=stats.authors().end(); ++a_iter) {
+
+        // check if anything has been added since last year
+        if ( (stats(LineTypeParser::code, *a_iter, last_rev_this_year) >
+              stats(LineTypeParser::code, *a_iter, last_rev_last_year)) || 
+             (stats(LineTypeParser::comment, *a_iter, last_rev_this_year) >
+              stats(LineTypeParser::comment, *a_iter, last_rev_last_year)) ) {
         
-        time_t sec = str2time(i->date());
-        tm* timeinfo = gmtime(&sec);
         
-        // find username in map of aliases
-        std::map<string,Alias>::iterator name(alias.lower_bound(i->author()));
-        
-        // if alias exist insert alias
-        if (name != alias.end() && name->first==i->author())
-          year_authors[timeinfo->tm_year].insert(name->second);
-        else {
-          // else insert user name
-          Alias a(i->author(),alias.size());
-          year_authors[timeinfo->tm_year].insert(a);
-          std::cerr << "svndigest: warning: no copyright alias found for `" 
-                    << i->author() << "'\n";
-          // insert alias to avoid multiple warnings.
-          alias.insert(name, std::make_pair(i->author(), a));
+          // find username in map of aliases
+          std::map<string,Alias>::iterator name(alias.lower_bound(*a_iter));
+          
+          // if alias exist insert alias
+          if (name != alias.end() && name->first==*a_iter)
+            year_authors[rev_iter->first].insert(name->second);
+          else {
+            // else insert user name
+            Alias a(*a_iter,alias.size());
+            year_authors[rev_iter->first].insert(a);
+            std::cerr << "svndigest: warning: no copyright alias found for `" 
+                      << *a_iter << "'\n";
+            // insert alias to avoid multiple warnings.
+            alias.insert(name, std::make_pair(*a_iter, a));
+          }
         }
       }
@@ -302 +312 @@
       return;
     }
-    std::map<int, std::set<Alias> > map=copyright_map(alias);
+    std::map<int, std::set<Alias> > map=copyright_map(alias, y2rev);
     std::string new_block = copyright_block(map, prefix);
     if (old_block==new_block)