Mercurial > evolve
changeset 2779:f51efb2bb8c9
precheck: point to 'phase' help when aborting
some of the error message already does that. It seems a good idea.
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Mon, 24 Jul 2017 02:06:14 +0200 |
| parents | 766b38594ded |
| children | 58e4b51ee902 |
| files | hgext3rd/evolve/rewriteutil.py tests/test-fold.t tests/test-metaedit.t |
| diffstat | 3 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext3rd/evolve/rewriteutil.py Mon Jul 24 01:04:40 2017 +0200 +++ b/hgext3rd/evolve/rewriteutil.py Mon Jul 24 02:06:14 2017 +0200 @@ -37,7 +37,9 @@ <action> can be used to control the commit message. """ if repo.revs('%ld and public()', revs): - raise error.Abort(_("cannot %s public changesets") % action) + msg = _("cannot %s public changesets") % action + hint = _("see 'hg help phases' for details") + raise error.Abort(msg, hint=hint) def bookmarksupdater(repo, oldid, tr): """Return a callable update(newid) updating the current bookmark
--- a/tests/test-fold.t Mon Jul 24 01:04:40 2017 +0200 +++ b/tests/test-fold.t Mon Jul 24 02:06:14 2017 +0200 @@ -74,6 +74,7 @@ $ hg phase --public 0 $ hg fold --from -r 0 abort: cannot fold public changesets + (see 'hg help phases' for details) [255] Test actual folding
--- a/tests/test-metaedit.t Mon Jul 24 01:04:40 2017 +0200 +++ b/tests/test-metaedit.t Mon Jul 24 02:06:14 2017 +0200 @@ -104,6 +104,7 @@ [255] $ hg metaedit -r 0 --fold abort: cannot fold public changesets + (see 'hg help phases' for details) [255] $ hg metaedit 'desc(C) + desc(F)' --fold abort: cannot fold non-linear revisions (multiple roots given)