Changeset 892 in tailor

Timestamp:

10/12/05 17:08:51 (8 years ago)

Author:

lele@…

Hash name:

20051012150851-7a6fb-4c4e0d1b0d5761ece93861834e2a94381f0398ea

Message:

Do not specify multi level subdirs to CVS checkout -d option
This should fix ticket #9, as it is now possible to use arbitrary
subdirectory for the source working dir.

File:

• vcpx/cvsps.py (modified) (3 diffs)

vcpx/cvsps.py

@@ -263 +263 @@
         """
 
-        from os.path import join, exists
+        from os.path import join, exists, split
         from cvs import CvsEntries, compare_cvs_revs
         from time import sleep
@@ -296 +296 @@
 
         if not exists(join(self.basedir, 'CVS')):
+            # CVS does not handle "checkout -d multi/level/subdir", so
+            # split the basedir and use it's parentdir as cwd below.
+            parentdir, subdir = split(self.basedir)
             cmd = self.repository.command("-q",
                                           "-d", self.repository.repository,
                                           "checkout",
-                                          "-d", self.repository.subdir)
+                                          "-d", subdir)
             if revision:
                 cmd.extend(["-r", revision])
@@ -305 +308 @@
                 cmd.extend(["-D", "%s UTC" % timestamp])
 
-            checkout = ExternalCommand(cwd=self.repository.rootdir, command=cmd)
+            checkout = ExternalCommand(cwd=parentdir, command=cmd)
             retry = 0
             while True: