Merge lp:~gz/hydrazine/hide_unmerged_prerequisites_703057 into lp:hydrazine

[Martin Packman]

Stops presenting approved merge proposals to be sent for landing if they have prerequisite branches that have not yet been merged.

For instance, currently this simple branch looks like it's ready to be landed:

<https://code.launchpad.net/~jameinel/bzr/2.1-categorize-requests-819604/+merge/78708>

But in fact depends on a much bigger branch that has yet to be reviewed:

<https://code.launchpad.net/~jameinel/bzr/2.1-client-reconnect-819604/+merge/78597>

Perhaps some kind of override should be added as well? I've occasionally in the past sent a branch to land immediately followed by another one that depended on it. However, it's probably better in general to actually see if the first one succeeds first, and with 30 minute run time these days that's less of a hassle to do.

[John A Meinel (jameinel)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 10/8/2011 11:44 PM, Martin Packman wrote:
> Martin Packman has proposed merging
> lp:~gz/hydrazine/hide_unmerged_prerequisites_703057 into
> lp:hydrazine.
>
> Requested reviews: hydrazine-core (hydrazine-core) Related bugs:
> Bug #703057 in Hydrazine: "feed-pqm suggests approved mp's with
> unapproved prerequisites"
> https://bugs.launchpad.net/hydrazine/+bug/703057
>
> For more details, see:
> https://code.launchpad.net/~gz/hydrazine/hide_unmerged_prerequisites_703057/+merge/78736
>
> Stops presenting approved merge proposals to be sent for landing
> if they have prerequisite branches that have not yet been merged.
>
> For instance, currently this simple branch looks like it's ready to
> be landed:
>
> <https://code.launchpad.net/~jameinel/bzr/2.1-categorize-requests-819604/+merge/78708>
>
> But in fact depends on a much bigger branch that has yet to be
> reviewed:
>
> <https://code.launchpad.net/~jameinel/bzr/2.1-client-reconnect-819604/+merge/78597>
>
> Perhaps some kind of override should be added as well? I've
> occasionally in the past sent a branch to land immediately followed
> by another one that depended on it. However, it's probably better
> in general to actually see if the first one succeeds first, and
> with 30 minute run time these days that's less of a hassle to do.

I think this is reasonable.
 review: approve

John
=:->

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk6Q1PcACgkQJdeBCYSNAAN12ACgo1d0wYjI7Q9JjKoVmFAMJ+lf
3XwAn3uLUdtOEeILgZYXuHt2bYx70a8B
=s/g8
-----END PGP SIGNATURE-----

review: Approve

=== modified file 'feed-pqm'
--- feed-pqm	2011-06-02 10:40:25 +0000
+++ feed-pqm	2011-10-08 21:43:24 +0000
@@ -90,6 +90,9 @@
     print '  %12s: %s' % ('message', mp.commit_message)
     print '  %12s: %s' % ('source', mp.source_branch.bzr_identity)
     print '  %12s: %s' % ('target', mp.target_branch.bzr_identity)
+    prereq_branch = mp.prerequisite_branch
+    if prereq_branch is not None:
+        print '  %12s: %s' % ('prereq', prereq_branch.bzr_identity)
     print '  %12s: %s' % ('status', mp.queue_status)
     show_datetime('created', mp.date_created)
     show_datetime('reviewed', mp.date_reviewed)
@@ -173,6 +176,26 @@
     return True
 
 
+def iter_mergable_proposals(project, include_queued=False):
+    """Iterate over merge proposals for `project` that are ready to be landed
+
+    If `show_queued` is set, proposals using launchpad queue tracking which
+    are already due to be landed are also shown. This doesn't matter for merge
+    commands sent by email instead.
+
+    Proposals that have unmerged prerequiste branches will not be offered for
+    merging to prevent accidentally landing unreviewed code.
+    """
+    find_status = ['Approved']
+    if include_queued:
+        find_status.append('Queued')
+    print 'Looking for %r mps in %s' % (find_status, project)
+    for mp in project.getMergeProposals(status=find_status):
+        prereq = mp.prerequisite_branch
+        if not prereq or prereq.lifecycle_status == 'Merged':
+            yield mp
+
+
 def main(argv):
     parser = optparse.OptionParser('%prog [options] PROJECT\n\n'
         '  PROJECT is the launchpad project to inspect (eg bzr)')
@@ -187,11 +210,8 @@
     launchpad = hydrazine.create_session()
     project = launchpad.projects[project]
     i = 0
-    find_status = ['Approved']
-    if opts.queued:
-        find_status.append('Queued')
-    print 'Looking for %s mps in %s' % (find_status, project)
-    all_mps = list(project.getMergeProposals(status=find_status))
+    all_mps = list(iter_mergable_proposals(project,
+        include_queued=opts.queued))
     while len(all_mps):
         mp = all_mps[i]
         show_mp(mp)