Changeset 1373

Timestamp:

Jun 11, 2011, 1:31:35 AM (12 years ago)

Author:

Peter Johansson

Message:

merging patch release 0.9.2 into trunk

Location:

trunk

Files:

• . (modified) (1 prop)
• .svndigest/config (modified) (1 diff)
• Makefile.am (modified) (2 diffs)
• NEWS (modified) (1 diff)
• bin/AbstractParameter.cc (modified) (1 diff)
• bin/Parameter.cc (modified) (1 diff)
• bootstrap (modified) (2 diffs)
• build_support/Portfile.in (modified) (1 diff)
• doc/readme.txt (modified) (3 diffs)
• lib/Configuration.cc (modified) (4 diffs)
• lib/SVN.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 diff, 1 prop)
• m4/yat_add_flag.m4 (modified) (1 prop)
• test/Makefile.am (modified) (2 diffs)
• test/config.cc (modified) (2 diffs)
• test/config_props_test.sh (copied) (copied from branches/0.9-stable/test/config_props_test.sh)
• test/error_test.sh (modified) (2 diffs)

trunk/.svndigest/config

@@ -15 +15 @@
 ### Section for setting behaviour of copyright update
 [copyright]
-# if true svndigest will warn if file has no copyright statement.
+# warn if file has no copyright statement.
 missing-copyright-warning = no
+# defining start of copyright statement
 copyright-string = Copyright (C)
 

trunk/Makefile.am

@@ -5 +5 @@
 # Copyright (C) 2005, 2006 Jari Häkkinen
 # Copyright (C) 2007, 2008 Jari Häkkinen, Peter Johansson
-# Copyright (C) 2009, 2010 Peter Johansson
+# Copyright (C) 2009, 2010, 2011 Peter Johansson
 #
 # This file is part of svndigest, http://dev.thep.lu.se/svndigest
@@ -98 +98 @@
   @mv $@.t $@
   @echo "creating $@"
+
+# create a tag from current stable branch; depends on check-version to
+# ensure that version is macro.minor.micro (no pre suffix), that wc is
+# pristine and updated.
+svn-tag: check-version check-svn-diff
+  svn copy \
+  ^/branches/$(SVNDIGEST_MAJOR_VERSION).$(SVNDIGEST_MINOR_VERSION)-stable\
+  ^/tags/$(VERSION) -m "tagging version $(VERSION)"

trunk/NEWS

@@ -13 +13 @@
 svndigest 0.9.x series from
     http://dev.thep.lu.se/svndigest/svn/branches/0.9-stable
+
+Version 0.9.2 (released 10 June 2011)
+  - Section [svn-props] in config file is now respected (bug #501).
+
+  A complete list of closed tickets can be found here [[br]]
+  http://dev.thep.lu.se/svndigest/query?status=closed&milestone=0.9.2
 
 Version 0.9.1 (released 18 November 2010)

trunk/bin/AbstractParameter.cc

@@ -111 +111 @@
       if (S_ISDIR(buf.st_mode))
         return;
+      errno = ENOTDIR;
     }
     std::stringstream ss;
+    assert(errno);
     ss << cmd_.program_name() << ": '" << path << "': " 
        << strerror(errno);

trunk/bin/Parameter.cc

