Merge-o-Matic

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

  1. add-proposed
  2. Merge into trunk
Proposed by Dimitri John Ledkov
Status: Work in progress
Proposed branch: lp:~xnox/merge-o-matic/add-proposed
Merge into: lp:merge-o-matic
Diff against target: 54 lines (+10/-1)
3 files modified
cron.daily (+5/-0)
momlib.py (+1/-1)
produce-merges.py (+4/-0)
To merge this branch: bzr merge lp:~xnox/merge-o-matic/add-proposed
Reviewer Review Type Date Requested Status
Colin Watson Needs Fixing
Ubuntu Core Development Team Pending
Review via email: mp+194100@code.launchpad.net
To post a comment you must log in.
lp:~xnox/merge-o-matic/add-proposed updated
239. By Dimitri John Ledkov

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

240. By Dimitri John Ledkov

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

Revision history for this message
Dimitri John Ledkov (xnox) wrote :

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.

Reply
Revision history for this message
Colin Watson (cjwatson) wrote :

 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
Reply
Revision history for this message
Sebastien Bacher (seb128) wrote :

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

Reply

Unmerged revisions

240. By Dimitri John Ledkov

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

239. By Dimitri John Ledkov

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

238. By Dimitri John Ledkov

Add trusty-proposed in momlib.py for caching.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
56# ./mail-bugs.py $QUIET56# ./mail-bugs.py $QUIET
5757
58# Run the merge tool58# Run the merge tool
59# Note "last one" wins
59./produce-merges.py -X ../merge-blacklist.txt -X ../experimental.txt -X ../unstable.txt -X ../testing-proposed-updates.txt60./produce-merges.py -X ../merge-blacklist.txt -X ../experimental.txt -X ../unstable.txt -X ../testing-proposed-updates.txt
60./produce-merges.py -X ../merge-blacklist.txt -I ../experimental.txt -X ../unstable.txt -X ../testing-proposed-updates.txt -S experimental61./produce-merges.py -X ../merge-blacklist.txt -I ../experimental.txt -X ../unstable.txt -X ../testing-proposed-updates.txt -S experimental
61./produce-merges.py -X ../merge-blacklist.txt -X ../experimental.txt -I ../unstable.txt -X ../testing-proposed-updates.txt -S unstable62./produce-merges.py -X ../merge-blacklist.txt -X ../experimental.txt -I ../unstable.txt -X ../testing-proposed-updates.txt -S unstable
62./produce-merges.py -X ../merge-blacklist.txt -X ../experimental.txt -X ../unstable.txt -I ../testing-proposed-updates.txt -S testing-proposed-updates63./produce-merges.py -X ../merge-blacklist.txt -X ../experimental.txt -X ../unstable.txt -I ../testing-proposed-updates.txt -S testing-proposed-updates
64./produce-merges.py -X ../merge-blacklist.txt -X ../experimental.txt -X ../unstable.txt -X ../testing-proposed-updates.txt -P
65./produce-merges.py -X ../merge-blacklist.txt -I ../experimental.txt -X ../unstable.txt -X ../testing-proposed-updates.txt -P -S experimental
66./produce-merges.py -X ../merge-blacklist.txt -X ../experimental.txt -I ../unstable.txt -X ../testing-proposed-updates.txt -P -S unstable
67./produce-merges.py -X ../merge-blacklist.txt -X ../experimental.txt -X ../unstable.txt -I ../testing-proposed-updates.txt -P -S testing-proposed-updates
6368
64# Produce pretty reports69# Produce pretty reports
65./stats.py $QUIET70./stats.py $QUIET
6671
=== 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 @@
54DISTROS = {54DISTROS = {
55 "ubuntu": {55 "ubuntu": {
56 "mirror": "http://archive.ubuntu.com/ubuntu",56 "mirror": "http://archive.ubuntu.com/ubuntu",
57 "dists": [ "trusty" ],57 "dists": [ "trusty", "trusty-proposed" ],
58 "components": [ "main", "restricted", "universe", "multiverse" ],58 "components": [ "main", "restricted", "universe", "multiverse" ],
59 "expire": True,59 "expire": True,
60 },60 },
6161
=== 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 @@
56 parser.add_option("-s", "--dest-suite", type="string", metavar="SUITE",56 parser.add_option("-s", "--dest-suite", type="string", metavar="SUITE",
57 default=OUR_DIST,57 default=OUR_DIST,
58 help="Destination suite (aka distrorelease)")58 help="Destination suite (aka distrorelease)")
59 parser.add_option("-P", "--dest-proposed-suite", action="store_true",
60 help="Append -proposed to Destination suite (aka distrorelease-proposed)")
5961
60 parser.add_option("-p", "--package", type="string", metavar="PACKAGE",62 parser.add_option("-p", "--package", type="string", metavar="PACKAGE",
61 action="append",63 action="append",
@@ -79,6 +81,8 @@
7981
80 our_distro = options.dest_distro82 our_distro = options.dest_distro
81 our_dist = options.dest_suite83 our_dist = options.dest_suite
84 if options.dest_proposed_suite:
85 our_dist = our_dist + "-proposed"
8286
83 excludes = []87 excludes = []
84 if options.exclude is not None:88 if options.exclude is not None:

Subscribers

People subscribed via source and target branches

to status/vote changes: