Changeset 17 in tailor

Timestamp:

06/21/04 20:32:26 (9 years ago)

Author:

lele@…

Hash name:

20040621183226-97f81-38ec6db6d42b18a1976fa7a4b13638cd314acbe1

Message:

Various fixes to the CVS classes and commands

Location:

vcpx

Files:

• cvs.py (modified) (7 diffs)
• darcs.py (modified) (2 diffs)
• dualwd.py (modified) (1 diff)

vcpx/cvs.py

@@ -14 +14 @@
 
 class CvsPsLog(SystemCommand):
-    COMMAND = "cvsps %(update)s-b%(branch)s"
+    COMMAND = "cvsps %(update)s-b %(branch)s 2>/dev/null"
 
     def __call__(self, output=None, dry_run=False, **kwargs):
@@ -27 +27 @@
     
 class CvsUpdate(SystemCommand):
-    COMMAND = 'cvs %(dry)supdate -d -r%(revision)s %(entry)s2>&1'
+    COMMAND = 'cvs -q %(dry)supdate -d -r%(revision)s %(entry)s2>&1'
     
     def __call__(self, output=None, dry_run=False, **kwargs):
@@ -40 +40 @@
 
 class CvsAdd(SystemCommand):
-    COMMAND = "cvs add %(entry)s"
+    COMMAND = "cvs -q add %(entry)s"
 
 
 class CvsCommit(SystemCommand):
-    COMMAND = "cvs ci -F %(logfile)s %(entries)s"
+    COMMAND = "cvs -q ci -F %(logfile)s %(entries)s"
     
 
 class CvsRemove(SystemCommand):
-    COMMAND = "cvs remove %(entry)s"
+    COMMAND = "cvs -q remove %(entry)s"
 
 
 class CvsCheckout(SystemCommand):
-    COMMAND = "cvs -d%(repository)s checkout -r %(revision)s %(module)s"
+    COMMAND = "cvs -q -d%(repository)s checkout -r %(revision)s %(module)s"
 
 
@@ -98 +98 @@
         f.write(revision)
         f.close()
-        
+
     def _getUpstreamChangesets(self, root):
-        cvsps = CvsPsLog(update=True, working_dir=root)
+        cvsps = CvsPsLog(working_dir=root)
 
         startfrom_rev = self.__getLastUpstreamRevision(root)
         if startfrom_rev:
-            startfrom_rev = int(startfrom_rev)
+            startfrom_rev = int(startfrom_rev)+1
             
         from os.path import join, exists
         
-        fname = join(self.root, 'CVS', 'Tag')
+        fname = join(root, 'CVS', 'Tag')
         if exists(fname):
             branch=open(fname).read()[1:-1]
@@ -115 +115 @@
 
         changesets = []
-        log = cvsps(output=True, branch=branch)
+        log = cvsps(output=True, update=True, branch=branch)
         for cs in self.__enumerateChangesets(log):
-            if not startfrom_rev or (startfrom_rev<=cs.revision):
+            if not startfrom_rev or (startfrom_rev<=int(cs.revision)):
                 changesets.append(cs)
+
         return changesets
     
@@ -197 +198 @@
     def _applyChangeset(self, root, changeset):
         cvsup = CvsUpdate(working_dir=root)
-        for e in cs.entries:
+        for e in changeset.entries:
             cvsup(entry=e.name, revision=e.new_revision)
-        self.__setLastUpstreamRevision(root, revision)
+        self.__setLastUpstreamRevision(root, changeset.revision)
         
     ## SyncronizableTargetWorkingDir
@@ -223 +224 @@
         """
 
+        from os.path import join
+        
         c = CvsCheckout(working_dir=basedir)
-        c(repository=repository, module=module, revision=revision)
-        
+        c(output=True, repository=repository, module=module, revision=revision)
+
+        # update cvsps cache and get its last CVS "revision"
+        wdir = join(basedir, module)
+        csets = self._getUpstreamChangesets(wdir)
+        last = csets[-1]
+        self.__setLastUpstreamRevision(wdir, last.revision)
+
     def _commit(self, root, author, remark, changelog=None, entries=None):
         """

vcpx/darcs.py

@@ -18 +18 @@
 
 class DarcsRecord(SystemCommand):
-    COMMAND = "darcs record --standard-verbosity --all --look-for-adds --author=%(author)s --logfile=%(logfile)s"
+    COMMAND = "darcs record --all --look-for-adds --author=%(author)s --logfile=%(logfile)s"
 
     def __call__(self, output=None, dry_run=False, patchname=None, **kwargs):
@@ -111 +111 @@
 
         c = DarcsRecord(working_dir=root)
-        c(patchname=remark, logmessage=changelog, author=author)
+        c(output=True, patchname=remark, logmessage=changelog, author=author)
         
     def _removeEntry(self, root, entry):

vcpx/dualwd.py

@@ -73 +73 @@
     dwd.applyUpstreamChangesets('/tmp/prove/provapyde')
 
+    dwd = DualWorkingDir('cvs', 'darcs')
+    dwd.bootstrap('/tmp/prove/PyApache', '/usr/local/CVSROOT/', 'HEAD')
+    dwd.applyUpstreamChangesets('/tmp/prove/PyApache')
+