Changeset 938

Timestamp:

Dec 3, 2009, 5:02:44 AM (13 years ago)

Author:

Peter Johansson

Message:

merge patch release 0.7.1. Delta 0.7.1 - 0.7

Conflict in test repository between r848 and r926 so bootstrap file
was re-committed.

Location:

trunk

Files:

• NEWS (modified) (1 diff)
• configure.ac (modified) (1 diff)
• lib/File.cc (modified) (1 diff)
• lib/LineTypeParser.cc (modified) (2 diffs)
• lib/Stats.cc (modified) (1 diff)
• test/Makefile.am (modified) (2 diffs)
• test/config_test.cc (modified) (3 diffs)
• test/copyright_test2.sh.in (copied) (copied from tags/0.7.1/test/copyright_test2.sh.in)
• test/repo/db/current (modified) (1 diff)
• test/repo/db/revprops/66 (added)
• test/repo/db/revs/66 (added)

trunk/NEWS

@@ -13 +13 @@
 svndigest 0.7.x series from
     http://dev.thep.lu.se/svndigest/svn/branches/0.7-stable
+
+Version 0.7.1 (released 3 December 2009)
+  - File name in parsing rules are matched against the file name and
+    not the entire path. This has no influence on most files because
+    the name starts with a wild card (*) but for files not doing so
+    (default bootstrap and Makefile) the correct parsing rule will be
+    used. It is recommended to remove the cache of such files before
+    running svndigest (ticket:417).
+  - copyright update works on mixed revision wc (ticket:415)
+
+  A complete list of closed tickets can be found here [[br]]
+  http://dev.thep.lu.se/svndigest/query?status=closed&milestone=0.7.1
 
 Version 0.7 (released 22 November 2009)

trunk/configure.ac

@@ -299 +299 @@
      )
 AC_CONFIG_FILES([test/test_repo.sh], [chmod +x test/test_repo.sh])
+AC_CONFIG_FILES([test/copyright_test2.sh], [chmod +x test/copyright_test2.sh])
 AC_CONFIG_FILES([test/svn_update.sh], [chmod +x test/svn_update.sh])
 AC_CONFIG_FILES([test/check_repo_status.sh], 

trunk/lib/File.cc

@@ -82 +82 @@
         ++rev_iter;
       }
+      // do not go beyond BASE rev of file
+      last_rev_this_year = std::min(last_rev_this_year, last_changed_rev());
+      last_rev_last_year = std::min(last_rev_last_year, last_changed_rev());
       // loop over authors
       for (std::set<std::string>::const_iterator a_iter=stats.authors().begin();

trunk/lib/LineTypeParser.cc

@@ -3 +3 @@
 /*
   Copyright (C) 2006, 2007, 2008 Jari Häkkinen, Peter Johansson
+  Copyright (C) 2009 Peter Johansson
 
   This file is part of svndigest, http://dev.thep.lu.se/svndigest
@@ -40 +41 @@
     : mode_(0), post_copyright_(false), copyright_found_(false)
   {
-    codon_ = Configuration::instance().codon(path); 
+    codon_ = Configuration::instance().codon(file_name(path)); 
   }
 

trunk/lib/Stats.cc

@@ -367 +367 @@
     assert(stat->find("all")!=stat->end());
     std::vector<unsigned int> total=get_vector(*stat, "all");   
-    double yrange_max=1.03*total.back()+1;
+    double yrange_max=1.03 * *std::max_element(total.begin(), total.end()) +1.0;
     gp.ymax(yrange_max);
 

trunk/test/Makefile.am

@@ -30 +30 @@
 TESTS += check_repo_status.sh
 TESTS += svndigest_copy_cache_test.sh
+TESTS+= copyright_test2.sh
 
 EXTRA_DIST = svndigest_copy_cache_test.sh
@@ -67 +68 @@
 
 mostlyclean-local: 
-  rm -f *.png *.tmp *~
+  rm -f *.png *.tmp *~ .toy_project2

trunk/test/config_test.cc

@@ -21 +21 @@
 */
 
+#include "Suite.h"
+
 #include "Configuration.h"
 
 namespace theplu{
 namespace svndigest{
-  bool test_codon(void);
+  void test_codon(test::Suite&);
 }} // end of namespace svndigest and theplu
 
@@ -32 +34 @@
 {
   using namespace theplu::svndigest;
-  bool ok=true;
+  test::Suite suite(argc, argv, false);
 
-  ok &= test_codon();
+  test_codon(suite);
                                                                                 
-  if (ok)
+  if (suite.ok()) {
+    suite.out() << "Test is Ok!" << std::endl;
     return 0;
-  return 1;
+  }
+  suite.out() << "Test failed." << std::endl;
+  return 1;
 }
 
@@ -45 +50 @@
 namespace svndigest{
 
-  bool test_codon(void)
+  void test_codon(test::Suite& suite)
   {
     const Configuration& c(Configuration::instance());
-    bool ok =true;
     if (!c.codon("foo.h")){
-      std::cerr << "No codon for foo.h\n";
-      ok = false;
+      suite.out() << "No codon for foo.h\n";
+      suite.add(false);
     }
     if (!c.codon("../dir/test.cc")){
-      std::cerr << "No codon for test.cc\n";
-      ok = false;
+      suite.out() << "No codon for test.cc\n";
+      suite.add(false);
     }
-
-    return ok;
+    if (!c.codon("bootstrap")){
+      suite.out() << "No codon for bootstrap\n";
+      suite.add(false);
+    }
   }
   

trunk/test/repo/db/current

@@ -1 @@
-65 22 4
+66 26 4