Changeset 1495

Timestamp:

Aug 27, 2012, 6:06:43 AM (9 years ago)

Author:

Peter Johansson

Message:

merge patch release 0.9.6 into trunk

Location:

trunk

Files:

• . (modified) (1 prop)
• Makefile.am (modified) (3 diffs)
• NEWS (modified) (1 diff)
• README.developer (modified) (7 diffs, 1 prop)
• THANKS (modified) (1 diff)
• build_support/tag_and_release.sh.in (copied) (copied from branches/0.9-stable/build_support/tag_and_release.sh.in)
• configure.ac (modified) (1 diff)
• lib/Functor.h (modified) (2 diffs)
• lib/Stats.cc (modified) (1 diff)
• lib/StatsPlotter.cc (modified) (1 diff)
• lib/Vector.h (modified) (1 diff)
• 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/repo (modified) (1 prop)
• test/traverse_test.sh (modified) (1 diff)

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, 2011 Peter Johansson
+# Copyright (C) 2009, 2010, 2011, 2012 Peter Johansson
 #
 # This file is part of svndigest, http://dev.thep.lu.se/svndigest
@@ -117 +117 @@
   @echo "creating $@"
 
+STABLE_VERSION = $(SVNDIGEST_MAJOR_VERSION).$(SVNDIGEST_MINOR_VERSION)
+STABLE_BRANCH = ^/branches/$(STABLE_VERSION)-stable
+
 # 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)"
+  svn copy $(STABLE_BRANCH) ^/tags/$(VERSION) \
+  -m "tagging version $(VERSION)"
+
+# create a stable-branch from trunk
+svn-stable-branch: check-svn-diff all
+  svn copy ^/trunk $(STABLE_BRANCH) \
+  -m "New stable branch $(STABLE_VERSION)" \
+  && svn co $(STABLE_BRANCH) ../svndigest-$(STABLE_VERSION).x \
+  && bin/svndigest-copy-cache -v -t ../svndigest-$(STABLE_VERSION).x
 
 syntax-check: assert-header-without-use \
@@ -144 +153 @@
   grep -LE "[^ \t\(=]errno" $$files | grep $(srcdir) && \
   { echo "$@: in files listed above"; exit 1; } || :;
-

trunk/NEWS

@@ -15 +15 @@
     http://dev.thep.lu.se/svndigest/svn/branches/0.9-stable
 
+Version 0.9.6 (released 27 August 2012)
+  - Fixed bug that svndigest crashed when plotting 'others' and data
+    was empty (bug #515)
+
+  A complete list of closed tickets can be found here [[br]]
+  http://dev.thep.lu.se/svndigest/query?status=closed&milestone=svndigest+0.9.6
+
 Version 0.9.5 (released 19 March 2012)
-  Fixed bug that directories belonging to other WC were traversed (bug #512)
+  - Fixed bug that directories belonging to other WC were traversed (bug #512)
 
   A complete list of closed tickets can be found here [[br]]

trunk/README.developer

@@ -15 +15 @@
 
 Commits should be minimalistic and the projects should always compile
-(`make` and `make check`) when someone makes a clean checkout. There is
+('make' and 'make check') when someone makes a clean checkout. There is
 a short introduction to subversion and its usage available as
 [http://cbbp.thep.lu.se/~jari/documents/subversion_guidelines/index.html Subversion guidelines].
@@ -27 +27 @@
 build man page you will need help2man.
 
-=== bootstrap and autoreconf === 
+=== bootstrap and autoreconf ===
 
 At first checkout from the repository you must run the bootstrapping
 utility
 
-  `./bootstrap` 
-
-to setup autoconf files. To push subsequent changes of this file into
-the build scripts you run
-
-   `autoreconf`
+  #> ./bootstrap
 
 
 === configure ===
 
-Run the generated configure script with 
-
-  `./configure --enable-debug`
-
-The option flag `--enable-debug` turns on debug options (e.g. enables
-assertions). 
+Run the generated configure script with
+
+  #> ./configure --enable-debug
+
+The option flag '--enable-debug' turns on some compiler options
+appropriate for development (e.g. enables assertions).
 
 
 === Testing ===
 
-Test programs should be created and added to the `make check`
+Test programs should be created and added to the 'make check'
 execution. Always check that the test runs before committing code to
-the repository, i.e., run `make check`. For more details on how to run
-and write tests, please refer to file `test/README`.
-
-There is a test repository in source:trunk/test/repo that is a part of
+the repository, i.e., run 'make check'. For more details on how to run
+and write tests, please refer to file 'test/README'.
+
+There is a test repository in 'test/repo' that is a part of
 the svndigest repository. The logic behind this is that it is nice to
 have a common test repository that can be used off-line. Changes to
@@ -65 +60 @@
 propagated to the svndigest repository and it is important that some
 files created in the test repository are manually added to the
-svndigest repository. Assuming that `make check` is run before a
+svndigest repository. Assuming that 'make check' is run before a
 commit, a warning is generated if the test repository is inconsistent
 with the svndigest repository. There will be a diagnostic message and
@@ -71 +66 @@
 problem manually.
 
-The problem is simply that the file source:trunk/test/repo/db/current
-is changed compared to the svndigest repository. The `current` file
+The problem is simply that the file 'test/repo/db/current'
+is changed compared to the svndigest repository. The 'current' file
 indicates a specific number of change sets within the test repository
-and the directories source:trunk/test/repo/db/revs and
-source:trunk/test/repo/db/revprops contains a matching number of
+and the directories 'test/repo/db/revs' and
+'test/repo/db/revprops' contains a matching number of
 change sets. However, the change sets added to the test repository are
 not automatically added to the svndigest repository, therefore the new
-files in the `revs` and `revprops` directories must be added manually
+files in the 'revs' and 'revprops' directories must be added manually
 to the svndigest repository.
 
@@ -94 +89 @@
 The take home message is that developers should communicate with each
 other when changing the test repository in order to avoid to large
-repository conflicts. AND read the output of `make check`.
+repository conflicts. AND read the output of 'make check'.
 
 
 === yat library ===
 
-Directory `yat/` contains some files from the yat library. These
+Directory 'yat/' contains some files from the yat library. These
 files are not owned by svndigest and should not (if possible) be
-edited here. For more details please see `yat/README`.
+edited here. For more details please see 'yat/README'.
 
 === Output file structure ===
@@ -107 +102 @@
 A directory reflecting the parsed directory is generated for each
 combination of StatsType, Author, and LineType, which is located in
-`<TARGET>/<ROOT>/StatsType/Author/LineType/`. Author may be, on top of
-each author in the repository, a directory ''all'' that is a sum over
-all Authors. In same fashion LineType may be any of the three
-linetypes but may also ''total'', which a sum over all linetypes. In
-each `<TARGET>/<ROOT>/StatsType` there are directories
-`images/LineType` that contain a structure reflecting the parsed
-directory with images for every combination of File, LineType, and
-StatsType. Images for different Authors are identical and therefore
+'<TARGET>/<ROOT>/StatsType/Author/LineType/'. Author may be, on top of
+each author in the repository, a directory 'all' that is a sum over
+all authors. In same fashion 'LineType' may be any of the three
+linetypes but may also be 'total', which is a sum over all
+linetypes. In each '<TARGET>/<ROOT>/StatsType' there are directories
+'images/LineType' that contain a structure reflecting the parsed
+directory with images for every combination of 'File', 'LineType', and
+'StatsType'. Images for different authors are identical and therefore
 shared between authors.
 
 == Design and Motivation ==
 
-Please refer to source:trunk/doc/HACKING for a list of design
-decisions we try to follow.
-
-== Releasing ==
-
-See http://dev.thep.lu.se/svndigest/wiki/ReleaseProcedure
-
-
--------------------------------------------------------------------------
-{{{
+Please refer to 'doc/HACKING' for a list of design decisions we try to
+follow.
+
+= Releasing =
+
+The main development is performed in the trunk branch of the
+repository. A new release branch is created for each minor release
+from the trunk and patch releases are snapshots of the minor release
+branch. This implies that patch work is performed in the minor release
+branch, and changes made release branch is transferred to the trunk
+every time a new patch release is made. Remember, patch work should be
+limited to bug fixes and important fixes only leaving development of
+new features and designs to the trunk branch.
+
+Releases should only be performed by an appointed member of the team,
+the Release Manager.
+
+== Release procedure ==
+
+This section describes what to do when publishing a release.
+
+=== Creating a release branch ===
+
+Once people agree that a new release branch should be made, the
+Release Manager creates it with the following procedure (substitute
+A.B with the version you are preparing):
+
+1. Mark the new minor series in 'NEWS':
+
+8<---
+ See the end for copyrights and conditions.
+
++svndigest A.B.x series from
++          http://dev.thep/lu.se/svndigest/svn/branches/A.B-stable
++
+Version A.B (released NOT YET)
+8<---
+
+   commit the changes with
+
+   #> svn ci -m "preparing branch A.B-stable"
+
+2. Update copyright statements with commands
+
+   #> svncopyright -v
+
+   Examine the updates and commit changes with
+
+   #> svn ci -m "updating copyright statements"
+
+3. Create a new minor branch using a one liner like
+
+   #> make svn-stable-branch
+
+4. Prepare the trunk for the next minor release:
+
+   a) Update version number in 'm4/version.m4'.
+      MY_VERSION_early([A], [B+1], [0], [true])
+
+   b) Add an entry in 'NEWS'
+
+version A.[B+1] (released NOT YET)
+
+      The date is set when version A.[B+1] is released.
+
+   c) Commit changes to the repository
+
+   #> svn ci -m "Bumping VERSION to A.[B+1]"
+
+
+=== Rolling a release ===
+
+This section describes how to release a new version. If this is a
+minor release (C+0), replace A.B.C with A.B. Before you start, make
+sure you have write access to sourceforge page and that you can create
+checksum files, i.e., you need 'openssl' and 'md5'/'md5sum'.
+
+1. Create a new milestone for next patch release A.B.[C+1].
+
+2. Update version number in 'm4/version.m4'. Locate and change the below line
+---
+MY_VERSION_early([A], [B], [C], [false])
+---
+
+3. Update file 'THANKS'
+
+4. Make sure that the items in 'NEWS' cover the new features of the
+   release. Set the date for the new release:
+
+version A.B (released 26 June 2007)
+
+5. Commit changes to the repository
+
+   #> svn ci -m "Preparing release A.B.C"
+
+6. Update copyright statements with commands
+
+   #> make && ./bin/svncopyright -v
+
+   Examine the updates and commit changes with
+
+   #> svn ci -m "updating copyright statements"
+
+7. Issue 'svn update' to make entire wc to be in revision 'HEAD'.
+   Needless to say, make sure that the program is in a state to be
+   released; make sure that all the tests pass, test the distribution
+   package, and perform all other release tests you think is
+   appropriate. Run:
+
+  #> make all && ./build_support/tag_and_release.sh
+
+
+8. Update wiki first page under section 'Latest Release'.
+
+   a) Update version to A.B.C.
+
+   b) Update link to NEWS file to 'source:tags/A.B.C/NEWS'
+
+   c) If this is a minor release (C=0) update links to
+      'source:branches/A.B-stable/doc/readme.txt',
+      'source:branches/A.B-stable/README'.
+
+9. Update SubversionCheckout
+
+   a) In section 'svndigest latest release' update link to
+      [source:tags/A.B.C/NEWS NEWS] and modify the svn commands to
+
+svn checkout http://dev.thep.lu.se/svndigest/svn/tags/A.B.C svndigest-A.B.C
+
+svn switch http://dev.thep.lu.se/svndigest/svn/tags/A.B.C
+
+   b) If this is a minor release (C=0) update link in 'svndigest stable' to
+      [source:branch/A.B-stable/NEWS NEWS] and modify the svn commands to
+
+svn co http://dev.thep.lu.se/svndigest/svn/branches/A.B-stable svndigest-A.B
+
+svn switch ^/branches/A.B-stable
+
+10. Add a version A.B.C using trac-admin tool
+
+11. Close milestone A.B.C
+
+12. Merge the release into trunk. Go to a pristine trunk WC and
+
+   #> cd /path/to/svndigest-trunk
+   #> svn update
+   #> svn diff
+   #> svn merge ^/branches/A.B.C-stable
+
+   Resolve all conflicts. Run tests and perform all other appropriate
+   tests to make sure that the merge does not create havoc. Typically
+   changes in 'm4/version.m4' are problematic so check this file extra
+   carefully.
+
+   Commit changes to the trunk branch.
+
+   #> svn commit -m "Merged release A.B.C to the trunk."
+
+13. Prepare stable branch for future release
+
+   a) Update version number in 'version.m4' in line
+
+      MY_VERSION_early([A], [B], [C+1], [true])
+
+   b) Add an entry in 'NEWS'
+
+8<---
+version A.B.[C+1] (released NOT YET)
+8<---
+      The date is set when version A.B.[C+1] is released. [[br]][[br]]
+
+   c) Commit changes to the repository,
+
+   #> svn ci -m "Bumping version"
+
+14. Send an announcement to svndigest-users@lists.sourceforge.net
+    using 'announment.txt' as template.
+
+15. Create a macport ticket, https://trac.macports.org/newticket, with
+      summary='svndigest A.B.C',
+      type=update,
+      keywords="haspatch maintainer",
+      and port=svndigest.
+    Attach 'Portfile.diff' to newly created ticket.
+
+
+--------------
 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, 2012 Peter Johansson
 
 This file is part of svndigest, http://dev.thep.lu.se/svndigest
