Mercurial > public > mercurial-scm > hg-stable
diff hgext/histedit.py @ 46104:3f82a915ab2a
histedit: tweak `edit` message to try and guide users to our workflow
histedit predates evolve, so it drops you on an _uncommitted_ version
of the commit you're amending/splitting, which is in contrast to git
which expects you to use `git commit --amend` (I think - I'm basing
this on internal bug reports). My hope is that this output will guide
users a little more towards the expected workflow.
Differential Revision: https://phab.mercurial-scm.org/D9560
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Thu, 10 Dec 2020 11:42:49 -0500 |
| parents | 89a2afe31e82 |
| children | 6f8a94bbfba1 |
line wrap: on
line diff
--- a/hgext/histedit.py Thu Dec 10 14:03:46 2020 +0530 +++ b/hgext/histedit.py Thu Dec 10 11:42:49 2020 -0500 @@ -799,10 +799,11 @@ rulectx = repo[self.node] hg.update(repo, self.state.parentctxnode, quietempty=True) applychanges(repo.ui, repo, rulectx, {}) + hint = _(b'to edit %s, `hg histedit --continue` after making changes') raise error.InterventionRequired( - _(b'Editing (%s), you may commit or record as needed now.') + _(b'Editing (%s), commit as needed now to split the change') % node.short(self.node), - hint=_(b'hg histedit --continue to resume'), + hint=hint % node.short(self.node), ) def commiteditor(self):