Changeset 17 for mergebot/trunk/mergebot/MergeActor.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/MergeActor.py (modified) (1 diff)

mergebot/trunk/mergebot/MergeActor.py

@@ -7 +7 @@
 
 import os
-import sys
-import trac.env
+import shutil
 
-import SvnOps
-from WorkQueue import MergeBotActor, VersionToDir
-from TrackerTools import GetWorkDir, GetRepositoryLocalUrl, Task, GetLogFile
+from mergebot import SvnOps
+from mergebot.Actor import Actor
 
-def merge_action(trac_env, ticketnum, component, version, requestor):
-    "Merge a branch to its trunk"
-    task_obj = Task(trac_env, ticketnum)
-    logfile = GetLogFile(trac_env, ticketnum)
+class MergeActor(Actor):
+    """Merges a branch to the line of development on which it is based.
+    """
+    def execute(self):
+        "Merge a branch to its trunk"
+        results = {}
+        logfile = self.logfilename()
+        checkoutdir = self.work_dir
+        # Delete the working directory so we get a completely clean working
+        # copy.
+        if os.path.exists(checkoutdir):
+            shutil.rmtree(checkoutdir)
 
-    checkoutdir = GetWorkDir(trac_env, ticketnum, __name__)
-    # FIXME: Should we just bail out instead?
-    if os.path.exists(checkoutdir):
-        os.system("rm -rf \"%s\" >>%s 2>&1" % (checkoutdir, logfile))
+        # 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
 
-    sourceurl = os.path.join(GetRepositoryLocalUrl(trac_env), component,
-        VersionToDir(version))
-    ticketurl = os.path.join(GetRepositoryLocalUrl(trac_env), component, "branches",
-        "ticket-%s" % ticketnum)
+        rev_info = SvnOps.get_branch_info(self.branch_local_url(), logfile)
+        if not rev_info:
+            comment = 'Branch for ticket %s does not exist in the repository.' % (self.ticket)
+            return results, comment, False
+        startrev, endrev = rev_info
 
-    # FIXME: needs error checking
-    startrev, endrev = SvnOps.get_branch_info(ticketurl, logfile)
+        SvnOps.checkout(self.baseline_local_url(), checkoutdir, logfile)
+        # FIXME: check return code
+        merge_results = SvnOps.merge(self.branch_local_url(), checkoutdir,
+                               (startrev, endrev), logfile)
+        conflicts = SvnOps.conflicts_from_merge_results(merge_results)
+        if conflicts:
+            comment = "\n".join([
+                "Found %s conflicts in attempt to merge %s:%s to %s for %s." % \
+                    (len(conflicts), startrev, endrev, self.version,
+                     self.requestor),
+                "Files in conflict:",
+                "{{{",
+                "\n".join(conflicts),
+                "}}}",
+                "A rebranch will be needed before this can be merged.",
+            ])
+            results['mergebotstate'] = 'conflicts'
+            success = False
+        else:
+            # The merge worked, so commit the changes.
+            commitmessage = "\n".join([
+                "Ticket #%s: %s" % (self.ticket, self.summary),
+                "    Merge of %s:%s to %s for %s." % (startrev, endrev,
+                    self.version, self.requestor),
+            ])
+            committedrev = SvnOps.commit(checkoutdir, commitmessage, logfile)
+            # Sed message and endstatus
+            if committedrev == None:
+                # Apparently nothing to commit.
+                comment = "\n".join([
+                    "Merged %s:%s to %s for %s." % (startrev, endrev,
+                        self.version, self.requestor),
+                    "No changes to commit.",
+                ])
+                results['mergebotstate'] = 'merged'
+                success = True
+            elif committedrev >= 0:
+                # The commit succeeded.
+                comment = "\n".join([
+                    "Merged %s:%s to %s for %s." % (startrev, endrev,
+                        self.version, self.requestor),
+                    "Changeset [%s]. [source:%s/%s@%s]" % (committedrev,
+                        self.component, self.version_subdir(), committedrev),
+                ])
+                results['mergebotstate'] = 'merged'
+                success = True
+            else:
+                # The commit for the merge failed.
+                comment = \
+                    "Commit failed in attempt to merge %s:%s to %s for %s." \
+                    % (startrev, endrev, self.version, self.requestor)
+                #results['mergebotstate'] = 'mergefailed'
+                success = False
 
-    SvnOps.checkout(sourceurl, checkoutdir, logfile)
-    # FIXME: check return code
-    results = SvnOps.merge(ticketurl, checkoutdir, (startrev, endrev), logfile)
-    conflicts = SvnOps.conflicts_from_merge_results(results)
-    if conflicts:
-        message = "\n".join([
-            "Found %s conflicts in attempt to merge %s:%s to %s for %s." % \
-                (len(conflicts), startrev, endrev, version, requestor),
-            "Files in conflict:",
-            "{{{",
-            "\n".join(conflicts),
-            "}}}",
-            "A rebranch will be needed before this can be merged.",
-        ])
-        endstatus = "conflicts"
-    else:
-        # The merge worked, so commit the changes.
-        summary = task_obj.GetSummary()
-        commitmessage = "\n".join([
-            "Ticket #%s: %s" % (ticketnum, summary),
-            "    Merge of %s:%s to %s for %s." % (startrev, endrev, version,
-                requestor),
-        ])
-        committedrev = SvnOps.commit(checkoutdir, commitmessage, logfile)
-        # Sed message and endstatus
-        if committedrev == None:
-            # Apparently nothing to commit.
-            message = "\n".join([
-                "Merged %s:%s to %s for %s." % (startrev, endrev, version,
-                    requestor),
-                "No changes to commit.",
-            ])
-            endstatus = "merged"
-        elif committedrev >= 0:
-            # The commit succeeded.
-            message = "\n".join([
-                "Merged %s:%s to %s for %s." % (startrev, endrev, version,
-                    requestor),
-                "Changeset [%s]. [source:%s/%s@%s]" % (committedrev,
-                    component, VersionToDir(version), committedrev),
-            ])
-            endstatus = "merged"
-        else:
-            # The commit for the merge failed.
-            message = "Commit failed in attempt to merge %s:%s to %s for %s." \
-                % (startrev, endrev, version, requestor)
-            endstatus = "mergefailed"
+        # Clean up the work area
+        if os.path.exists(checkoutdir):
+            shutil.rmtree(checkoutdir)
 
-    # Clean up the work area
-    os.system("rm -rf \"%s\" >>%s 2>&1" % (checkoutdir, logfile))
-
-    task_obj.AddComment(message)
-    return endstatus, task_obj
-
-class MergeActor(MergeBotActor):
-    "Actor wrapper for merge_action"
-    def __init__(self, trac_env):
-        MergeBotActor.__init__(self, trac_env, "merge", merge_action)
-
-def main():
-    tracdir = sys.argv[1]
-    trac_env = trac.env.open_environment(tracdir)
-    mergingActor = MergeActor(trac_env)
-    mergingActor.AddTask(sys.argv[2:])
-    mergingActor.Run()
-
-if __name__ == "__main__":
-    main()
+        return results, comment, success
 
 # vim:foldcolumn=4 foldmethod=indent