[PATCH] rebase: add potential divergent commit hashes to error message
Sean Farley
sean at farley.io
Wed Feb 17 14:58:26 EST 2016
Kostia Balytskyi <ikostia at fb.com> writes:
> # HG changeset patch
> # User Kostia Balytskyi <ikostia at fb.com>
> # Date 1455730571 0
> # Wed Feb 17 17:36:11 2016 +0000
> # Node ID 6092ea6f4324f99ebb983ebd252392677930bbc6
> # Parent 95bf01b8754016200a99fd3538e78030b2028c60
> rebase: add potential divergent commit hashes to error message
>
> (issue5086)
Our regex requires this (issue1234) to be on the first line.
> diff --git a/hgext/rebase.py b/hgext/rebase.py
> --- a/hgext/rebase.py
> +++ b/hgext/rebase.py
> @@ -305,10 +305,13 @@
> divergencebasecandidates = rebaseobsrevs - rebaseobsskipped
>
> if divergencebasecandidates and not divergenceok:
> - msg = _("this rebase will cause divergence")
> + divhashes = (repo.unfiltered()[r].hex()
> + for r in divergencebasecandidates)
This looks like a weird / wrong indentation. The rest looks fine to me.
More information about the Mercurial-devel
mailing list