What we are doing now: $ hg tag -u ffxbld -r 71b88e2d1010 -m 'Added tag FIREFOX_7_0b6_RELEASE for changeset 71b88e2d1010. CLOSED TREE a=release' -f FIREFOX_7_0b6_RELEASE $ hg tag -u ffxbld -r 71b88e2d1010 -m 'Added tag FIREFOX_7_0b6_BUILD1 for changeset 71b88e2d1010. CLOSED TREE a=release' -f FIREFOX_7_0b6_BUILD1 What we should be doing: hg tag -u ffxbld -r 71b88e2d1010 -m 'Added tag FIREFOX_7_0b6_BUILD1 and FIREFOX_7_0b6_RELEASE for changeset 71b88e2d1010. CLOSED TREE a=release' -f FIREFOX_7_0b6_BUILD1 FIREFOX_7_0b6_RELEASE Doing this makes hg logs much easier to look

at

Pluck some low hanging fruit

Comment on attachment 594949 [details] [diff] [review] [tools] v1 The patch looks good. The same approach works fine in preproduction. A nit. Could you change the following line: > + return "Added tag(s) (" + ", ".join(tags) + ") for changeset " + revision + \ so it uses return "Added " + " ".join(tags) + " tags(s) for ...... In this case it's easier to copy/paste from logs if you want to do a similar thing manually.

My first push missed the nits from c#3, pushed a followup to grab those.

I pushed a bustage fix: http://hg.mozilla.org/build/tools/rev/d65f6d7a1507 for: retry: Giving up on <function apply_and_push at 0xb7cf5bfc> Traceback (most recent call last): File "/builds/slave/rel-m-beta-fennec-tag-source/scripts/scripts/release/tag-release.py", line 240, in <module> repo['bumpFiles'], relbranch, options.attempts) File "/builds/slave/rel-m-beta-fennec-tag-source/scripts/scripts/release/tag-release.py", line 128, in tagRepo ssh_key=config['hgSshKey'])) File "/builds/slave/rel-m-beta-fennec-tag-source/scripts/scripts/release/../../lib/python/util/retry.py", line 27, in retry return action(*args, **kwargs) File "/builds/slave/rel-m-beta-fennec-tag-source/scripts/scripts/release/../../lib/python/util/hg.py", line 431, in apply_and_push changer(localrepo, 1) File "/builds/slave/rel-m-beta-fennec-tag-source/scripts/scripts/release/tag-release.py", line 121, in bump_and_tag_wrapper bump_and_tag(r, n, config, relbranch, revision, tags, defaultBranch) File "/builds/slave/rel-m-beta-fennec-tag-source/scripts/scripts/release/tag-release.py", line 115, in bump_and_tag raise Exception("Incorrect number of revisions on %s" % relbranch) Exception: Incorrect number of revisions on MOBILE110_2012021419_RELBRANCH

Typo fix: http://hg.mozilla.org/build/tools/rev/3edfbc945069 s/tags(s)/tag(s)/