Merge lp:~henninge/launchpad/on-edge into lp:launchpad

[Henning Eggers]

Improved the on-edge script to display the last automatic merge on db-stable.

[Henning Eggers (henninge)]

Improved jml's "on-edge" script to show the last automatic merge on db-stable. Very useful if you can't wait to QA your branch on staging!

Also fixed a bug where the code was passing a string into dotted_revno_to_revision_id instead of a tuple, thus causing it to always throw an exception.

Finally, the script now also dectects when the local copy of a branch is actually older than what's on edge/staging.

[Jeroen T. Vermeulen (jtv)]

Looks fine. A few nits: "res" is not a very good variable name, so use "match" instead. Double blank line above get_last_automatic_stable_merge_revno. That's about it.

review: Approve (code)

=== modified file 'utilities/on-edge'
--- utilities/on-edge	2010-02-01 23:41:00 +0000
+++ utilities/on-edge	2010-02-02 18:36:26 +0000
@@ -61,25 +61,58 @@
     return os.path.dirname(os.path.dirname(os.path.dirname(this_file)))
 
 
+def print_revisions(branch, end_id):
+    """Output revision messages up to end_id."""
+    rev_iter = branch.iter_merge_sorted_revisions(
+        None, end_id, 'include')
+    for rev_info in rev_iter:
+        (rev_id, depth, revno, end_of_merge) = rev_info
+        if depth > 0:
+            continue
+        revision = branch.repository.get_revision(rev_id)
+        revno_str = ".".join(map(str, revno))
+        print "r%s:\n%s" % (revno_str, revision.message)
+
+
 def report_difference_to_server(server, branch_path, revno, verbose):
+    """Output if and how the local branch differs from the server."""
     branch = Branch.open(branch_path)
-    print '%s is running %s r%s' % (server, branch.nick, revno)
+    print '%s is running %s r%d.' % (server, branch.nick, revno)
     try:
-        branch.dotted_revno_to_revision_id(str(revno + 1))
+        current_id = branch.dotted_revno_to_revision_id((revno,))
     except errors.NoSuchRevision:
-        print '%s is up-to-date' % (server,)
+        print '%s has newer revisions than %s.' % (server, branch.nick)
     else:
-        if verbose:
-            command = 'bzr log -r%s.. %s' % (revno, branch_path)
-            os.system(command)
-            print
+        if current_id == branch.last_revision():
+            print '%s is up-to-date.' % (server,)
+        else:
+            if verbose:
+                print_revisions(branch, current_id)
+
+
+automatic_merge_regex = re.compile(
+    "automatic merge from stable[.] "
+    "Revisions:[0-9,\s]*\s+([0-9]+)\s+included")
+
+
+def get_last_automatic_stable_merge_revno(branch_path):
+    """Find out which stable revision was last commited to db-stable."""
+    branch = Branch.open(branch_path)
+    for rev_info in branch.iter_merge_sorted_revisions():
+        (rev_id, depth, revno, end_of_merge) = rev_info
+        if depth > 0:
+            continue
+        revision = branch.repository.get_revision(rev_id)
+        match = automatic_merge_regex.search(revision.message)
+        if match is not None:
+            return match.group(1)
 
 
 def get_opt_parse():
     parser = optparse.OptionParser(
         description="Show local revisions that aren't on beta servers.")
     parser.add_option(
-        '-v', '--verbose', action='store_true', help="Show revision log")
+        '-v', '--verbose', action='store_true', help="Show revision log.")
     parser.add_option(
         '--edge-only', action='store_true',
         help="Only show revisions not on edge. Do not consult staging.")
@@ -103,6 +136,8 @@
         db_stable_branch = os.path.join(parent_dir, 'db-stable')
         report_difference_to_server(
             'staging', db_stable_branch, staging_revision, verbose)
+        print "Last automatic merge on db-stable was stable r%s." % (
+            get_last_automatic_stable_merge_revno(db_stable_branch),)
 
 
 def main(argv):