Changeset 1280

Timestamp:

Nov 6, 2010, 3:45:23 PM (12 years ago)

Author:

Peter Johansson

Message:

merged release 0.9 in to trunk

Location:

trunk

Files:

• . (modified) (1 prop)
• NEWS (modified) (2 diffs)
• bin/svndigest.cc (modified) (4 diffs)
• doc/readme.txt (modified) (1 diff)
• lib/AddStats.cc (modified) (1 diff)
• lib/ClassicStats.cc (modified) (1 diff)
• lib/Graph.cc (modified) (4 diffs)
• lib/Graph.h (modified) (2 diffs)
• lib/Node.h (modified) (2 diffs)
• lib/Stats.cc (modified) (2 diffs)
• m4/apache_LICENSE-2.0.txt (modified) (1 prop)
• m4/ax_cxx_check_flag.m4 (modified) (1 prop)
• m4/ax_cxxcpp_check_flag.m4 (modified) (1 prop)
• m4/ax_ld_check_flag.m4 (modified) (1 prop)
• m4/find_apr.m4 (modified) (1 prop)
• m4/pkg.m4 (modified) (1 prop)
• m4/version.m4 (modified) (1 prop)
• m4/yat_add_flag.m4 (modified) (1 prop)
• test/init.sh.in (modified) (1 diff)
• test/option.cc (modified) (3 diffs)
• test/svn_update.sh.in (modified) (1 diff)

trunk/NEWS

@@ -11 +11 @@
     http://dev.thep.lu.se/svndigest/svn/branches/0.9-stable
 
