Changeset 80

Timestamp:

Mar 10, 2006, 5:52:04 PM (15 years ago)

Author:

Jari Häkkinen

Message:

Removed nasty bug: svnstat crashed when the last checkin contained zero statistics
count items only, eg. empty directories or binary files.

Location:

trunk/lib

Files:

• Node.h (modified) (1 diff)
• Stats.cc (modified) (2 diffs)
• Stats.h (modified) (2 diffs)
• utility.cc (modified) (2 diffs)

trunk/lib/Node.h

@@ -22 +22 @@
     /// @brief Constructor 
     /// 
-    Node(const std::string& path, const std::string& output="") : path_(path)
+    Node(const std::string& path, const std::string& output="")
+      : path_(path), stats_(path)
       { output_name_ = output + name(); }
 

trunk/lib/Stats.cc

@@ -22 +22 @@
 namespace svnstat{
 
-  u_int Stats::latest_revision_=0;
+
+  Stats::Stats(const std::string& path)
+  {
+    // Make sure latest revision is set properly
+    std::map<std::string,std::string> svn_info = info(path);
+    std::stringstream ss;
+    ss << (svn_info.count("Revision") ? svn_info["Revision"] : "0");
+    ss >> latest_revision_;
+  }
+
 
   std::vector<u_int> Stats::accumulated(void) const
@@ -56 +65 @@
     std::vector<u_int>* vec = &(map_[user]);
     if (vec->size() < rev+1){
-      vec->reserve(rev+1);
+      vec->reserve(latest_revision_ + 1);
       vec->insert(vec->end(), rev - vec->size(),0);
       vec->push_back(1);
-      latest_revision_ = std::max(latest_revision_,rev);
     }
     else

trunk/lib/Stats.h

@@ -22 +22 @@
     /// @brief Default Constructor 
     ///
-    inline Stats(void) {}
+    explicit Stats(const std::string& path);
 
     ///
@@ -70 +70 @@
     void add(const std::string& user, const u_int& revision); 
 
-    static u_int latest_revision_; // latest revision for whole project
+
+    u_int latest_revision_; // Should be the latest revision for whole project
 
     // Peter, if the vector is sparse make it a map

trunk/lib/utility.cc

@@ -14 +14 @@
   int blame(const std::string& path)
   {
-    std::string system_call = "svn blame " + path + " > svnstat.tmp";
+    std::string system_call="svn blame " + path + " 1> svnstat.tmp 2> /dev/null";
     int system_return = system(system_call.c_str());
     if (system_return)
@@ -23 +23 @@
   std::map<std::string, std::string> info(const std::string& path) 
   {
-    std::string system_call = "svn info " + path + " > svnstat.tmp";
+    std::string system_call="svn info " + path + " 1> svnstat.tmp 2> /dev/null";
     int system_return = system(system_call.c_str());
-    if (system_return){
-      // Jari, throw exception.
-      std::cerr << "svnstat: svn info " << path << std::endl;     
-      exit(-1);
-    }
+    if (system_return)
+      return std::map<std::string, std::string>();
 
     std::ifstream is("svnstat.tmp");