Changeset 188 in tailor for vcpx/tailor.py

Timestamp:

12/27/04 22:03:13 (8 years ago)

Author:

lele@…

Hash name:

20041227210313-97f81-9d067907aacf7f01b341fefbaf24c3a6a5521dd1

Message:

Better error messages

File:

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

vcpx/tailor.py

@@ -266 +266 @@
         self.logger.info("getting %s revision '%s' of '%s' from '%s'" % (
             source_kind, revision, module, repository))
-        actual = dwd.checkoutUpstreamRevision(self.root, repository,
-                                              module, revision,
-                                              subdir=subdir,
-                                              logger=self.logger)
-
+
+        try:
+            actual = dwd.checkoutUpstreamRevision(self.root, repository,
+                                                  module, revision,
+                                                  subdir=subdir,
+                                                  logger=self.logger)
+        except:
+            self.logger.exception('Checkout failed!')
+            raise
+        
         # the above machinery checked out a copy under of the wc
         # in the directory named as the last component of the module's name
@@ -276 +281 @@
         if not subdir:
             subdir = module
-            
-        dwd.initializeNewWorkingDir(self.root, repository, subdir, actual)
-
+
+        try:
+            dwd.initializeNewWorkingDir(self.root, repository, subdir, actual)
+        except:
+            self.logger.exception('Working copy initialization failed!')
+            raise
+        
         self.source_kind = source_kind
         self.target_kind = target_kind
@@ -339 +348 @@
             if self.verbose:
                 print "Applying %d upstream changesets" % nchanges
+
+            try:
+                l,c = dwd.applyUpstreamChangesets(proj, changesets,
+                                                  applyable=self.applyable,
+                                                  applied=self.applied,
+                                                  logger=self.logger,
+                                                  delayed_commit=single_commit)
+            except:
+                self.logger.exception('Upstream change application failed')
                 
-            l,c = dwd.applyUpstreamChangesets(proj, changesets,
-                                              applyable=self.applyable,
-                                              applied=self.applied,
-                                              logger=self.logger,
-                                              delayed_commit=single_commit)
             if l:
                 if single_commit: