Changeset 938


Ignore:
Timestamp:
Dec 3, 2009, 5:02:44 AM (12 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:
2 added
8 edited
1 copied

Legend:

Unmodified
Added
Removed
  • trunk/NEWS

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

    r911 r938  
    299299     )
    300300AC_CONFIG_FILES([test/test_repo.sh], [chmod +x test/test_repo.sh])
     301AC_CONFIG_FILES([test/copyright_test2.sh], [chmod +x test/copyright_test2.sh])
    301302AC_CONFIG_FILES([test/svn_update.sh], [chmod +x test/svn_update.sh])
    302303AC_CONFIG_FILES([test/check_repo_status.sh],
  • trunk/lib/File.cc

    r932 r938  
    8282        ++rev_iter;
    8383      }
     84      // do not go beyond BASE rev of file
     85      last_rev_this_year = std::min(last_rev_this_year, last_changed_rev());
     86      last_rev_last_year = std::min(last_rev_last_year, last_changed_rev());
    8487      // loop over authors
    8588      for (std::set<std::string>::const_iterator a_iter=stats.authors().begin();
  • trunk/lib/LineTypeParser.cc

    r847 r938  
    33/*
    44  Copyright (C) 2006, 2007, 2008 Jari Häkkinen, Peter Johansson
     5  Copyright (C) 2009 Peter Johansson
    56
    67  This file is part of svndigest, http://dev.thep.lu.se/svndigest
     
    4041    : mode_(0), post_copyright_(false), copyright_found_(false)
    4142  {
    42     codon_ = Configuration::instance().codon(path);
     43    codon_ = Configuration::instance().codon(file_name(path));
    4344  }
    4445
  • trunk/lib/Stats.cc

    r929 r938  
    367367    assert(stat->find("all")!=stat->end());
    368368    std::vector<unsigned int> total=get_vector(*stat, "all");   
    369     double yrange_max=1.03*total.back()+1;
     369    double yrange_max=1.03 * *std::max_element(total.begin(), total.end()) +1.0;
    370370    gp.ymax(yrange_max);
    371371
  • trunk/test/Makefile.am

    r929 r938  
    3030TESTS += check_repo_status.sh
    3131TESTS += svndigest_copy_cache_test.sh
     32TESTS+= copyright_test2.sh
    3233
    3334EXTRA_DIST = svndigest_copy_cache_test.sh
     
    6768
    6869mostlyclean-local:
    69   rm -f *.png *.tmp *~
     70  rm -f *.png *.tmp *~ .toy_project2
  • trunk/test/config_test.cc

    r847 r938  
    2121*/
    2222
     23#include "Suite.h"
     24
    2325#include "Configuration.h"
    2426
    2527namespace theplu{
    2628namespace svndigest{
    27   bool test_codon(void);
     29  void test_codon(test::Suite&);
    2830}} // end of namespace svndigest and theplu
    2931
     
    3234{
    3335  using namespace theplu::svndigest;
    34   bool ok=true;
     36  test::Suite suite(argc, argv, false);
    3537
    36   ok &= test_codon();
     38  test_codon(suite);
    3739                                                                               
    38   if (ok)
     40  if (suite.ok()) {
     41    suite.out() << "Test is Ok!" << std::endl;
    3942    return 0;
    40   return 1;
     43  }
     44  suite.out() << "Test failed." << std::endl;
     45  return 1;
    4146}
    4247
     
    4550namespace svndigest{
    4651
    47   bool test_codon(void)
     52  void test_codon(test::Suite& suite)
    4853  {
    4954    const Configuration& c(Configuration::instance());
    50     bool ok =true;
    5155    if (!c.codon("foo.h")){
    52       std::cerr << "No codon for foo.h\n";
    53       ok = false;
     56      suite.out() << "No codon for foo.h\n";
     57      suite.add(false);
    5458    }
    5559    if (!c.codon("../dir/test.cc")){
    56       std::cerr << "No codon for test.cc\n";
    57       ok = false;
     60      suite.out() << "No codon for test.cc\n";
     61      suite.add(false);
    5862    }
    59 
    60     return ok;
     63    if (!c.codon("bootstrap")){
     64      suite.out() << "No codon for bootstrap\n";
     65      suite.add(false);
     66    }
    6167  }
    6268 
  • trunk/test/repo/db/current

    r894 r938  
    1 65 22 4
     166 26 4
Note: See TracChangeset for help on using the changeset viewer.