Changeset 1199 in tailor

Timestamp:

06/30/06 00:38:26 (7 years ago)

Author:

ydirson@…

Hash name:

20060629223826-130f5-8da750a19a02352e15cb0acb97d222c03666f499

Message:

[git] Improve error cases when importing branches

This patch creates a new exception to identify the case where the user made an error
when specifying a "branchpoint" parameter, and does an explicit check to abort when
attempting to initialize an already-intialized git target repo (most notably hit in

File:

• vcpx/repository/git.py (modified) (3 diffs)

vcpx/repository/git.py

@@ -21 +21 @@
 from vcpx.target import SynchronizableTargetWorkingDir, TargetInitializationFailure
 
+from vcpx import TailorException
+
+class BranchpointFailure(TailorException):
+    "Specified branchpoint not found in parent branch"
 
     ## generic stuff
@@ -429 +433 @@
                 mkdir(join(self.basedir, self.repository.METADIR))
 
-                bp = self._tryCommand(['rev-parse', self.repository.BRANCHPOINT])[0]
+                bp = self._tryCommand(['rev-parse', self.repository.BRANCHPOINT],
+                                      BranchpointFailure)[0]
                 self._tryCommand(['read-tree', bp])
                 self._tryCommand(['update-ref', self.repository.BRANCHNAME, bp])
@@ -435 +440 @@
 
             else:
+                if exists(join(self.basedir, self.repository.storagedir)):
+                    raise TargetInitializationFailure(
+                        "Repository %s already exists - "
+                        "did you forget to set \"branch\" parameter ?" % self.repository.storagedir)
+
                 self._tryCommand(['init-db'])
                 if self.repository.repository: