1416366 - Fix the FTL whitelist hook to skip backouts and merges

Status: RESOLVED FIXED

(Core :: Internationalization, enhancement, P3)

Description

[Zibi Braniecki [:zbraniecki][:gandalf]]

Today during merge of the first FTL we encountered a bug in how the whitelisting goes.

> RyanVM> gandalf: https://hg.mozilla.org/hgcustom/version-control-tools/file/default/hghooks/mozhghooks/prevent_webidl_changes.py has examples of ignoring backouts and merges in it

We should fix it before we attempt to land anything else.

Comment 1

[Zibi Braniecki [:zbraniecki][:gandalf]]

Attachment: Bug 1416366 - Fix the FTL whitelist hook to skip backouts and merges.

Review commit: https://reviewboard.mozilla.org/r/198850/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/198850/

Comment 2

[Zibi Braniecki [:zbraniecki][:gandalf]]

Comment on attachment 8927542 [details]
Bug 1416366 - Fix the FTL whitelist hook to skip backouts and merges.

Ryan, does it look more or less like what you'd like to see?

I'll add tests, but wanted to check with you first if that's the right code

Comment 3

[Ryan VanderMeulen [:RyanVM]]

Comment on attachment 8927542 [details]
Bug 1416366 - Fix the FTL whitelist hook to skip backouts and merges.

Looks like the right basic idea, yes.

Comment 4

[Axel Hecht [:Pike]]

Comment on attachment 8927542 [details]
Bug 1416366 - Fix the FTL whitelist hook to skip backouts and merges.

https://reviewboard.mozilla.org/r/198850/#review204092

::: hghooks/mozhghooks/check/prevent_ftl_changes.py:72
(Diff revision 1)
>      def check(self, ctx):
> +        if len(ctx.parents()) > 1:
> +            # Skip merge changesets
> +            return True
> +
> +        if isBackout(ctx.description()):

Please use is_backout from commitparser?

Comment 5

[Zibi Braniecki [:zbraniecki][:gandalf]]

Comment on attachment 8927542 [details]
Bug 1416366 - Fix the FTL whitelist hook to skip backouts and merges.

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/198850/diff/1-2/

Comment 6

[Zibi Braniecki [:zbraniecki][:gandalf]]

Comment on attachment 8927542 [details]
Bug 1416366 - Fix the FTL whitelist hook to skip backouts and merges.

Review request updated; see interdiff: https://reviewboard.mozilla.org/r/198850/diff/2-3/

Comment 7

[Gregory Szorc [:gps]]

Comment on attachment 8927542 [details]
Bug 1416366 - Fix the FTL whitelist hook to skip backouts and merges.

https://reviewboard.mozilla.org/r/198850/#review206508

::: hghooks/mozhghooks/check/prevent_ftl_changes.py:34
(Diff revision 3)
> +backoutMessage = [re.compile(x) for x in [
> +    r'^(back(ing|ed)?\s+out|backout)',
> +    r'^(revert(ed|ing)?)'
> +]]

This block can be removed.

Comment 8

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/hgcustom/version-control-tools/rev/8717db9998f7
Fix the FTL whitelist hook to skip backouts and merges. r?gps

Comment 9

[Gregory Szorc [:gps]]

This is being deployed as I type this.