Changeset 1470

Timestamp:

Mar 19, 2012, 8:18:49 AM (11 years ago)

Author:

Peter Johansson

Message:

merge patch release 0.9.5 into trunk

Location:

trunk

Files:

• . (modified) (1 prop)
• Makefile.am (modified) (2 diffs)
• NEWS (modified) (2 diffs)
• build_support/Portfile.in (modified) (1 diff)
• lib/Directory.cc (modified) (4 diffs)
• m4/version.m4 (modified) (1 diff, 1 prop)
• test/Makefile.am (modified) (2 diffs)
• test/traverse_test.sh (copied) (copied from branches/0.9-stable/test/traverse_test.sh) (1 diff)

trunk/Makefile.am

@@ -62 +62 @@
 MAINTAINER_CHECK_LOCAL += syntax-check
 # extra check in release rule
-RELEASE_LOCAL = check-svn_revision check-readme
+RELEASE_LOCAL = check-svn_revision check-readme check-openssl
 
-.PHONY: check-svn_revision
+.PHONY: check-svn_revision check-openssl
 
 FORCE:
+
+check-openssl:
+  @openssl version > /dev/null || exit 1
 
 check-svn_revision:
@@ -101 +104 @@
   -e 's|@VERSION[@]|$(VERSION)|g'
 
-build_support/Portfile: $(distdir).tar.gz Makefile build_support/Portfile.in
+build_support/Portfile: $(distdir).tar.gz Makefile build_support/Portfile.in check-openssl
   @rm -f $@ $@.t
-  @openssl version > /dev/null || exit 1
-  @openssl sha1 $(distdir).tar.gz > $(distdir).tar.gz.sha1
+  @openssl sha256 $(distdir).tar.gz > $(distdir).tar.gz.sha256
   @openssl rmd160 $(distdir).tar.gz > $(distdir).tar.gz.rmd160
-  @sha1=`cut -f 2 -d ' ' $(distdir).tar.gz.sha1`;\
+  @sha256=`cut -f 2 -d ' ' $(distdir).tar.gz.sha256`;\
   rmd160=`cut -f 2 -d ' ' $(distdir).tar.gz.rmd160`;\
-  $(edit) -e "s|@SHA1SUM[@]|$$sha1|g" -e "s|@RMD160SUM[@]|$$rmd160|g" \
+  $(edit) -e "s|@SHA256SUM[@]|$$sha256|g" \
+  -e "s|@RMD160SUM[@]|$$rmd160|g" \
   '$(srcdir)/build_support/Portfile.in' > $@.t
   @chmod a-w $@.t

trunk/NEWS

@@ -14 +14 @@
 svndigest 0.9.x series from
     http://dev.thep.lu.se/svndigest/svn/branches/0.9-stable
+
+Version 0.9.5 (released 19 March 2012)
+  Fixed bug that directories belonging to other WC were traversed (bug #512)
+
+  A complete list of closed tickets can be found here [[br]]
+  http://dev.thep.lu.se/svndigest/query?status=closed&milestone=svndigest+0.9.5
 
 Version 0.9.4 (released 22 October 2011)
@@ -228 +234 @@
 Copyright (C) 2005, 2006 Jari Häkkinen
 Copyright (C) 2007, 2008, 2009 Jari Häkkinen, Peter Johansson
-Copyright (C) 2010, 2011 Peter Johansson
+Copyright (C) 2010, 2011, 2012 Peter Johansson
 
 This file is part of svndigest, http://dev.thep.lu.se/svndigest

trunk/build_support/Portfile.in

@@ -20 +20 @@
 
 homepage            @PACKAGE_URL@
-master_sites        sourceforge
+master_sites        sourceforge:project/svndigest
 
-checksums           sha1    @SHA1SUM@ \
-                    rmd160  @RMD160SUM@
+checksums           rmd160  @RMD160SUM@ \
+                    sha256  @SHA256SUM@
 
 depends_build       port:pkgconfig

trunk/lib/Directory.cc

@@ -3 +3 @@
 /*
   Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Jari Häkkinen, Peter Johansson
+  Copyright (C) 2012 Peter Johansson
 
   This file is part of svndigest, http://dev.thep.lu.se/svndigest
@@ -30 +31 @@
 #include "NodeVisitor.h"
 #include "SVN.h"
+#include "SVNinfo.h"
 #include "SVNlog.h"
 #include "TinyStats.h"
@@ -60 +62 @@
 
     SVN* svn=SVN::instance();
+    std::string mother_url = SVNinfo(path).url();
+    assert(mother_url.size());
     for (DirectoryUtil::const_iterator i=dir.begin(); i!=dir.end(); ++i) {
       std::string fn = file_name(i->path());
@@ -66 +70 @@
         switch(svn->version_controlled(fullpath)) {
         case SVN::uptodate:
+          std::cout << "uptodate\n";
           struct stat nodestat;                // C api from sys/stat.h
           lstat(fullpath,&nodestat);   // C api from sys/stat.h
-          if (S_ISDIR(nodestat.st_mode))       // C api from sys/stat.h
+          if (S_ISDIR(nodestat.st_mode)) {     // C api from sys/stat.h
+            // ignore directory if it is not a daughter of 'path' in repo
+            std::string url = SVNinfo(fullpath).url();
+            if (mother_url != directory_name(url))
+              continue;
             daughters_.push_back(new Directory(level_+1,fullpath,local_path()));
+          }
           else
             daughters_.push_back(new File(level_,fullpath,local_path()));

trunk/m4/version.m4

@@ -2 +2 @@
 #
 # Copyright (C) 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

trunk/test/Makefile.am

@@ -4 +4 @@
 
 # Copyright (C) 2005, 2006, 2007, 2008, 2009, 2010 Jari Häkkinen, Peter Johansson
-# Copyright (C) 2011 Peter Johansson
+# Copyright (C) 2011, 2012 Peter Johansson
 #
 # This file is part of svndigest, http://dev.thep.lu.se/svndigest
@@ -53 +53 @@
 distributed_TESTS += svncopyright_test.sh
 distributed_TESTS += svndigest_copy_cache_test.sh
+distributed_TESTS += traverse_test.sh
 distributed_TESTS += try_help_test.sh
 

trunk/test/traverse_test.sh

@@ -50 +50 @@
 $SVN log $rootdir/$daughter
 SVNCOPYRIGHT_run 0 -v -r $rootdir
-$GREP "^Parsing.*$rootdir/.svndigest" stdout || exit_fail
+$GREP "^Parsing.*$rootdir/bin/" stdout || exit_fail
 $GREP "^Parsing.*$rootdir/$daughter" stdout && exit_fail