Changes in mergebot/trunk/mergebot/RebranchActor.py [17:30]

File:

• mergebot/trunk/mergebot/RebranchActor.py (modified) (4 diffs)

mergebot/trunk/mergebot/RebranchActor.py

@@ -36 +36 @@
 
         # Make sure the various urls we require do exist
-        if not SvnOps.get_branch_info(self.local_url(), logfile):
-            comment = 'Component %s does not exist in the repository.' \
-                % self.component
-            return results, comment, False
-        if not SvnOps.get_branch_info(self.local_url() + '/branches', logfile):
-            comment = 'No directory in which to create branches for ' \
-                'component %s in the repository.' % self.component
-            return results, comment, False
-        if not SvnOps.get_branch_info(self.baseline_local_url(), logfile):
-            comment = 'Version %s for component %s does not exist in the ' \
-                'repository.' % (self.version, self.component)
-            return results, comment, False
+        problems = self.check_required_directories()
+        if problems:
+            return results, problems, False
 
         rev_info = SvnOps.get_branch_info(self.branch_local_url(), logfile)
@@ -97 +88 @@
                 "Rebranch internal error: Unable to recreate the branch.  %s" \
                     % (instructioncomment, )),
-            (lambda x: SvnOps.checkout(self.branch_local_url(), workingcopy, x),
-                "Rebranch internal error: Unable to get working copy.  %s" % \
-                    (instructioncomment, )),
         )
         for cmd, error_comment in commanderrors:
@@ -108 +96 @@
                 results['mergebotstate'] = 'rebranchfailed'
                 return results, error_comment, False
+
+        # Check to see if there have been no commits on the branch.  If there
+        # have been no commits, we know we don't need to merge anything.
+        if startrev == endrev:
+            ticket_message = "\n".join([
+                "Rebranched from %s for %s." % (self.version,
+                                                self.requestor),
+                "There were no changes to commit to the branch since there "
+                    "were no commits on the branch.",
+                "You will need to update your working copy.",
+            ])
+            results['mergebotstate'] = 'branched'
+            return results, ticket_message, True
+
+        retval = SvnOps.checkout(self.branch_local_url(), workingcopy, logfile)
+        if retval:
+            error_comment = \
+                "Rebranch internal error: Unable to get working copy.  " + \
+                instructioncomment
+            if os.path.exists(workingcopy):
+                shutil.rmtree(workingcopy)
+            results['mergebotstate'] = 'rebranchfailed'
+            return results, error_comment, False
 
         # On success, we're in the same state as if we had just branched.
@@ -135 +146 @@
                     "commit your work to the branch.",
             ]) 
+            success = False # the rebranch failed because there were conflicts
         else: # No conflicts, do the commit.
             mergemessage = "\n".join([