Changeset 138 for trunk/lib/Stats.cc

Timestamp:

Aug 3, 2006, 11:40:15 PM (15 years ago)

Author:

Jari Häkkinen

Message:

Fixes #23. No system calls to svn are done anymore.

File:

• trunk/lib/Stats.cc (modified) (4 diffs)

trunk/lib/Stats.cc

@@ -26 +26 @@
 
 #include "GnuplotFE.h"
+#include "SVNblame.h"
 #include "SVNinfo.h"
 #include "utility.h"
@@ -32 +33 @@
 #include <cassert>
 #include <cstdlib>
-#include <fstream>
 #include <iostream>
 #include <map>
 #include <numeric>
 #include <string>
+#include <sstream>
 #include <unistd.h>
 #include <utility>
@@ -86 +87 @@
 
   void Stats::add(const std::string& user, const u_int& rev, 
-                  const Parser::line_type lt)
+                  const Parser::line_type& lt)
   {
     authors_.insert(user);
@@ -127 +128 @@
   bool Stats::parse(const std::string& path)
   {
-    // Calling svn blame
-    if (blame(path))
-      return true;
-
-    // Check if file is binary
-    std::ifstream is("/tmp/svnstat.tmp");
-    std::string line;
-    getline(is,line,' ');
-    if (line==std::string("Skipping")){
-      getline(is,line,' ');
-      if (line==std::string("binary")){
-        is.close();
-        return true;
-      }
-    }
-    is.close();
+    SVNblame svn_blame(path);
+    if (svn_blame.binary())
+      return true;
 
     Parser parser(path);
     std::vector<Parser::line_type>::const_iterator count=parser.type().begin();
 
-    is.open("/tmp/svnstat.tmp");
-    while (getline(is,line, '\n')){
-      if (!line.size()) // skip empty line
+    while (const SVNblame::blame_information * bi=svn_blame.next()) {
+      if (!bi->line.size()) { // skip empty line
+        ++count; // keep Parser information in sync with Stats parsing
         continue;
-      std::stringstream ss(line);
-      u_int revision;
-      std::string user;
-      ss >> revision;
-      ss >> user;
+      }
       // to handle symbolic links
       if (count==parser.type().end())
-        add(user, revision, Parser::empty);
+        add(bi->author, bi->revision, Parser::empty);
       else 
-        add(user, revision, *count);
+        add(bi->author, bi->revision, *count);
       count++;
-    }
-    is.close();
+    }
     
     return false;