Changeset 274 in tailor

Timestamp:

05/03/05 23:09:22 (8 years ago)

Author:

lele@…

Hash name:

20050503210922-97f81-3418e6994738ef9497e078cfe8394266b8d944dc

Message:

Allow also a timestamp as initial CVS revision to bootstrap from

Files:

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

vcpx/cvsps.py

@@ -64 +64 @@
 
 class CvsCheckout(SystemCommand):
-    COMMAND = "cvs -q -d%(repository)s checkout -r%(revision)s -d%(workingdir)s %(module)s"
+    COMMAND = "cvs -q -d%(repository)s checkout %(revision)s -d%(workingdir)s %(module)s"
+
+    def __call__(self, output=None, dry_run=False, **kwargs):
+        revision = kwargs['revision']
+        if revision is None:
+            revision = ''
+        else:
+            # If the revision contains a space, assume it really
+            # specify a branch and a timestamp. If it starts with
+            # a digit, assume it's a timestamp. Otherwise, it must
+            # be a branch name
+            if revision[0] in '0123456789':
+                revision = "-D'%s'" % revision
+            elif ' ' in revision:
+                branch, timestamp =revision.split(' ', 1)
+                revision = "-r%s -D'%s'" % (branch, timestamp)
+            else:
+                revision = '-r%s' % revision
+        kwargs['revision'] = revision
+        
+        return SystemCommand.__call__(self, output=output,
+                                      dry_run=False, **kwargs)
 
 
@@ -291 +312 @@
         """
         Concretely do the checkout of the upstream sources. Use `revision` as
-        the name of the tag to get.
+        the name of the tag to get, or as a date if it starts with a number.
 
         Return the effective cvsps revision.

vcpx/tailor.py

@@ -503 +503 @@
                 help="Specify the revision bootstrap should checkout.  REV "
                      "must be a valid 'name' for a revision in the upstream "
-                     "version control kind.  For CVS it may be a tag/branch. "
+                     "version control kind. For CVS it may be either a branch "
+                     "name, a timestamp or both separated by a space. "
                      "'HEAD', the default, means the latest version in all "
                      "backends.",

README

@@ -85 +85 @@
              revision, otherwise svn will exit with an error.
 
+6. Bootstrap from a CVS branch, starting from a given point in time::
+
+  $ tailor.py -b -s cvs -R :pserver:anonymous@server.org:/cvsroot/ \
+              --revision 'unstable-branch 2001-12-25 23:26:48 UTC' \
+              --module something new-darcs-repository
+
 
 Resolving conflicts