Merge lp:~xnox/merge-o-matic/add-proposed into lp:merge-o-matic

[Dimitri John Ledkov]

[lp:~xnox/merge-o-matic/add-proposed]

239. By Dimitri John Ledkov on 2013-11-06

Add -P convenience alias to produce-merges.py, equivalent to --dest-suite OUR_DIST-proposed.

240. By Dimitri John Ledkov on 2013-11-06

Modify cron.daily to execute produce-merges.py against -proposed destination suite.

[Dimitri John Ledkov (xnox)]

Similarly convenience options "-P" could be added to:
 generate-patches.py: parser.add_option("-s", "--dest-suite", type="string", metavar="SUITE",
 manual-status.py: parser.add_option("-s", "--dest-suite", type="string", metavar="SUITE",
 merge-status.py: parser.add_option("-s", "--dest-suite", type="string", metavar="SUITE",
 stats.py: parser.add_option("-s", "--dest-suite", type="string", metavar="SUITE",

Or simply cron / specify them with "-s trusty-proposed"

Alternatively "dest-suite" can become an APPEND mode list, defaulting to [$OUR_DIST-proposed, $OUR_DIST] and trying package from each one, until first one succeeds.

[Colin Watson (cjwatson)]

 review needs-fixing

On Wed, Nov 06, 2013 at 10:35:47AM -0000, Dmitrijs Ledkovs wrote:
> # Run the merge tool
> +# Note "last one" wins
> ./produce-merges.py -X ../merge-blacklist.txt -X ../experimental.txt -X ../unstable.txt -X ../testing-proposed-updates.txt
> ./produce-merges.py -X ../merge-blacklist.txt -I ../experimental.txt -X ../unstable.txt -X ../testing-proposed-updates.txt -S experimental
> ./produce-merges.py -X ../merge-blacklist.txt -X ../experimental.txt -I ../unstable.txt -X ../testing-proposed-updates.txt -S unstable
> ./produce-merges.py -X ../merge-blacklist.txt -X ../experimental.txt -X ../unstable.txt -I ../testing-proposed-updates.txt -S testing-proposed-updates
> +./produce-merges.py -X ../merge-blacklist.txt -X ../experimental.txt -X ../unstable.txt -X ../testing-proposed-updates.txt -P
> +./produce-merges.py -X ../merge-blacklist.txt -I ../experimental.txt -X ../unstable.txt -X ../testing-proposed-updates.txt -P -S experimental
> +./produce-merges.py -X ../merge-blacklist.txt -X ../experimental.txt -I ../unstable.txt -X ../testing-proposed-updates.txt -P -S unstable
> +./produce-merges.py -X ../merge-blacklist.txt -X ../experimental.txt -X ../unstable.txt -I ../testing-proposed-updates.txt -P -S testing-proposed-updates

Can't we just do a single run (for each source suite) that looks for the
newest in trusty or trusty-proposed? I don't really like doubling the
number of runs, especially as this means we'll be doing some unnecessary
work for packages that appear merged in trusty-proposed but not yet in
trusty.

It would seem a lot more intuitive if produce-merges could infer
sensible behaviour from DISTROS["ubuntu"]["dists"] having multiple
elements.

review: Needs Fixing

[Sebastien Bacher (seb128)]

Changing to "Work in progress" so it's dropping from the sponsoring queue, please change it back to "Needs review" once you do the requested changes

Unmerged revisions

240. By Dimitri John Ledkov on 2013-11-06

Modify cron.daily to execute produce-merges.py against -proposed destination suite.

239. By Dimitri John Ledkov on 2013-11-06

Add -P convenience alias to produce-merges.py, equivalent to --dest-suite OUR_DIST-proposed.

238. By Dimitri John Ledkov on 2013-11-06

Add trusty-proposed in momlib.py for caching.

=== modified file 'cron.daily'
--- cron.daily	2011-05-05 00:32:15 +0000
+++ cron.daily	2013-11-06 10:36:47 +0000
@@ -56,10 +56,15 @@
 # ./mail-bugs.py $QUIET
 
 # Run the merge tool
+# Note "last one" wins
 ./produce-merges.py -X ../merge-blacklist.txt -X ../experimental.txt -X ../unstable.txt -X ../testing-proposed-updates.txt
 ./produce-merges.py -X ../merge-blacklist.txt -I ../experimental.txt -X ../unstable.txt -X ../testing-proposed-updates.txt -S experimental
 ./produce-merges.py -X ../merge-blacklist.txt -X ../experimental.txt -I ../unstable.txt -X ../testing-proposed-updates.txt -S unstable
 ./produce-merges.py -X ../merge-blacklist.txt -X ../experimental.txt -X ../unstable.txt -I ../testing-proposed-updates.txt -S testing-proposed-updates
+./produce-merges.py -X ../merge-blacklist.txt -X ../experimental.txt -X ../unstable.txt -X ../testing-proposed-updates.txt -P
+./produce-merges.py -X ../merge-blacklist.txt -I ../experimental.txt -X ../unstable.txt -X ../testing-proposed-updates.txt -P -S experimental
+./produce-merges.py -X ../merge-blacklist.txt -X ../experimental.txt -I ../unstable.txt -X ../testing-proposed-updates.txt -P -S unstable
+./produce-merges.py -X ../merge-blacklist.txt -X ../experimental.txt -X ../unstable.txt -I ../testing-proposed-updates.txt -P -S testing-proposed-updates
 
 # Produce pretty reports
 ./stats.py $QUIET

=== modified file 'momlib.py'
--- momlib.py	2013-10-21 11:14:35 +0000
+++ momlib.py	2013-11-06 10:36:47 +0000
@@ -54,7 +54,7 @@
 DISTROS = {
     "ubuntu": {
         "mirror": "http://archive.ubuntu.com/ubuntu",
-        "dists": [ "trusty" ],
+        "dists": [ "trusty", "trusty-proposed" ],
         "components": [ "main", "restricted", "universe", "multiverse" ],
         "expire": True,
         },

=== modified file 'produce-merges.py'
--- produce-merges.py	2012-11-09 13:43:55 +0000
+++ produce-merges.py	2013-11-06 10:36:47 +0000
@@ -56,6 +56,8 @@
     parser.add_option("-s", "--dest-suite", type="string", metavar="SUITE",
                       default=OUR_DIST,
                       help="Destination suite (aka distrorelease)")
+    parser.add_option("-P", "--dest-proposed-suite", action="store_true",
+                      help="Append -proposed to Destination suite (aka distrorelease-proposed)")
 
     parser.add_option("-p", "--package", type="string", metavar="PACKAGE",
                       action="append",
@@ -79,6 +81,8 @@
 
     our_distro = options.dest_distro
     our_dist = options.dest_suite
+    if options.dest_proposed_suite:
+        our_dist = our_dist + "-proposed"
 
     excludes = []
     if options.exclude is not None: