Changeset 429 in tailor

Timestamp:

07/25/05 23:51:54 (8 years ago)

Author:

lele@…

Hash name:

20050725215154-97f81-40c2a3994b65a80a7459f0faaa3dc06b7502b5e8

Message:

When properly setup even svn can have real timestamps and authors

Files:

• vcpx/svn.py (modified) (2 diffs)
• vcpx/tailor.py (modified) (4 diffs)
• README (modified) (1 diff)

vcpx/svn.py

@@ -311 +311 @@
             log.write('\n')
             log.write(changelog.encode(encoding))
-        log.write("\n\nOriginal author: %s\nDate: %s\n" % (
-            author.encode(encoding), date))
+
+        # If we cannot use propset, fall back to old behaviour of
+        # appending these info to the changelog
+        
+        if not self.USE_PROPSET:
+            log.write("\n\nOriginal author: %s\nDate: %s\n" % (
+                author.encode(encoding), date))
+
         log.close()            
 
@@ -322 +328 @@
             
         commit.execute(entries)
-        
+
+        if self.USE_PROPSET:
+            cmd = [SVN_CMD, "propset", "%(propname)s",
+                   "--quiet", "--revprop", "-rHEAD"]
+            propset = ExternalCommand(cwd=root, command=cmd)
+
+            propset.execute(date.isoformat()+".000000Z", propname='svn:date')
+            propset.execute(author, propname='svn:author')
+
     def _removePathnames(self, root, names):
         """

vcpx/tailor.py

@@ -22 +22 @@
 from source import InvocationError
 from session import interactive
+from svn import SvnWorkingDir
 
 STATUS_FILENAME = 'tailor.info'
@@ -533 +534 @@
 ]
 
+VC_SPECIFIC_OPTIONS = [
+    make_option("--use-svn-propset", action="store_true", default=False,
+                help="Use 'svn propset' to set the real date and author of "
+                     "each commit, instead of appending these information to "
+                     "the changelog. This requires some tweaks on the SVN "
+                     "repository to enable revision propchanges."),
+]
+                
 class ExistingProjectError(Exception):
     "Project seems already tailored"
@@ -566 +575 @@
     upoptions = OptionGroup(parser, "Update options")
     upoptions.add_options(UPDATE_OPTIONS)
+
+    vcoptions = OptionGroup(parser, "VC specific options")
+    vcoptions.add_options(VC_SPECIFIC_OPTIONS)
     
     parser.add_option_group(bsoptions)
     parser.add_option_group(upoptions)
+    parser.add_option_group(vcoptions)
     
     options, args = parser.parse_args()
@@ -588 +601 @@
     Changeset.REFILL_MESSAGE = not options.dont_refill_changelogs
 
+    SvnWorkingDir.USE_PROPSET = options.use_svn_propset
+    
     if options.interactive:
         interactive(options, args)

README

@@ -103 +103 @@
 
       $ tailor -D -v $HOME/svnwc/cmfcore
-      
+
+   .. note:: In the step a) above, you may want to install an
+             appropriate hook in the repository to enable the
+             propset command to operate on unversioned properties,
+             as described in the `svn manual`__. Then you can
+             specify '--use-svn-propset' option, and tailor will
+             put the original author and timestamp in the proper
+             svn metadata instead of appending them to the changelog.
+
+             Beware: there is a note__ that revisions have to be
+             sorted in date order! This means that, if you have an
+             existing subversion repository, you can't really add in
+             another project.  The dates would all be interwined.
+             You would basically have to recreate the repo.  You can
+             work around this by using separate repos.
+
+__ http://svnbook.red-bean.com/en/1.0/ch05s02.html#svn-ch-5-sect-2.1
+__ http://svn.haxx.se/users/archive-2004-05/0245.shtml
+   
+   
 3. Showing each command bootstrap a new DARCS repos in
    "~/darcs/cmftopic" under which the upstream module will be