Changeset 17 for mergebot/trunk/mergebot/CheckMergeActor.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/CheckMergeActor.py (modified) (2 diffs)

mergebot/trunk/mergebot/CheckMergeActor.py

@@ -1 +1 @@
 #!/usr/bin/env python
 """
-Syntax: MergeActor.py ticketnum component version requestor
-
 Verify that a branch can be merged to its trunk without conflicts, but don't
 commit the merge.
@@ -8 +6 @@
 
 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 check_merge_action(trac_env, ticketnum, component, version, requestor):
+class CheckMergeActor(Actor):
+    """Checks that this ticket can be merged to its baseline, but don't modify
+    the repository.
     """
-    Verify that a branch can be merged to its trunk without conflicts, but
-    don't commit the merge.
-    """
-    task_obj = Task(trac_env, ticketnum)
-    endstatus = "???????"
-    workdir = GetWorkDir(trac_env, ticketnum, __name__)
-    logfile = GetLogFile(trac_env, ticketnum)
-    # FIXME: Should we just bail out instead?
-    if os.path.exists(workdir):
-        os.system("rm -rf \"%s\"" % (workdir))
+    def execute(self):
+        """
+        Verify that a branch can be merged to its trunk without conflicts, but
+        don't commit the merge.
+        """
+        results = {}
+        workdir = self.work_dir
+        logfile = self.logfilename()
 
-    sourceurl = os.path.join(GetRepositoryLocalUrl(trac_env), component,
-        VersionToDir(version))
-    ticketurl = os.path.join(GetRepositoryLocalUrl(trac_env), component, "branches",
-        "ticket-%s" % ticketnum)
+        if os.path.exists(workdir):
+            shutil.rmtree(workdir)
 
-    branch_info = SvnOps.get_branch_info(ticketurl, GetLogFile(trac_env, ticketnum))
-    # FIXME: if not branch_info: # Error case
-    startrev, endrev = branch_info
+        # 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
 
-    SvnOps.checkout(sourceurl, workdir, logfile)
-    # TODO: check return code of the above
-    results = SvnOps.merge(ticketurl, workdir, (startrev, endrev), logfile)
-    conflicts = SvnOps.conflicts_from_merge_results(results)
-    if conflicts:
-        message = "\n".join([
-            "Found %s conflicts while checking merge of %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:
-        message = \
-            "Found no conflicts while checking merge of %s:%s to %s for %s." \
-            % (startrev, endrev, version, requestor)
-        endstatus = "branched"
+        branch_info = SvnOps.get_branch_info(self.branch_local_url(), logfile)
+        if not branch_info:
+            comment = 'Branch for ticket %s does not exist in the repository.' \
+                % (self.ticket)
+            return results, comment, False
+        startrev, endrev = branch_info
 
-    # Clean up the work area
-    os.system("rm -rf \"%s\"" % (workdir, ))
+        SvnOps.checkout(self.baseline_local_url(), workdir, logfile)
+        # TODO: check return code of the above
+        merge_results = SvnOps.merge(self.branch_local_url(), workdir,
+                                     (startrev, endrev), logfile)
+        conflicts = SvnOps.conflicts_from_merge_results(merge_results)
+        if conflicts:
+            message = '\n'.join([
+                'Found %s conflicts while checking merge of %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.',
+            ])
+            success = False
+        else:
+            message = 'Found no conflicts while checking merge of %s:%s to ' \
+                '%s for %s.' % (startrev, endrev, self.version, self.requestor)
+            success = True
 
-    task_obj.AddComment(message)
-    return endstatus, task_obj
+        # Clean up the work area
+        if os.path.exists(workdir):
+            shutil.rmtree(workdir)
 
-class CheckMergeActor(MergeBotActor):
-    "Actor wrapper for the check_merge_action"
-    def __init__(self, trac_env):
-        MergeBotActor.__init__(self, trac_env, "checkmerge", check_merge_action)
-
-def main():
-    tracdir = sys.argv[1]
-    trac_env = trac.env.open_environment(tracdir)
-    mergingActor = CheckMergeActor(trac_env)
-    mergingActor.AddTask(sys.argv[1:])
-    mergingActor.Run()
-
-if __name__ == "__main__":
-    main()
+        return results, message, success
 
 # vim:foldcolumn=4 foldmethod=indent