@@ -3 +3 @@
 /*
   Copyright (C) 2006, 2007, 2008 Jari Häkkinen, Peter Johansson
-  Copyright (C) 2009, 2010 Peter Johansson
+  Copyright (C) 2009, 2010, 2011 Peter Johansson
 
   This file is part of svndigest, http://dev.thep.lu.se/svndigest

trunk/bootstrap

@@ -9 +9 @@
 # Copyright (C) 2005, 2006 Jari Häkkinen
 # Copyright (C) 2007, 2008 Jari Häkkinen, Peter Johansson
-# Copyright (C) 2010 Peter Johansson
+# Copyright (C) 2010, 2011 Peter Johansson
 #
 # This file is part of svndigest, http://dev.thep.lu.se/svndigest
@@ -39 +39 @@
     shift;
 done
+cmd="autoreconf --install --symlink --force";
 if test "x$verbose" = "xno"; then
-    exec >& /dev/null
+    exec > /dev/null
+else
+    cmd="$cmd --verbose"
 fi
-cmd="autoreconf --install --symlink --force --verbose";
 echo "$me: running: $cmd";
 exec $cmd;
-

trunk/build_support/Portfile.in

@@ -8 +8 @@
 categories          devel
 platforms           darwin
+license             GPL-3
 maintainers         gmail.com:pj31042
 

trunk/doc/readme.txt

@@ -3 +3 @@
 Copyright (C) 2005 Jari Häkkinen
 Copyright (C) 2006, 2007, 2008 Jari Häkkinen, Peter Johansson
-Copyright (C) 2009, 2010 Peter Johansson
+Copyright (C) 2009, 2010, 2011 Peter Johansson
 
 This file is part of svndigest, http://dev.thep.lu.se/svndigest
@@ -166 +166 @@
 implies that images are not created.
 
+In section [output] you can adjust the size of the report. Default a
+Blame Information page is created for every file, which can be turned
+of using the 'blame-information' option. To decrease the size even
+more, option 'file' can be set to 'no' which means output will only be
+generated for directories.
+
+Section [svn-props] allows you to set properties on files (or
+directories). It is, for example, possible to set property
+'svndigest:ignore' on all files named `COPYING` using the following line
+
+COPYING = svndigest:ignore
+
+The format of this section is the same as in section [auto-props] in a
+subversion config file.
+
 === TracLinks ===
 
@@ -196 +211 @@
 statement block is replaced with a new copyright statement generated
 from analyzing `svn blame output`. An author is considered to have
-copyright of the file if (s)he has added a line of code of comment
+copyright of the file if (s)he has added a line of code or comment
 (excluding copyright statements). For an example of the format of the
 generated copyright statement, please have a look at the top of this

trunk/lib/Configuration.cc

@@ -3 +3 @@
 /*
   Copyright (C) 2007, 2008, 2009, 2010 Jari Häkkinen, Peter Johansson
+  Copyright (C) 2011 Peter Johansson
 
   This file is part of svndigest, http://dev.thep.lu.se/svndigest
@@ -334 +335 @@
         }
       } 
-      else if (section == "svn_props") {
+      else if (section == "svn-props") {
         svn_props_.push_back(std::make_pair(lhs, empty_str_map_));
         std::vector<std::string> vec;
@@ -628 +629 @@
     os << "\n### Section for setting behaviour of copyright update\n"
        << "[copyright]\n"
-       << "# if true svndigest will warn if file has no copyright statement.\n"
+       << "# warn if file has no copyright statement.\n"
        << "missing-copyright-warning = ";
     if (conf.missing_copyright_warning())
@@ -634 +635 @@
     else
       os << "no\n";
+    os << "# defining start of copyright statement\n";
     os << "copyright-string = " << conf.copyright_string_ << "\n"; 
 

trunk/lib/SVN.cc

@@ -4 +4 @@
   Copyright (C) 2006 Jari Häkkinen
   Copyright (C) 2007, 2008 Jari Häkkinen, Peter Johansson
-  Copyright (C) 2010 Peter Johansson
+  Copyright (C) 2010, 2011 Peter Johansson
 
   This file is part of svndigest, http://dev.thep.lu.se/svndigest
@@ -46 +46 @@
 
   SVNException::SVNException(const std::string& msg, svn_error_t* error)
-    : std::runtime_error(""), error_(error), msg_(msg) 
+    : std::runtime_error(""), error_(error)
   {
     ref_count_ = new int(1);

trunk/m4/version.m4

@@ -2 +2 @@
 #
 # Copyright (C) 2008 Jari Häkkinen, Peter Johansson
-# Copyright (C) 2009, 2010 Peter Johansson
+# Copyright (C) 2009, 2010, 2011 Peter Johansson
 #
 # This file is part of svndigest, http://dev.thep.lu.se/svndigest

trunk/test/Makefile.am

@@ -41 +41 @@
 distributed_TESTS += config2_test.sh
 distributed_TESTS += config3_test.sh
+distributed_TESTS += config_props_test.sh
 distributed_TESTS += copyright2_test.sh
 distributed_TESTS += copyright_cache_test.sh
@@ -98 +99 @@
 config2_test.log:init.sh $(top_builddir)/bin/svndigest$(EXEEXT) $(repo_stamp)
 config3_test.log:init.sh $(top_builddir)/bin/svndigest$(EXEEXT)
+config_props_test.log:init.sh $(top_builddir)/bin/svndigest$(EXEEXT) $(repo_stamp)
 copyright2_test.log:init.sh $(top_builddir)/bin/svncopyright$(EXEEXT) $(repo_stamp)
 copyright_cache_test.log:init.sh $(top_builddir)/bin/svncopyright$(EXEEXT) $(repo_stamp)

trunk/test/config.cc

@@ -3 +3 @@
 /*
   Copyright (C) 2008 Jari Häkkinen, Peter Johansson
-  Copyright (C) 2009, 2010 Peter Johansson
+  Copyright (C) 2009, 2010, 2011 Peter Johansson
 
   This file is part of svndigest, http://dev.thep.lu.se/svndigest
@@ -74 +74 @@
     Configuration& conf(Configuration::instance());
     std::stringstream ss;
-    ss << "[svn_props]\n"
+    ss << "[svn-props]\n"
        << "foo* = svndigest:ignore\n"
        << "bar* = svn:eol-style=native;svncopyright:ignore\n";

trunk/test/error_test.sh

@@ -3 +3 @@
 # $Id$
 
-# Copyright (C) 2010 Peter Johansson
+# Copyright (C) 2010, 2011 Peter Johansson
 #
 # This file is part of svndigest, http://dev.thep.lu.se/svndigest
@@ -36 +36 @@
 $GREP 'svncopyright:' stderr || exit_fail
 $GREP "'${abs_top_srcdir}/README': " stderr || exit_fail
+$GREP "Unknown error" stderr && exit_fail
 
 SVNDIGEST_run 1 --root .
 $GREP "svndigest: '.*' is not a working copy" stderr || exit_fail
+$GREP "svndigest: '.*' is not a working copy.*is not a working copy" stderr\
+ && exit_fail
 SVNCOPYRIGHT_run 1 --root .
 $GREP "svncopyright: '.*' is not a working copy" stderr || exit_fail
+$GREP "svncopyright: '.*' is not a working copy.*is not a working copy" stderr\
+ && exit_fail
 
 SVNDIGEST_run 1 --rapakalja