Changeset 565 in tailor

Timestamp:

08/15/05 02:30:52 (8 years ago)

Author:

lele@…

Hash name:

20050815003052-97f81-81f20b5590f4f93495abeb528c8d3aa0a396a58e

Message:

Fix old code still using repository and module arguments

Location:

vcpx

Files:

• cvsps.py (modified) (5 diffs)
• cvs.py (modified) (2 diffs)

vcpx/cvsps.py

@@ -263 +263 @@
         from cvs import CvsEntries, compare_cvs_revs
 
-        if not module:
+        if not self.repository.module:
             raise InvocationError("Must specify a module name")
 
@@ -284 +284 @@
 
         if not exists(join(self.basedir, 'CVS')):
-            cmd = [self.repository.CVS_CMD, "-q", "-d", repository, "checkout",
-                   "-d", self.basedir]
+            cmd = [self.repository.CVS_CMD, "-q", "-d",
+                   self.repository.repository, "checkout",
+                   "-d", self.repository.subdir]
             if revision:
                 cmd.extend(["-r", revision])
@@ -291 +292 @@
                 cmd.extend(["-D", "%s UTC" % timestamp])
 
-            checkout = ExternalCommand(command=cmd)
-            checkout.execute(module)
+            checkout = ExternalCommand(cwd=self.repository.rootdir, command=cmd)
+            checkout.execute(self.repository.module)
 
             if checkout.exit_status:
@@ -301 +302 @@
             self.log_info("Using existing %s", self.basedir)
 
-        self.__forceTagOnEachEntry(self.basedir)
-
-        entries = CvsEntries(wdir)
+        self.__forceTagOnEachEntry()
+
+        entries = CvsEntries(self.basedir)
         youngest_entry = entries.getYoungestEntry()
         if youngest_entry is None:
@@ -332 +333 @@
             raise TargetInitializationFailure(
                 "Something went wrong: unable to determine the exact upstream "
-                "revision of the checked out tree in '%s'" % wdir)
+                "revision of the checked out tree in '%s'" % self.basedir)
         else:
-            self.log_info("working copy up to cvsps revision %s", last.revision)
+            self.log_info("working copy up to cvs revision %s" % last.revision)
 
         return last

vcpx/cvs.py

@@ -313 +313 @@
         cvslog = ExternalCommand(command=cmd)
 
-        log = cvslog.execute(module, stdout=PIPE, stderr=STDOUT,
-                             repository=repository, since=since,
-                             branch=branch or 'HEAD', TZ='UTC')
+        log = cvslog.execute(self.repository.module, stdout=PIPE, stderr=STDOUT,
+                             repository=self.repository.repository,
+                             since=since, branch=branch or 'HEAD', TZ='UTC')
 
         if cvslog.exit_status:
@@ -321 +321 @@
                 "%s returned status %d" % (str(cvslog), cvslog.exit_status))
 
-        return changesets_from_cvslog(log, module)
+        return changesets_from_cvslog(log, self.repository.module)