Changeset 1373


Ignore:
Timestamp:
Jun 11, 2011, 1:31:35 AM (8 years ago)
Author:
Peter Johansson
Message:

merging patch release 0.9.2 into trunk

Location:
trunk
Files:
22 edited
1 copied

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/.svndigest/config

    r1302 r1373  
    1515### Section for setting behaviour of copyright update
    1616[copyright]
    17 # if true svndigest will warn if file has no copyright statement.
     17# warn if file has no copyright statement.
    1818missing-copyright-warning = no
     19# defining start of copyright statement
    1920copyright-string = Copyright (C)
    2021
  • trunk/Makefile.am

    r1337 r1373  
    55# Copyright (C) 2005, 2006 Jari Häkkinen
    66# Copyright (C) 2007, 2008 Jari Häkkinen, Peter Johansson
    7 # Copyright (C) 2009, 2010 Peter Johansson
     7# Copyright (C) 2009, 2010, 2011 Peter Johansson
    88#
    99# This file is part of svndigest, http://dev.thep.lu.se/svndigest
     
    9898  @mv $@.t $@
    9999  @echo "creating $@"
     100
     101# create a tag from current stable branch; depends on check-version to
     102# ensure that version is macro.minor.micro (no pre suffix), that wc is
     103# pristine and updated.
     104svn-tag: check-version check-svn-diff
     105  svn copy \
     106  ^/branches/$(SVNDIGEST_MAJOR_VERSION).$(SVNDIGEST_MINOR_VERSION)-stable\
     107  ^/tags/$(VERSION) -m "tagging version $(VERSION)"
  • trunk/NEWS

    r1348 r1373  
    1313svndigest 0.9.x series from
    1414    http://dev.thep.lu.se/svndigest/svn/branches/0.9-stable
     15
     16Version 0.9.2 (released 10 June 2011)
     17  - Section [svn-props] in config file is now respected (bug #501).
     18
     19  A complete list of closed tickets can be found here [[br]]
     20  http://dev.thep.lu.se/svndigest/query?status=closed&milestone=0.9.2
    1521
    1622Version 0.9.1 (released 18 November 2010)
  • trunk/bin/AbstractParameter.cc

    r1293 r1373  
    111111      if (S_ISDIR(buf.st_mode))
    112112        return;
     113      errno = ENOTDIR;
    113114    }
    114115    std::stringstream ss;
     116    assert(errno);
    115117    ss << cmd_.program_name() << ": '" << path << "': "
    116118       << strerror(errno);
  • trunk/bin/Parameter.cc

    r1293 r1373  
    33/*
    44  Copyright (C) 2006, 2007, 2008 Jari Häkkinen, Peter Johansson
    5   Copyright (C) 2009, 2010 Peter Johansson
     5  Copyright (C) 2009, 2010, 2011 Peter Johansson
    66
    77  This file is part of svndigest, http://dev.thep.lu.se/svndigest
  • trunk/bootstrap

    r1116 r1373  
    99# Copyright (C) 2005, 2006 Jari Häkkinen
    1010# Copyright (C) 2007, 2008 Jari Häkkinen, Peter Johansson
    11 # Copyright (C) 2010 Peter Johansson
     11# Copyright (C) 2010, 2011 Peter Johansson
    1212#
    1313# This file is part of svndigest, http://dev.thep.lu.se/svndigest
     
    3939    shift;
    4040done
     41cmd="autoreconf --install --symlink --force";
    4142if test "x$verbose" = "xno"; then
    42     exec >& /dev/null
     43    exec > /dev/null
     44else
     45    cmd="$cmd --verbose"
    4346fi
    44 cmd="autoreconf --install --symlink --force --verbose";
    4547echo "$me: running: $cmd";
    4648exec $cmd;
    47 
  • trunk/build_support/Portfile.in

    r1302 r1373  
    88categories          devel
    99platforms           darwin
     10license             GPL-3
    1011maintainers         gmail.com:pj31042
    1112
  • trunk/doc/readme.txt

    r1293 r1373  
    33Copyright (C) 2005 Jari Häkkinen
    44Copyright (C) 2006, 2007, 2008 Jari Häkkinen, Peter Johansson
    5 Copyright (C) 2009, 2010 Peter Johansson
     5Copyright (C) 2009, 2010, 2011 Peter Johansson
    66
    77This file is part of svndigest, http://dev.thep.lu.se/svndigest
     
    166166implies that images are not created.
    167167
     168In section [output] you can adjust the size of the report. Default a
     169Blame Information page is created for every file, which can be turned
     170of using the 'blame-information' option. To decrease the size even
     171more, option 'file' can be set to 'no' which means output will only be
     172generated for directories.
     173
     174Section [svn-props] allows you to set properties on files (or
     175directories). It is, for example, possible to set property
     176'svndigest:ignore' on all files named `COPYING` using the following line
     177
     178COPYING = svndigest:ignore
     179
     180The format of this section is the same as in section [auto-props] in a
     181subversion config file.
     182
    168183=== TracLinks ===
    169184
     
    196211statement block is replaced with a new copyright statement generated
    197212from analyzing `svn blame output`. An author is considered to have
    198 copyright of the file if (s)he has added a line of code of comment
     213copyright of the file if (s)he has added a line of code or comment
    199214(excluding copyright statements). For an example of the format of the
    200215generated copyright statement, please have a look at the top of this
  • trunk/lib/Configuration.cc

    r1315 r1373  
    33/*
    44  Copyright (C) 2007, 2008, 2009, 2010 Jari Häkkinen, Peter Johansson
     5  Copyright (C) 2011 Peter Johansson
    56
    67  This file is part of svndigest, http://dev.thep.lu.se/svndigest
     
    334335        }
    335336      }
    336       else if (section == "svn_props") {
     337      else if (section == "svn-props") {
    337338        svn_props_.push_back(std::make_pair(lhs, empty_str_map_));
    338339        std::vector<std::string> vec;
     
    628629    os << "\n### Section for setting behaviour of copyright update\n"
    629630       << "[copyright]\n"
    630        << "# if true svndigest will warn if file has no copyright statement.\n"
     631       << "# warn if file has no copyright statement.\n"
    631632       << "missing-copyright-warning = ";
    632633    if (conf.missing_copyright_warning())
     
    634635    else
    635636      os << "no\n";
     637    os << "# defining start of copyright statement\n";
    636638    os << "copyright-string = " << conf.copyright_string_ << "\n";
    637639
  • trunk/lib/SVN.cc

    r1267 r1373  
    44  Copyright (C) 2006 Jari Häkkinen
    55  Copyright (C) 2007, 2008 Jari Häkkinen, Peter Johansson
    6   Copyright (C) 2010 Peter Johansson
     6  Copyright (C) 2010, 2011 Peter Johansson
    77
    88  This file is part of svndigest, http://dev.thep.lu.se/svndigest
     
    4646
    4747  SVNException::SVNException(const std::string& msg, svn_error_t* error)
    48     : std::runtime_error(""), error_(error), msg_(msg)
     48    : std::runtime_error(""), error_(error)
    4949  {
    5050    ref_count_ = new int(1);
  • trunk/m4/apache_LICENSE-2.0.txt

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • trunk/m4/ax_cxx_check_flag.m4

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • trunk/m4/ax_cxxcpp_check_flag.m4

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • trunk/m4/ax_ld_check_flag.m4

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • trunk/m4/find_apr.m4

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • trunk/m4/pkg.m4

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • trunk/m4/version.m4

    r1315 r1373  
    22#
    33# Copyright (C) 2008 Jari Häkkinen, Peter Johansson
    4 # Copyright (C) 2009, 2010 Peter Johansson
     4# Copyright (C) 2009, 2010, 2011 Peter Johansson
    55#
    66# This file is part of svndigest, http://dev.thep.lu.se/svndigest
  • trunk/m4/yat_add_flag.m4

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • trunk/test/Makefile.am

    r1364 r1373  
    4141distributed_TESTS += config2_test.sh
    4242distributed_TESTS += config3_test.sh
     43distributed_TESTS += config_props_test.sh
    4344distributed_TESTS += copyright2_test.sh
    4445distributed_TESTS += copyright_cache_test.sh
     
    9899config2_test.log:init.sh $(top_builddir)/bin/svndigest$(EXEEXT) $(repo_stamp)
    99100config3_test.log:init.sh $(top_builddir)/bin/svndigest$(EXEEXT)
     101config_props_test.log:init.sh $(top_builddir)/bin/svndigest$(EXEEXT) $(repo_stamp)
    100102copyright2_test.log:init.sh $(top_builddir)/bin/svncopyright$(EXEEXT) $(repo_stamp)
    101103copyright_cache_test.log:init.sh $(top_builddir)/bin/svncopyright$(EXEEXT) $(repo_stamp)
  • trunk/test/config.cc

    r1237 r1373  
    33/*
    44  Copyright (C) 2008 Jari Häkkinen, Peter Johansson
    5   Copyright (C) 2009, 2010 Peter Johansson
     5  Copyright (C) 2009, 2010, 2011 Peter Johansson
    66
    77  This file is part of svndigest, http://dev.thep.lu.se/svndigest
     
    7474    Configuration& conf(Configuration::instance());
    7575    std::stringstream ss;
    76     ss << "[svn_props]\n"
     76    ss << "[svn-props]\n"
    7777       << "foo* = svndigest:ignore\n"
    7878       << "bar* = svn:eol-style=native;svncopyright:ignore\n";
  • trunk/test/error_test.sh

    r1242 r1373  
    33# $Id$
    44
    5 # Copyright (C) 2010 Peter Johansson
     5# Copyright (C) 2010, 2011 Peter Johansson
    66#
    77# This file is part of svndigest, http://dev.thep.lu.se/svndigest
     
    3636$GREP 'svncopyright:' stderr || exit_fail
    3737$GREP "'${abs_top_srcdir}/README': " stderr || exit_fail
     38$GREP "Unknown error" stderr && exit_fail
    3839
    3940SVNDIGEST_run 1 --root .
    4041$GREP "svndigest: '.*' is not a working copy" stderr || exit_fail
     42$GREP "svndigest: '.*' is not a working copy.*is not a working copy" stderr\
     43 && exit_fail
    4144SVNCOPYRIGHT_run 1 --root .
    4245$GREP "svncopyright: '.*' is not a working copy" stderr || exit_fail
     46$GREP "svncopyright: '.*' is not a working copy.*is not a working copy" stderr\
     47 && exit_fail
    4348
    4449SVNDIGEST_run 1 --rapakalja
Note: See TracChangeset for help on using the changeset viewer.