Changeset 51 in tailor for vcpx/cvs.py

Timestamp:

07/06/04 00:10:28 (9 years ago)

Author:

lele@…

Hash name:

20040705221028-97f81-0f860f643ab56ed6d68769d5c0e93deafc93542b

Message:

Use the logger instead of print statements

File:

• vcpx/cvs.py (modified) (5 diffs)

vcpx/cvs.py

@@ -15 +15 @@
 
 from shwrap import SystemCommand
-from source import UpdatableSourceWorkingDir
-from target import SyncronizableTargetWorkingDir
+from source import UpdatableSourceWorkingDir, ChangesetApplicationFailure
+from target import SyncronizableTargetWorkingDir, TargetInitializationFailure
 
 
@@ -194 +194 @@
                 yield Changeset(**pset)
 
-    def _applyChangeset(self, root, changeset):
+    def _applyChangeset(self, root, changeset, logger=None):
         from os.path import join, exists, dirname
         from os import makedirs
@@ -206 +206 @@
             cvsup(output=True, entry=e.name, revision=e.new_revision)
 
+            if cvsup.exit_status:
+                raise ChangesetApplicationFailure(
+                    "'cvs update' returned status %s" % cvsup.exit_status)
+            
             if e.action_kind == e.DELETED:
                 # XXX: should drop edir if empty
                 pass
                 
-
-    ## SyncronizableTargetWorkingDir
-
-    def _addEntry(self, root, entry):
-        """
-        Add a new entry, maybe registering the directory as well.
-        """
-
-        from os.path import split, join, exists
-
-        basedir = split(entry)[0]
-        if basedir and not exists(join(root, basedir, 'CVS')):
-            self._addEntry(root, basedir)
-        
-        c = CvsAdd(working_dir=root)
-        c(entry=entry)
-
-    def _checkoutUpstreamRevision(self, basedir, repository, module, revision):
+    def _checkoutUpstreamRevision(self, basedir, repository, module, revision,
+                                  logger=None):
         """
         Concretely do the checkout of the upstream sources. Use `revision` as
@@ -244 +232 @@
               module=module,
               revision=revision)
+            if c.exit_status:
+                raise TargetInitializationFailure(
+                    "'cvs checkout' returned status %s" % c.exit_status)
+        else:
+            if logger: logger.info("Using existing %s", wdir)
             
         self.__forceTagOnEachEntry(wdir)
@@ -268 +261 @@
                 break
 
-        assert found, "Something went wrong, did not find the right cvsps revision in '%s'" % wdir
-        
+        if not found:
+            raise TargetInitializationFailure(
+                "Something went wrong, did not find the right cvsps "
+                "revision in '%s'" % wdir)
+        else:
+            if logger: logger.info("working copy up to cvsps revision %s",
+                                   last.revision)
+            
         return last.revision
+    
+
+    ## SyncronizableTargetWorkingDir
+
+    def _addEntry(self, root, entry):
+        """
+        Add a new entry, maybe registering the directory as well.
+        """
+
+        from os.path import split, join, exists
+
+        basedir = split(entry)[0]
+        if basedir and not exists(join(root, basedir, 'CVS')):
+            self._addEntry(root, basedir)
+        
+        c = CvsAdd(working_dir=root)
+        c(entry=entry)
 
     def __forceTagOnEachEntry(self, root):