Changeset 543

Timestamp:

Jan 4, 2008, 3:10:54 AM (14 years ago)

Author:

Peter Johansson

Message:

AddStats - number of added lines is counted - fixes ticket:82

Location:

trunk/lib

Files:

• AddStats.cc (copied) (copied from trunk/lib/BlameStats.cc) (8 diffs)
• AddStats.h (copied) (copied from trunk/lib/BlameStats.h) (3 diffs)
• Makefile.am (modified) (4 diffs)
• StatsCollection.cc (modified) (2 diffs)

trunk/lib/AddStats.cc

@@ -2 +2 @@
 
 /*
-  Copyright (C) 2005 Peter Johansson
-  Copyright (C) 2006, 2007 Jari Häkkinen, Peter Johansson
+  Copyright (C) 2008 Peter Johansson
 
   This file is part of svndigest, http://trac.thep.lu.se/svndigest
@@ -23 +22 @@
 */
 
-#include "BlameStats.h"
+#include "AddStats.h"
 
-#include "Functor.h"
-#include "GnuplotFE.h"
 #include "SVNblame.h"
-#include "SVNinfo.h"
 #include "SVNlog.h"
 #include "utility.h"
@@ -35 +31 @@
 #include <cassert>
 #include <cstdlib>
-#include <fstream>
-#include <iostream>
-#include <iterator>
 #include <map>
-#include <numeric>
 #include <string>
-#include <sstream>
-#include <unistd.h>
-#include <utility>
 #include <vector>
 
+//debug
+#include <iostream>
 
 namespace theplu{
@@ -51 +42 @@
 
 
-  BlameStats::BlameStats(const std::string& path)
+  AddStats::AddStats(const std::string& path)
     : Stats(path)
   {
@@ -57 +48 @@
 
 
-  BlameStats::BlameStats(const BlameStats& other)
+  AddStats::AddStats(const AddStats& other)
   : Stats(other)
   {
@@ -63 +54 @@
 
 
-  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)
+  void AddStats::do_parse(const std::string& path)
   {
     Parser parser(path);
@@ -87 +65 @@
       SVNblame svn_blame(path, *rev_iter);
       while (svn_blame.valid()) {
-        add(svn_blame.author(), *rev_iter, parser.parse(svn_blame.line()));
+        std::cout << path << " " << *rev_iter << " " << svn_blame.revision() << " " << svn_blame.author() << "\n";
+        if (*rev_iter==svn_blame.revision())
+          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());
@@ -94 +74 @@
     }
     
-    // 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);
-      }
-    }
+    accumulate_stats();
   }
 

trunk/lib/AddStats.h

@@ -1 @@
-#ifndef _theplu_svndigest_blame_stats_
-#define _theplu_svndigest_blame_stats_
+#ifndef _theplu_svndigest_add_stats_
+#define _theplu_svndigest_add_stats_
 
 // $Id$
 
 /*
-  Copyright (C) 2005 Peter Johansson
-  Copyright (C) 2006 Jari Häkkinen, Peter Johansson
-  Copyright (C) 2007 Peter Johansson
+  Copyright (C) 2008 Peter Johansson
 
   This file is part of svndigest, http://trac.thep.lu.se/svndigest
@@ -35 +33 @@
   /// Class taking care of statistics from svn.
   ///
-  class BlameStats : public Stats
+  class AddStats : public Stats
   {
   public:
@@ -41 +39 @@
     /// @brief Default Constructor 
     ///
-    explicit BlameStats(const std::string& path);
+    explicit AddStats(const std::string& path);
 
-    BlameStats(const BlameStats& other);
+    AddStats(const AddStats& other);
 
   private:
     void do_parse(const std::string&);
-    void fill_in(Author2Vector&, svn_revnum_t rev);
 
   };

trunk/lib/Makefile.am

@@ -26 +26 @@
 noinst_LTLIBRARIES = libsvndigest.la
 
-noinst_HEADERS = Alias.h BlameStats.h ClassicStats.h ColumnStream.h \
+noinst_HEADERS = AddStats.h Alias.h BlameStats.h ClassicStats.h ColumnStream.h \
   Commitment.h Configuration.h css.h\
   Date.h Directory.h File.h first_page.h Functor.h Gnuplot.h GnuplotFE.h \
@@ -33 +33 @@
   SVNinfo.h SVNlog.h SVNproperty.h Trac.h utility.h
 
-libsvndigest_la_SOURCES = Alias.cc BlameStats.cc \
+libsvndigest_la_SOURCES = AddStats.cc Alias.cc BlameStats.cc \
   ClassicStats.cc ColumnStream.cc \
   Commitment.cc Configuration.cc \
@@ -47 +47 @@
 
 clean-local: 
-  rm -rf *~ subversion_info.h 
+  rm -rf *~
 
 all-local:
@@ -66 +66 @@
   revision=`$(SVNVERSION) $(top_srcdir)` ;\
   year=`svn info $(top_srcdir)| sed -n  's/.*Date: \(.*\)-..-.*/\1/p'`;\
-  echo $$year; \
   $(SED) -e 's/sub_2_svn_revision/'$$revision'/g' \
   -e 's/sub_2_svn_year/'$$year'/g'  subversion_info.h.in >> $@ ;

trunk/lib/StatsCollection.cc

@@ -24 +24 @@
 #include "StatsCollection.h"
 
+#include "AddStats.h"
 #include "BlameStats.h"
 #include "ClassicStats.h"
@@ -44 +45 @@
     stats_["classic"] = new ClassicStats(path);
     stats_["blame"] = new BlameStats(path);
+    stats_["add"] = new AddStats(path);
   }