Changeset 61 for trunk

Timestamp:

Jan 19, 2006, 2:32:57 PM (17 years ago)

Author:

Peter Johansson

Message:

fixed the problem with parsing from log?

Location:

trunk/lib

Files:

• CommitStat.cc (modified) (5 diffs)
• CommitStat.h (modified) (2 diffs)

trunk/lib/CommitStat.cc

@@ +1 @@
+
 //$Id$
 
@@ -14 +15 @@
   int CommitStat::log(const std::string& path) const
   {
-    std::string system_call = "svn log -q " + path + " > svnstat.log.tmp";
-    std::cout << system_call << std::endl;
-    int system_return = system(system_call.c_str());
+    std::string system_call = "svn log -q -r HEAD:1 " + path + 
+      " > svnstat.log.tmp";
+    int system_return = system(system_call.c_str());
     if (system_return)
       std::cerr << "Error: svn log " << path << std::endl;     
@@ -30 +31 @@
     std::ifstream is("svnstat.log.tmp");
     std::string line;
+    typedef std::vector<std::string>::iterator DateIter;
+    size_t rev_last_iteration=0;
     while (getline(is,line, '\n')){
       if (!line.size()) // skip empty line
@@ -38 +41 @@
         size_t revision;
         ss >> revision;
+        assert(revision);
+          
         std::string tmp;
         ss >> tmp;
@@ -48 +53 @@
         ss >> time;
 
-        date_.resize(std::max(revision+1, date_.size()));
-        date_[revision] = date;
+        if (revision+1 > date_.size()){
+          date_.resize(revision+1);
+          rev_last_iteration=revision;
+        }
+        assert(revision<=rev_last_iteration);
+        std::copy(date_.begin()+revision,
+                  date_.begin()+rev_last_iteration,
+                  date_.begin()+revision);
+        rev_last_iteration=revision;
       }
+      std::copy(date_.begin(),
+                date_.begin()+rev_last_iteration,
+                date_.begin());
     }
     is.close();
     
-    for(std::vector<std::string>::reverse_iterator i=date_.rbegin(); 
-        i!=date_.rend(); ++i)
-      if (i->empty()){
-        assert(i!=date_.rbegin());
-        *i = *(i-1);
-      }
-
     return system_return;
   }

trunk/lib/CommitStat.h

@@ -22 +22 @@
 
     ///
-    /// Function parsing output from 'svn log \a path'.
+    /// Function parsing output from log() \a path'.
     ///
     /// @return return value from system call
@@ -32 +32 @@
   private:
     ///
-    /// @return return value from 'svn log \a path'
+    /// @return return value from 'svn log -q -r 1:HEAD \a path'
     ///
     int log(const std::string& path) const;