Changeset 17 for mergebot/trunk/mergebot/BranchActor.py

Timestamp:

Jun 8, 2009 3:07:47 AM (15 years ago)

Author:

retracile

Message:

Mergebot: redesigned implementation. Still has rough edges.

File:

• mergebot/trunk/mergebot/BranchActor.py (modified) (1 diff)

mergebot/trunk/mergebot/BranchActor.py

@@ -1 +1 @@
 #!/usr/bin/env python
 """Module for creating new branches for tickets"""
-# Syntax: BranchActor.py ticketnum component version requestor
 
 import os
-import sys
 import time
-import trac.env
 
-import SvnOps
-from WorkQueue import MergeBotActor, VersionToDir
-from TrackerTools import GetRepositoryPublicUrl, GetRepositoryLocalUrl, Task, \
-    GetLogFile
+from mergebot import SvnOps
+from mergebot.Actor import Actor
 
-def branch_action(trac_env, ticketnum, component, version, requestor):
-    "Create the branch"
-    task_obj = Task(trac_env, ticketnum)
+class BranchActor(Actor):
+    """This class handles creating a new branch for a ticket."""
+    def execute(self):
+        """Create the branch for the given ticket.
+        """
+        results = {}
+        # Setup logging
+        logfile = self.logfilename()
+        open(logfile, "a").write("%s: branching ticket %s\n" % (time.asctime(),
+            self.ticket))
 
-    # Setup logging
-    logfile = GetLogFile(trac_env, ticketnum)
-    open(logfile, "a").write("%s: branching ticket %s\n" % (time.asctime(),
-        ticketnum))
+        # 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
 
-    # Determine the URLS to copy from and to
-    branchdir = "branches/ticket-%s" % (ticketnum)
-    copyfrom = os.path.join(GetRepositoryLocalUrl(trac_env), component,
-        VersionToDir(version))
-    copyto = os.path.join(GetRepositoryLocalUrl(trac_env), component, branchdir)
+        commit_header = 'Ticket #%s: %s' % (self.ticket, self.summary)
 
-    commit_header = "Ticket #%s: %s" % (ticketnum, task_obj.GetSummary())
+        # 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):
+            # This branch already exists.
+            commit_message = "\n".join([commit_header,
+                "    Delete old branch",
+            ])
+            new_rev = SvnOps.delete_branch(self.branch_local_url(),
+                                           commit_message, logfile)
+            if new_rev == -1:
+                results['mergebotstate'] = 'branchfailed'
+                comment = 'Deleting the existing branch failed.'
+                return results, comment, False
 
-    # 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(copyto, logfile):
-        # This branch already exists.
+        # Do the branch creationg
         commit_message = "\n".join([commit_header,
-            "    Delete old branch",
+            "    Create branch from %s for %s." % (self.version,
+                                                   self.requestor),
         ])
-        new_rev = SvnOps.delete_branch(copyto, commit_message, logfile)
-        if new_rev == -1:
-            status = "branchfailed"
-            return status, task_obj
-
-    # Do the branch creationg
-    commit_message = "\n".join([commit_header,
-        "    Create branch from %s for %s." % (version, requestor),
-    ])
-    retval = SvnOps.create_branch(copyfrom, copyto, commit_message, logfile)
-    if retval:
-        # Failed for some reason.
-        status = "branchfailed"
-    else:
-        publiccopyto = os.path.join(GetRepositoryPublicUrl(trac_env), component,
-            branchdir)
-        comment = "\n".join([
-            "Created branch from %s for %s." % (version, requestor),
-            "",
-            "Browse branch [source:%s source code] and [log:%s commit log]." % 
-                (os.path.join(component, branchdir),
-                os.path.join(component, branchdir)),
-            "",
-            "To checkout, run:",
-            "{{{",
-            "svn checkout %s %s-%s" % (publiccopyto, component, ticketnum),
-            "}}}",
+        retval = SvnOps.create_branch(self.baseline_local_url(),
+            self.branch_local_url(), commit_message, logfile)
+        if retval:
+            # Failed for some reason.
+            results['mergebotstate'] = 'branchfailed'
+            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].' % 
+                (self.component, self.ticket, self.component, self.ticket),
+            '',
+            'To checkout, run:',
+            '{{{',
+            'svn checkout %s %s-%s' % (self.branch_public_url(),
+                                       self.component, self.ticket),
+            '}}}',
         ])
-        task_obj.AddComment(comment)
-        status = "branched"
-    return status, task_obj
-
-class BranchActor(MergeBotActor):
-    "Actor for creating a new branch."
-    def __init__(self, trac_env):
-        MergeBotActor.__init__(self, trac_env, "branch", branch_action)
-
-def main():
-    tracdir = sys.argv[1]
-    trac_env = trac.env.open_environment(tracdir)
-    branchingActor = BranchActor(trac_env)
-    branchingActor.AddTask(sys.argv[2:])
-    branchingActor.Run()
-
-if __name__ == "__main__":
-    main()
+        return results, comment, True
 
 # vim:foldcolumn=4 foldmethod=indent