Closed Bug 1416366 Opened 3 years ago Closed 3 years ago

Fix the FTL whitelist hook to skip backouts and merges

Categories

(Core :: Internationalization, enhancement, P3)

enhancement

Tracking

()

RESOLVED FIXED

People

(Reporter: zbraniecki, Assigned: zbraniecki)

References

Details

Attachments

(1 file)

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.
Blocks: 1407256
Priority: -- → P3
Assignee: nobody → gandalf
Status: NEW → ASSIGNED
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
Attachment #8927542 - Flags: feedback?(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.
Attachment #8927542 - Flags: feedback?(ryanvm) → feedback+
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 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.
Attachment #8927542 - Flags: review?(gps) → review+
Pushed by zbraniecki@mozilla.com:
https://hg.mozilla.org/hgcustom/version-control-tools/rev/8717db9998f7
Fix the FTL whitelist hook to skip backouts and merges. r?gps
Status: ASSIGNED → RESOLVED
Closed: 3 years ago
Resolution: --- → FIXED
This is being deployed as I type this.
You need to log in before you can comment on or make changes to this bug.