Mercurial > hg
diff hgext/rebase.py @ 28188:6411140aeda9
rebase: add potential divergent commit hashes to error message (issue5086)
| author | Kostia Balytskyi <ikostia@fb.com> |
|---|---|
| date | Wed, 17 Feb 2016 20:31:34 +0000 |
| parents | c7e8948627f3 |
| children | fac3a24be50e |
line wrap: on
line diff
--- a/hgext/rebase.py Fri Feb 19 17:50:28 2016 +0100 +++ b/hgext/rebase.py Wed Feb 17 20:31:34 2016 +0000 @@ -307,10 +307,13 @@ divergencebasecandidates = rebaseobsrevs - rebaseobsskipped if divergencebasecandidates and not divergenceok: - msg = _("this rebase will cause divergence") + divhashes = (str(repo[r]) + for r in divergencebasecandidates) + msg = _("this rebase will cause " + "divergences from: %s") h = _("to force the rebase please set " "rebase.allowdivergence=True") - raise error.Abort(msg, hint=h) + raise error.Abort(msg % (",".join(divhashes),), hint=h) # - plain prune (no successor) changesets are rebased # - split changesets are not rebased if at least one of the