launchpad-reviewers team mailing list archive

[Steve Kowalik <stevenk@xxxxxxxxxx>]

Steve Kowalik has proposed merging lp:~stevenk/launchpad/rf-mp-status-improvements into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~stevenk/launchpad/rf-mp-status-improvements/+merge/72327

Improve the messages that rf-mp-status reports about remote vs local branches and fix one bit of lint.
-- 
https://code.launchpad.net/~stevenk/launchpad/rf-mp-status-improvements/+merge/72327
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~stevenk/launchpad/rf-mp-status-improvements into lp:launchpad.

=== modified file 'utilities/rocketfuel-mp-status'
--- utilities/rocketfuel-mp-status	2010-10-24 21:00:11 +0000
+++ utilities/rocketfuel-mp-status	2011-08-21 08:51:25 +0000
@@ -22,7 +22,7 @@
     if lb == trunk:
         continue
     try:
-        _branch  = branch.Branch.open(lb)
+        _branch = branch.Branch.open(lb)
     except errors.NotBranchError:
         continue
     print ' * %s' % lb
@@ -32,10 +32,12 @@
     except errors.NotBranchError:
         print '   - Remote branch does not exist'
         continue
-    if _branch.revno() != rem_branch.revno():
+    if _branch.revno() == rem_branch.revno():
+        print '   - Remote branch is up to date'
+    elif _branch.revno() > rem_branch.revno():
         print '   - Remote branch is missing revisions'
-    else:
-        print '   - Remote branch is up to date'
+    elif _branch.revno() < rem_branch.revno():
+        print '   - Local branch is missing revisions'
     remote = lp_branches.getByUrl(url = rem_branch_url)
     mps = remote.landing_targets
     for mp in mps: