Mercurial > hg
changeset 28122:6025ddb4e649
rebase: suggest the correct tool to continue (not rebase)
Suggest committing (or whatever the current activity is), via
wrongtooltocontinue which uses howtocontinue.
| author | timeless <timeless@mozdev.org> |
|---|---|
| date | Thu, 04 Feb 2016 03:46:38 +0000 |
| parents | bd97ed121016 |
| children | 6c1b7f80f90f |
| files | hgext/rebase.py tests/test-rebase-parameters.t |
| diffstat | 2 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/rebase.py Thu Feb 04 03:45:44 2016 +0000 +++ b/hgext/rebase.py Thu Feb 04 03:46:38 2016 +0000 @@ -915,7 +915,7 @@ except IOError as err: if err.errno != errno.ENOENT: raise - raise error.Abort(_('no rebase in progress')) + cmdutil.wrongtooltocontinue(repo, _('rebase')) if keepbranches is None: raise error.Abort(_('.hg/rebasestate is incomplete'))
--- a/tests/test-rebase-parameters.t Thu Feb 04 03:45:44 2016 +0000 +++ b/tests/test-rebase-parameters.t Thu Feb 04 03:46:38 2016 +0000 @@ -481,6 +481,10 @@ $ hg resolve -m c2 (no more unresolved files) continue: hg rebase --continue + $ hg graft --continue + abort: no graft in progress + (continue: hg rebase --continue) + [255] $ hg rebase -c --tool internal:fail rebasing 2:e4e3f3546619 "c2b" (tip) note: rebase of 2:e4e3f3546619 created no changes to commit