@@ -147 +319 @@
 You should have received a copy of the GNU General Public License
 along with svndigest. If not, see <http://www.gnu.org/licenses/>.
-}}}

trunk/THANKS

@@ -18 +18 @@
 http://www.mhoenicka.de/system-cgi/blog/index.php?itemid=999
 
+Vedran Ljubovic for reporting bug #515
+
 -----------------------------------------------------------------------
 {{{
 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, 2012 Peter Johansson
 
 This file is part of svndigest, http://dev.thep.lu.se/svndigest

trunk/configure.ac

@@ -304 +304 @@
                 test/environment.h
                 test/Makefile])
+
+AC_CONFIG_FILES([build_support/tag_and_release.sh],
+                [chmod +x-w build_support/tag_and_release.sh])
 
 AC_CONFIG_HEADER([yat/config_public.h])

trunk/lib/Functor.h

@@ -7 +7 @@
   Copyright (C) 2005 Peter Johansson
   Copyright (C) 2006, 2007, 2008 Jari Häkkinen, Peter Johansson
-  Copyright (C) 2010 Peter Johansson
+  Copyright (C) 2010, 2012 Peter Johansson
 
   This file is part of svndigest, http://dev.thep.lu.se/svndigest
@@ -163 +163 @@
     public std::binary_function<T&, const std::pair<const Key, T>&, void>
   {
-    T operator()(T& x, const std::pair<const Key, T>& p)
+    void operator()(T& x, const std::pair<const Key, T>& p) const
     {
       x += p.second;
-      return x;
     }
   };

trunk/lib/Stats.cc

@@ -240 +240 @@
     if (iter==m.end() || iter->second.empty())
       return 0;
+    assert(iter->second.size());
     return iter->second.back();
   }

trunk/lib/StatsPlotter.cc

@@ -126 +126 @@
       Colors::instance().get_color(label, r,g,b);
       gp.current_color(r,g,b);
-      gp.plot(others, label, others.back());
+      gp.plot(others, label, others.size() ? others.back() : 0);
     }
     for ( ; i!=end; ++i) {

trunk/lib/Vector.h

@@ -185 +185 @@
       size_ = std::max(size_, other.size());
       return *this;
+      return *this;
     }
 

trunk/test/traverse_test.sh

@@ -29 +29 @@
 . ./init.sh || exit 99
 
-# skip this test as long as it is XFAIL because we get false negative
-# with older WC
-# FIXME, remove line below when this test is expected to be successful
-$SVN --version | $GREP "version 1.7" || exit_skip
-
 daughter=.svndigest/branches_wc