1266873 - Build tool to manage rebasing from the autoland repository

Status: NEW

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

Description

[Gregory Szorc [:gps]]

I'll be building a tool to make it easier for the sheriffs to manage the new autoland repo:

* It will rebase a range of changesets from autoland to mozilla-central, filtering out backed out changesets in the process (preferably automatically)
* It will handle the reverse of merging/rebase central back onto the autoland repo.

Comment 1

[Gregory Szorc [:gps]]

Attachment: firefoxintegrate: extension to make sheriffing easier (bug 1266873)

THIS IS FAR FROM COMPLETE.

A new "firefoxintegrate" extension is introduced. We could potentially
rename it to "firefoxsheriff" or similar because I foresee it being
used to consolidate many of the common tasks that sheriffs perform.

The extension provides a "hg integrateautoland" command. It pulls
from the autoland and mozilla-central repos and effectively performs
an intelligent interactive rebase. The intelligent part is that it
drops backed out changesets and their backout changesets from history
automatically.

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

Comment 2

[Gregory Szorc [:gps]]

Comment on attachment 8744535 [details]
firefoxintegrate: extension to make sheriffing easier (bug 1266873)

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

Comment 3

[Wes Kocher (:KWierso) (Not reading bugmail; email directly if needed)]

https://reviewboard.mozilla.org/r/48603/#review58644

::: hgext/firefoxintegrate/__init__.py:50
(Diff revision 2)
> +    and all its ancestors onto mozilla-central, filtering out backed out
> +    changesets automatically.
> +    """
> +    dirty = any(repo.status())
> +    if dirty:
> +        raise error.Abort('uncommitted changed; cannot proceed',

"changes", no?