1375092 - allow well formed manually crafted servo merge commits to bypass scm_servo_vendor commit hook check

Status: RESOLVED FIXED

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

Description

[:glob ✱]

allow well formed manually crafted servo merge commits to bypass scm_servo_vendor commit hook check.

where "well formed" means:
- commit desc must start with "servo: Merge #"
- mercurial extra data exists for subtree_revision and subtree_source
- no files outside of the /servo directory are modified

Comment 1

[:glob ✱]

Attachment: hghooks: allow well formed manually crafted servo merge commits to bypass scm_servo_vendor commit hook check (bug 1375092)

We allow changes to servo created by the prepare-servo-commit hgext.

This gives stylo developers the ability to resolve out of sequence landing of
servo commits.  These commits must meet the following criteria in order to be
considered 'well formed':

- the commit description must match the formatting that servo-vcs-sync uses;
  specifically it must start with "servo: Merge#".
- the commit must only touch files within the /servo directory.
- the commit must contain the extra data that instructs the overlay extension
  (part of servo-vcs-sync) to skip that revision.

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

Comment 2

[Gregory Szorc [:gps]]

Comment on attachment 8880274 [details]
hghooks: allow well formed manually crafted servo merge commits to bypass scm_servo_vendor commit hook check (bug 1375092)

https://reviewboard.mozilla.org/r/151632/#review156956

::: hghooks/tests/commitextras.py:17
(Diff revision 1)
> +    extensions,
> +)
> +
> +cmdtable = {}
> +command = cmdutil.command(cmdtable)
> +testedwith = 'ships-with-fb-hgext'

Please nuke this line.

Comment 3

[:glob ✱]

Comment on attachment 8880274 [details]
hghooks: allow well formed manually crafted servo merge commits to bypass scm_servo_vendor commit hook check (bug 1375092)

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

Comment 4

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/hgcustom/version-control-tools/rev/7205da759cad
hghooks: allow well formed manually crafted servo merge commits to bypass scm_servo_vendor commit hook check r=gps