Changeset 784 for branches/replacing_gnuplot/lib/File.cc

Timestamp:

Apr 9, 2009, 10:18:54 PM (12 years ago)

Author:

Jari Häkkinen

Message:

Merged trunk changes r645:782 to replacing_gnuplot branch.

Location:

branches/replacing_gnuplot

Files:

• . (modified) (1 prop)
• lib/File.cc (modified) (10 diffs)

branches/replacing_gnuplot

@@ -8 +8 @@
 autom4te.cache
 INSTALL
-COPYING
 aclocal.m4
 Makefile

@@ -8 +8 @@
 autom4te.cache
 INSTALL
-COPYING
 aclocal.m4
 Makefile

branches/replacing_gnuplot/lib/File.cc

@@ -3 +3 @@
 /*
   Copyright (C) 2005, 2006, 2007 Jari Häkkinen, Peter Johansson
-
-  This file is part of svndigest, http://trac.thep.lu.se/svndigest
+  Copyright (C) 2009 Peter Johansson
+
+  This file is part of svndigest, http://dev.thep.lu.se/svndigest
 
   svndigest is free software; you can redistribute it and/or modify it
   under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
+  the Free Software Foundation; either version 3 of the License, or
   (at your option) any later version.
 
@@ -17 +18 @@
 
   You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-  02111-1307, USA.
+  along with svndigest. If not, see <http://www.gnu.org/licenses/>.
 */
 
@@ -59 +58 @@
 
 
+  std::string File::blame_output_file_name(void) const
+  {
+    return "blame_output/" + local_path() + ".html";
+  }
+
+
   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));
+          }
         }
       }
@@ -159 +174 @@
 
 
-  SVNlog File::log_core(void) const
-  {
-    return SVNlog(path());
+  void File::log_core(SVNlog&) const
+  {
   }
 
@@ -186 +200 @@
     if (!ignore && node_exist(cache_file)){
       std::ifstream is(cache_file.c_str());
-      if (stats_.load_cache(is)){
+      if (stats_.load_cache(is)) {
+        is.close();
         return stats_;
       }
       is.close();
     }
-    else {
+    else 
       stats_.parse(path_);
-    }
     if (!node_exist(cache_dir))
       mkdir(cache_dir);
-    std::ofstream os(cache_file.c_str());
+    std::string tmp_cache_file(cache_file+"~");
+    std::ofstream os(tmp_cache_file.c_str());
     stats_.print(os);
     os.close();
+    rename(tmp_cache_file.c_str(), cache_file.c_str());
     return stats_;
   }
@@ -205 +221 @@
   void File::print_blame(std::ofstream& os) const
   {
-    os << "<br /><h3>Blame Information</h3>";
+    os << "<br /><h3>" << local_path() << "</h3>";
     os << "<table class=\"blame\">\n";
     os << "<thead>\n";
@@ -286 +302 @@
 
   void File::print_copyright(std::map<std::string, Alias>& alias, 
-                             bool verbose) const 
+                             bool verbose,
+                             const std::map<int,svn_revnum_t>& y2rev) const 
   {
     if (ignore())
@@ -301 +318 @@
       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)
@@ -313 +330 @@
   void File::print_core(const bool verbose) const 
   {
+    std::ofstream os(blame_output_file_name().c_str());
+    assert(os.good());
+    print_html_start(os, "svndigest", level_+1);
+    print_blame(os);
+    print_footer(os);
+    os.close();
   }
 
@@ -343 +366 @@
     print_author_summary(os, stats_[stats_type], line_type, log);
     os << "\n";
-
-    print_blame(os);
+    os << "<h3>"
+       << anchor(blame_output_file_name(), 
+                 "Blame Information", level_+3) 
+       << "</h3>\n";
 
     print_footer(os);

@@ -8 +8 @@
 autom4te.cache
 INSTALL
-COPYING
 aclocal.m4
 Makefile