Changes in mergebot/trunk/mergebot/BranchActor.py [17:29]

File:

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

mergebot/trunk/mergebot/BranchActor.py

@@ -2 +2 @@
 """Module for creating new branches for tickets"""
 
-import os
 import time
 
@@ -20 +19 @@
 
         # 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
 
         commit_header = 'Ticket #%s: %s' % (self.ticket, self.summary)
@@ -35 +27 @@
         # Delete the branch if it already exists.  This can happen if the branch
         # was merged, but we're still working on it.
-        if SvnOps.get_branch_info(self.branch_local_url(), logfile):
+        if SvnOps.does_url_exist(self.branch_local_url()):
             # This branch already exists.
             commit_message = "\n".join([commit_header,
@@ -59 +51 @@
             comment = 'Failed to create branch.'
             return results, comment, False
+
         results['mergebotstate'] = 'branched'
         comment = '\n'.join([
             'Created branch from %s for %s.' % (self.version, self.requestor),
             '',
-            'Browse branch [source:%s/branches/ticket-%s source code] and [log:%s/branches/ticket-%s commit log].' % 
+            'Browse branch [source:%s/branches/ticket-%s source code] and ' \
+                '[log:%s/branches/ticket-%s commit log].' % 
                 (self.component, self.ticket, self.component, self.ticket),
             '',