Changeset 1255

Timestamp:

Nov 1, 2010, 4:31:50 AM (13 years ago)

Author:

Peter Johansson

Message:

closes #214. Using tree.log to detect the first revision for the tree
and use that to set the x-range in plots. The call to tree.log is for
free since it will be re-cycled in printing the first page and we get
rid of the call to log of the repo log.

Location:

trunk

Files:

• bin/svndigest.cc (modified) (2 diffs)
• lib/Graph.cc (modified) (6 diffs)
• lib/Graph.h (modified) (3 diffs)
• lib/Stats.cc (modified) (2 diffs)

trunk/bin/svndigest.cc

@@ -202 +202 @@
 
 
-void set_dates(const std::string& repo, bool verbose)
-{
-  if (verbose)
-    std::cout << "Retrieving dates" << std::endl;
-  SVNlog log(repo);
-  std::vector<time_t> dates;
-  dates.reserve(log.commits().size());
+void set_dates(const svndigest::SVNlog& log)
+{
+  assert(!log.commits().empty());
+  // all plots uses the same xmin
+  Graph::rev_min(log.commits().begin()->revision());
+
+  /* 
+     Fill in dates for revisions in log. Revisions not seen in log
+     should not be used and left equal to 0.
+   */
+  std::vector<time_t> dates(log.latest_commit().revision()+1, 0);
   for (SVNlog::container::const_iterator iter=log.commits().begin();
        iter!=log.commits().end(); ++iter) {
-    assert(static_cast<svn_revnum_t>(dates.size())==iter->revision());
-    dates.push_back(Date(iter->date()).seconds());
-  }
+    assert(iter->revision()<static_cast<svn_revnum_t>(dates.size()));
+    dates[iter->revision()] = Date(iter->date()).seconds();
+  }
+
   // all plots uses the same dates
   Graph::set_dates(dates);
@@ -229 +234 @@
   }
   
-  if (!option.revisions())
-    set_dates(repo, option.verbose());
+  if (!option.revisions()) {
+    if (option.verbose())
+      std::cout << "Retrieving dates" << std::endl;
+    set_dates(tree.log());
+  }
 
   chdir(option.targetdir());

trunk/lib/Graph.cc

@@ -26 +26 @@
 
 #include <algorithm>
+#include <cassert>
 #include <cmath>
 #include <sstream>
@@ -32 +33 @@
 namespace svndigest {
 
+  svn_revnum_t Graph::rev_min_=0;
   std::vector<time_t> Graph::xticks_;
 
@@ -90 +92 @@
 #ifdef HAVE_PLPLOT
     if (!plots_) {
-      // date[0] is not the oldest when repo is imported with cvs2svn
-      xmin_= date_xticks() ? std::min(xticks_[0], xticks_[1]) : 0;
+      assert(!date_xticks() || rev_min_<xticks_.size());
+      assert(!date_xticks() || xticks_[rev_min_]);
+      xmin_= date_xticks() ? xticks_[rev_min_] : 0;
       xmax_= date_xticks() ? xticks_.back() : y.size();
       xrange_=xmax_-xmin_;
@@ -117 +120 @@
 
     SumVector::const_iterator iter = y.begin();
-    svn_revnum_t x0=0;
+    svn_revnum_t x0=rev_min_;
     PLFLT y0=0;
     for (; iter!=y.end(); ++iter) {
@@ -162 +165 @@
 
 
+  void Graph::rev_min(svn_revnum_t rev)
+  {
+    rev_min_ = rev;
+  }
+
+
   void Graph::set_dates(const std::vector<time_t>& date)
   {
@@ -174 +183 @@
     PLFLT x1 = rev1;
     if (date_xticks()) {
+      assert(rev0<xticks_.size());
+      assert(xticks_[rev0]);
       x0 = xticks_[rev0];
+      assert(rev1<xticks_.size());
+      assert(xticks_[rev1]);
       x1 = xticks_[rev1];
     }

trunk/lib/Graph.h

@@ -27 +27 @@
 
 #include "Vector.h"
+
+#include <subversion-1/svn_types.h>
 
 #include <ctime>
@@ -98 +100 @@
 
     /**
+       Sets the left end of xrange to correspond to revision \a rev.
+     */
+    static void rev_min(svn_revnum_t rev);
+
+    /**
        \brief Function setting the dates.
 
@@ -144 +151 @@
     unsigned int plots_; // keep track of number of plots drawn
     plstream pls_;
+    static svn_revnum_t rev_min_;
     std::string timeformat_;
     std::string title_;

trunk/lib/Stats.cc

@@ -442 +442 @@
     // FIXME: try keep a const& to avoid copying
     SumVector total=get_vector(*stat, "all");   
-    total.resize(revision());
+    total.resize(revision()+1);
     double yrange_max=1.03 * max_element(total) +1.0;
     gp.ymax(yrange_max);
@@ -454 +454 @@
       // FIXME: avoid this copying?
       SumVector vec = get_vector(*stat,*i);
-      vec.resize(revision());
+      vec.resize(revision()+1);
       if (max_element(vec)) {
         author_cont.push_back(std::make_pair(*i,vec));