887184 - Commit message hook should exempt gaia.json auto-commits

Status: RESOLVED FIXED

(Developer Services :: Mercurial: hg.mozilla.org, defect)

Description

[Ed Morley [:emorley]]

I've just hit the commit message hook trying to merge birch to mozilla-central, due to gaia.json auto commits that do not contain a bug number.

We should:
1) Make the commit message hook exempt "Bumping gaia.json".
2) Switch on the commit message hook for birch, so we catch things before merging to m-c.

This bug covers #1.

Comment 1

[Ed Morley [:emorley]]

Filed bug 887193 for #2.

Comment 2

[Ed Morley [:emorley]]

Attachment: Patch v1

Exempts gaia.json auto commits [1] & removes the now redundant nanojit-import exemption (nanojit is no longer in the tree as of bug 698201).


[1] Example: https://hg.mozilla.org/mozilla-central/rev/b77e4465858c

Comment 3

[Tom S [:evilpie]]

Comment on attachment 767683 [details] [diff] [review]
Patch v1

Review of attachment 767683 [details] [diff] [review]:
-----------------------------------------------------------------

Have you considered checking the user instead of the commit message? We already check for some users, but I am not even sure what they all are.

Comment 4

[Ed Morley [:emorley]]

Attachment: Patch v2

Yeah let's do that instead. Also removes two unnecessary imports that pyflakes was complaining about.

Comment 5

[Tom S [:evilpie]]

Comment on attachment 767745 [details] [diff] [review]
Patch v2

Review of attachment 767745 [details] [diff] [review]:
-----------------------------------------------------------------

I would feel better if this had a test, but Ed told me that the don't even run for him. :(

Comment 6

[:Gavin Sharp [email: [e-mail]]]

Wouldn't it be simpler to change the gaia.json-bumping script to include "no bug" in the commit message, rather than adding another special case to the hook?

Comment 7

[Tom S [:evilpie]]

That is more of hack and not the intended purpose of "no bug".

Comment 8

[:Gavin Sharp [email: [e-mail]]]

What is "no bug" for, if not for changes which aren't tracked by bugs? I'm not sure the semantic distinction you're making is useful :)

Comment 9

[Ed Morley [:emorley]]

I'm just going to go with the approach in the attached patch:
https://hg.mozilla.org/hgcustom/hghooks/rev/0c5570033c6b

Comment 10

[Tom S [:evilpie]]

Looks good.