Changeset 564 in tailor

Timestamp:

08/15/05 02:29:57 (8 years ago)

Author:

lele@…

Hash name:

20050815002957-97f81-18d8b5f937688041998a01280cb505f5cea8d51f

Message:

Handle the case when sincerev is INITIAL or HEAD

File:

• vcpx/cvs.py (modified) (1 diff)

vcpx/cvs.py

@@ -291 +291 @@
                 branch=tag[1:-1]
 
-        if not sincerev:
-            # We are bootstrapping, trying to collimate the
-            # actual revision on disk with the changesets.
+        cmd = [self.repository.CVS_CMD, "-f", "-d", "%(repository)s", "rlog",
+               "-N"]
+
+        if not sincerev or sincerev in ("INITIAL", "HEAD"):
+            # We are bootstrapping, trying to collimate the actual
+            # revision on disk with the changesets, or figuring out
+            # the first revision
             since = None
+            if sincerev == "HEAD":
+                if branch and branch<>'HEAD':
+                    cmd.append("-r%(branch)s.")
+                else:
+                    cmd.append("-rHEAD:HEAD")
+            else:
+                cmd.append("-r:HEAD")
         else:
             # Assume this is from __getGlobalRevision()
             since, author = sincerev.split(' by ')
-
-        cmd = [self.repository.cvs, "-f", "-d", "%(repository)s", "rlog", "-N",
-               "-r:%(branch)s"]
-        if since:
-            cmd.extend(["-d", "%(since)s UTC<"])
+            cmd.extend(["-d", "%(since)s UTC<", "-r:%(branch)s"])
 
         cvslog = ExternalCommand(command=cmd)