-Version 0.9 (released NOT YET)
+Version 0.9 (released 6 November 2010)
   - It is now possible to override svn_props in config file (ticket #326)
   - New configuration option 'copyright-string' (ticket #393)
@@ -17 +17 @@
   - New configuration option 'blame-information' (ticket #330)
   - New configuration option 'tab-size' (ticket #229)
+  - svncopyright now respects property svncopyright:ignore (ticket #245)
+  - Memory usage heavily reduced (ticket #296)
 
   A complete list of closed tickets can be found here [[br]]

trunk/bin/svndigest.cc

@@ -44 +44 @@
 #include "yat/OptionArg.h"
 
+#include <algorithm>
 #include <cassert>
 #include <cstdlib>
@@ -205 +206 @@
 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.
-   */
+  // Fill in dates for revisions in log.
   std::vector<time_t> dates(log.latest_commit().revision()+1, 0);
   for (SVNlog::container::const_iterator iter=log.commits().begin();
@@ -218 +212 @@
     assert(iter->revision()<static_cast<svn_revnum_t>(dates.size()));
     dates[iter->revision()] = Date(iter->date()).seconds();
+  }
+  // Fill in dates for revs not seen in log
+  time_t prev = dates[log.commits().begin()->revision()];
+  for (size_t i=0; i<dates.size(); ++i) {
+    if (dates[i]==0)
+      dates[i] = prev;
+    else
+      prev = dates[i];
   }
 
@@ -235 +237 @@
   }
   
+  if (option.verbose())
+    std::cout << "Retrieving log information" << std::endl;
+  assert(!tree.log().commits().empty());
+  Graph::rev_min(tree.log().commits().begin()->revision());
+  Graph::rev_max(tree.log().latest_commit().revision());
   if (!option.revisions()) {
-    if (option.verbose())
-      std::cout << "Retrieving dates" << std::endl;
     set_dates(tree.log());
   }

trunk/doc/readme.txt

@@ -211 +211 @@
 an organization rather than to individual developers.
 
+Files and directories that have `svndigest:ignore` or
+`svncopyright:ignore` set are excluded from the copyright update.
+
 = About svndigest-copy-cache =
 

trunk/lib/AddStats.cc

@@ -103 +103 @@
   unsigned int AddStats::max_element(const SumVector& v) const 
   {
-    assert(v.size());
+    if (v.size()==0)
+      return 0;
     return v.back();
   }

trunk/lib/ClassicStats.cc

@@ -81 +81 @@
   ClassicStats::max_element(const SumVector& v) const 
   {
-    assert(v.size());
+    if (v.size()==0)
+      return 0;
     return v.back();
   }

trunk/lib/Graph.cc

@@ -32 +32 @@
 namespace svndigest {
 
+  svn_revnum_t Graph::rev_max_=0;
   svn_revnum_t Graph::rev_min_=0;
   std::vector<time_t> Graph::xticks_;
@@ -93 +94 @@
       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();
+      assert(rev_min_<xticks_.size() || !date_xticks());
+      xmin_= date_xticks() ? xticks_[rev_min_] : rev_min_;
+      assert(rev_max_<xticks_.size() || !date_xticks());
+      xmax_= date_xticks() ? xticks_[rev_max_] : rev_max_;
       xrange_=xmax_-xmin_;
       yrange_=ymax_-ymin_;
@@ -126 +129 @@
       y0 = iter->second;
     }
-    staircase(x0, y0, y.size()-1, y0);
+    staircase(x0, y0, rev_max_, y0);
 
     legend_data legend;
@@ -164 +167 @@
 
 
+  void Graph::rev_max(svn_revnum_t rev)
+  {
+    rev_max_ = rev;
+  }
+
+
   void Graph::rev_min(svn_revnum_t rev)
   {

trunk/lib/Graph.h

@@ -100 +100 @@
 
     /**
+       Sets the right end of xrange to correspond to revision \a rev.
+     */
+    static void rev_max(svn_revnum_t rev);
+
+    /**
        Sets the left end of xrange to correspond to revision \a rev.
      */
@@ -152 +157 @@
     plstream pls_;
     static svn_revnum_t rev_min_;
+    static svn_revnum_t rev_max_;
     std::string timeformat_;
     std::string title_;

trunk/lib/Node.h

@@ -207 +207 @@
     std::string url(void) const;
     
+    inline const SVNinfo& svn_info(void) const { return svninfo_; }
+
   protected:
     ///
@@ -212 +214 @@
     ///
     void path_anchor(std::ostream& os) const; 
-
-    inline const SVNinfo& svn_info(void) const { return svninfo_; }
 
     unsigned int level_;

trunk/lib/Stats.cc

@@ -440 +440 @@
     assert(stat->size());
     assert(stat->find("all")!=stat->end());
-    // FIXME: try keep a const& to avoid copying
-    SumVector total=get_vector(*stat, "all");   
-    total.resize(revision()+1);
+    const SumVector& total=get_vector(*stat, "all");    
     double yrange_max=1.03 * max_element(total) +1.0;
     gp.ymax(yrange_max);
@@ -452 +450 @@
          i != authors_.end(); ++i) {
       assert(stat->find(*i)!=stat->end());
-      // FIXME: avoid this copying?
-      SumVector vec = get_vector(*stat,*i);
-      vec.resize(revision()+1);
+      const SumVector& vec = get_vector(*stat,*i);
       if (max_element(vec)) {
         author_cont.push_back(std::make_pair(*i,vec));

trunk/test/init.sh.in

@@ -53 +53 @@
 test -z "$SVNCOPYRIGHT" && SVNCOPYRIGHT="${abs_top_builddir}/bin/svncopyright";
 test -z "$srcdir" && srcdir="@srcdir@";
-test -z "$SVN" && SVN=svn;
+test -z "$SVN" && SVN="svn --non-interactive";
 test -z "$GREP" && GREP=@GREP@;
 

trunk/test/option.cc

@@ -54 +54 @@
 {
   suite.out() << "test --root ROOT\n";
-  test_root(suite, ".", test::abs_builddir()+"/testSubDir/option.test",
-            "option.test");
-  test_root(suite, "..", test::abs_builddir()+"/testSubDir","testSubDir");
-  test_root(suite, "../..", test::abs_builddir(), "test");
+  test_root(suite, ".", "*/test/testSubDir/option.test", "option.test");
+  test_root(suite, "..", "*/test/testSubDir","testSubDir");
+  test_root(suite, "../..", "*/test", "test");
   // test with absolute path
-  test_root(suite, test::abs_builddir(), test::abs_builddir(), "test");
+  test_root(suite, test::abs_builddir(), "*/test", "test");
   // test with symbolic link
   if (!node_exist("symlink")) {
@@ -67 +66 @@
     }
   }
-  test_root(suite, "symlink", 
-            test::abs_builddir()+"/testSubDir/option.test", "symlink");
-  test_root(suite, "symlink/.", 
-            test::abs_builddir()+"/testSubDir/option.test","option.test");
-  test_root(suite, "symlink/..", 
-            test::abs_builddir()+"/testSubDir", "testSubDir");
+  test_root(suite, "symlink", "*/test/testSubDir/option.test", "symlink");
+  test_root(suite, "symlink/.", "*/test/testSubDir/option.test","option.test");
+  test_root(suite, "symlink/..", "*/test/testSubDir", "testSubDir");
   test_root(suite, test::abs_builddir()+"/testSubDir/option.test/symlink/..", 
-            test::abs_builddir()+"/testSubDir", "testSubDir");
+            "*/test/testSubDir", "testSubDir");
   test_root(suite, test::abs_builddir()+"/testSubDir/option.test/symlink", 
-            test::abs_builddir()+"/testSubDir/option.test", "symlink");
+            "*/test/testSubDir/option.test", "symlink");
   
   try {
-    test_root(suite, "../../Makefile", test::abs_builddir()+"/Makefile", 
-              "Makefile");
+    test_root(suite, "../../Makefile", "*/Makefile", "Makefile");
     suite.add(false);
     suite.out() << "error: no exception thrown\n --root ../../Makefile\n";
@@ -99 +94 @@
   argv.push_back(arg);
   parse(option, argv);
-  if (option.root() != root) {
+
+  if (!theplu::svndigest::fnmatch(root, option.root())) {
     suite.add(false);
+    suite.out() << "error:\n";
     for (size_t i=0; i<argv.size(); ++i)
       suite.out() << argv[i] << " ";
     suite.out() << "\n";
     suite.out() << "root: `" << option.root() << "'\n";
-    suite.out() << "expected: `" << root << "'\n";
+    suite.out() << "expected pattern: `" << root << "'\n\n";
   }
   if (option.root_basename() != root_basename) {
     suite.add(false);
+    suite.out() << "error\n";
     for (size_t i=0; i<argv.size(); ++i)
       suite.out() << argv[i] << " ";
     suite.out() << "\n";
     suite.out() << "root: `" << option.root_basename() << "'\n";
-    suite.out() << "expected: `" << root_basename << "'\n";
+    suite.out() << "expected: `" << root_basename << "'\n\n";
   }
 }

trunk/test/svn_update.sh.in

@@ -22 +22 @@
 # along with svndigest. If not, see <http://www.gnu.org/licenses/>.
 
-test -z "$SVN" && SVN=svn
+test -z "$SVN" && SVN="svn --non-interactive"
 rootdir=toy_project