Merge lp:~thedac/codetree/raise-exceptions-on-errors into lp:~codetree-maintainers/codetree/master

[David Ames]

Currently, bzr actions fail quietly
In the context of mojo we need them to fail explicitly

Very open to better solutions or if there is a grand plan for exception handling

[Matthew Wedgwood (mew)]

This has been incorporated into https://code.launchpad.net/~mew/codetree/fixes-with-thedac/+merge/186454, with the ability for the user to choose the behavior when an operation fails.

Unmerged revisions

27. By David Ames on 2013-09-18

Raise expceptions on failures

26. By David Ames on 2013-09-18

Branch only to the revno requested

=== modified file 'codetree/handlers.py' (properties changed: -x to +x)
--- codetree/handlers.py	2013-09-14 18:28:43 +0000
+++ codetree/handlers.py	2013-09-18 18:17:15 +0000
@@ -15,14 +15,15 @@
 
 
 def log_failure(cmd, message):
-    try:
-        with open(os.devnull) as devnull:
-            logging.info(message)
-            check_output(cmd, stderr=devnull)
-    except CalledProcessError as e:
-        logging.error(e.output)
-    except OSError as e:
-        logging.error(e.message)
+     try:
+        logging.info(message)
+        check_output(cmd)
+     except CalledProcessError as e:
+        logging.error(e)
+        raise BaseException(e)
+     except OSError as e:
+        logging.error(e)
+        raise OSError(e)
 
 
 class SourceHandler(object):
@@ -55,18 +56,20 @@
         parent_dir = os.path.dirname(dest)
         if parent_dir and not os.path.exists(parent_dir):
             os.makedirs(parent_dir)
-        cmd = ('bzr', 'branch', self.source, dest)
+        cmd = ['bzr', 'branch', self.source, dest]
+        if self.revno:
+            cmd.insert(2, '-r')
+            cmd.insert(3, self.revno)
         log_failure(cmd, "Branching {} to {}".format(self.source, dest))
 
     def update_branch(self, dest):
         cmd = ("bzr", "pull", "-d", dest)
         log_failure(cmd, "Updating {} from parent ({})".format(dest, self.source))
 
-    def revno_branch(self, dest, revno):
-        cmd = ('bzr', 'update', dest, '-r', revno)
-        log_failure(cmd, "Checking out revision {} of {}".format(revno, self.source))
-
     def is_same_branch(self, dest):
+        # Add trailing '/' if missing
+        if self.source[-1] != '/':
+            self.source += '/'
         bzr_cmd = ("bzr", "info", dest)
         grep_cmd = ("grep", "parent branch")
         bzr_call = Popen(bzr_cmd, stdout=PIPE)
@@ -81,6 +84,10 @@
     def get(self, dest, options=None):
         if not options:
             options = {}
+        if "revno" in options:
+            self.revno = options["revno"]
+        else:
+            self.revno = None
 
         if os.path.exists(dest):
             # if the parent is the same, update the branch
@@ -91,12 +98,10 @@
                 shutil.rmtree(dest)
                 self.checkout_branch(dest)
             else:
-                logging.info("Skipping existing dest {}".format(dest))
-                return False
+                logging.info("Dest, {}, exists but has a different parent ".format(dest))
+                raise BaseException("Dest, {}, exists but has a different parent".format(dest))
         else:
             self.checkout_branch(dest)
-        if "revno" in options:
-            self.revno_branch(dest, options["revno"])
 
         return True