Changeset 1392

Timestamp:

Jul 12, 2011, 4:56:29 AM (11 years ago)

Author:

Peter Johansson

Message:

merge patch release 0.9.3 into trunk

Location:

trunk

Files:

• . (modified) (1 prop)
• Makefile.am (modified) (3 diffs)
• NEWS (modified) (5 diffs)
• lib/CopyrightVisitor.cc (modified) (1 diff)
• lib/utility.cc (modified) (2 diffs)
• lib/utility.h (modified) (2 diffs)
• m4/apache_LICENSE-2.0.txt (modified) (1 prop)
• 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/Makefile.am (modified) (2 diffs)
• test/permission_test.sh (copied) (copied from branches/0.9-stable/test/permission_test.sh)

trunk/Makefile.am

@@ -64 +64 @@
 .PHONY: check-svn_revision
 
+FORCE:
+
 check-svn_revision:
   @$(SVNVERSION) | $(EGREP) '^[0-9]+$$' || \
@@ -80 +82 @@
 
 # run in end of release target
-RELEASE_HOOK = build_support/Portfile.v$(VERSION)
+RELEASE_HOOK = build_support/Portfile.diff
+
+macport_url = http://svn.macports.org/repository/macports/trunk/dports/devel/svndigest
+
+build_support/Portfile.diff: build_support/Portfile FORCE
+  test -e build_support/macport \
+  || svn co $(macport_url) build_support/macport
+  svn revert -R build_support/macport
+  svn update build_support/macport
+  cp build_support/Portfile build_support/macport/Portfile 
+  svn diff build_support/macport/Portfile > $@
+  svn revert build_support/macport/Portfile
 
 edit = $(SED) \
@@ -86 +99 @@
   -e 's|@VERSION[@]|$(VERSION)|g'
 
-build_support/Portfile.v$(VERSION): Makefile build_support/Portfile.in
+build_support/Portfile: $(distdir).tar.gz Makefile build_support/Portfile.in
   @rm -f $@ $@.t
   @openssl version > /dev/null || exit 1

trunk/NEWS

@@ -14 +14 @@
     http://dev.thep.lu.se/svndigest/svn/branches/0.9-stable
 
+Version 0.9.3 (released 12 July 2011)
+  - svncopyright now preserves file permissions (bug #505)
+
+  A complete list of closed tickets can be found here [[br]]
+  http://dev.thep.lu.se/svndigest/query?status=closed&milestone=svndigest+0.9.3
+
 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
+  http://dev.thep.lu.se/svndigest/query?status=closed&milestone=svndigest+0.9.2
 
 Version 0.9.1 (released 18 November 2010)
@@ -25 +31 @@
 
   A complete list of closed tickets can be found here [[br]]
-  http://dev.thep.lu.se/svndigest/query?status=closed&milestone=0.9.1
+  http://dev.thep.lu.se/svndigest/query?status=closed&milestone=svndigest+0.9.1
 
 Version 0.9 (released 6 November 2010)
@@ -37 +43 @@
 
   A complete list of closed tickets can be found here [[br]]
-  http://dev.thep.lu.se/svndigest/query?status=closed&milestone=0.9
+  http://dev.thep.lu.se/svndigest/query?status=closed&milestone=svndigest+0.9
 
 svndigest 0.8.x series from
@@ -46 +52 @@
 
   A complete list of closed tickets can be found here [[br]]
-  http://dev.thep.lu.se/svndigest/query?status=closed&milestone=0.8.1
+  http://dev.thep.lu.se/svndigest/query?status=closed&milestone=svndigest+0.8.1
 
 Version 0.8 (released 25 August 2010)
@@ -63 +69 @@
 
   A complete list of closed tickets can be found here [[br]]
-  http://dev.thep.lu.se/svndigest/query?status=closed&milestone=0.8
+  http://dev.thep.lu.se/svndigest/query?status=closed&milestone=svndigest+0.8
 
 svndigest 0.7.x series from

trunk/lib/CopyrightVisitor.cc

@@ -179 +179 @@
     
     // finally rename file 
+    struct stat nodestat;
+    stat(path.c_str(), &nodestat);
     rename(tmpname, path);
+    chmod(path, nodestat.st_mode);
   }
 

trunk/lib/utility.cc

@@ -3 +3 @@
 /*
   Copyright (C) 2006, 2007, 2008, 2009 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
@@ -75 +75 @@
 
 
+  void chmod(const std::string& filename, mode_t mode)
+  {
+    if (::chmod(filename.c_str(), mode))
+      throw yat::utility::errno_error("chmod: ");
+  }
+
+
   std::string concatenate_path(std::string dir, std::string base)
   {

trunk/lib/utility.h

@@ -7 +7 @@
   Copyright (C) 2005 Peter Johansson
   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
@@ -59 +59 @@
 
   /**
+   */
+  void chmod(const std::string& filename, mode_t mode);
+
+  /**
      wrapper around GNU C Library function chdir
 

trunk/test/Makefile.am

@@ -46 +46 @@
 distributed_TESTS += error_test.sh
 distributed_TESTS += link_root_test.sh
+distributed_TESTS += permission_test.sh
 distributed_TESTS += repo_status_test.sh
 distributed_TESTS += repo_test.sh
@@ -103 +104 @@
 copyright_cache_test.log:init.sh $(top_builddir)/bin/svncopyright$(EXEEXT) $(repo_stamp)
 link_root_test.log:init.sh $(top_builddir)/bin/svndigest$(EXEEXT) $(repo_stamp)
+permission_test.log:init.sh $(top_builddir)/bin/svncopyright$(EXEEXT) $(repo_stamp)
 repo_status_test.log:init.sh 
 repo_test.log:init.sh $(top_builddir)/bin/svndigest$(EXEEXT) $(repo_stamp)