[PATCH 2 of 5] graft: suggest the correct tool to continue (not graft)
timeless
timeless at mozdev.org
Wed Feb 3 22:56:21 EST 2016
# HG changeset patch
# User timeless <timeless at mozdev.org>
# Date 1454557544 0
# Thu Feb 04 03:45:44 2016 +0000
# Node ID 1e8f92f555cdd026da9cdc8f65f144ab5f16f1c8
# Parent 9606a1513d812239259485be8469a1493faa60bf
graft: suggest the correct tool to continue (not graft)
Add test coverage for graft --continue without starting.
Suggest committing (or whatever the current activity is), via
wrongtooltocontinue which uses howtocontinue.
diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -3917,7 +3917,8 @@
except IOError as inst:
if inst.errno != errno.ENOENT:
raise
- raise error.Abort(_("no graft state found, can't continue"))
+ cmdutil.wrongtooltocontinue(repo,
+ _("no graft state found, can't continue"))
else:
cmdutil.checkunfinished(repo)
cmdutil.bailifchanged(repo)
diff --git a/tests/test-graft.t b/tests/test-graft.t
--- a/tests/test-graft.t
+++ b/tests/test-graft.t
@@ -40,6 +40,14 @@
|
o test at 0.public: 0
+Can't continue without starting:
+
+ $ hg rm -q e
+ $ hg graft --continue
+ abort: no graft state found, can't continue
+ (continue: hg commit)
+ [255]
+ $ hg revert -r . -q e
Need to specify a rev:
More information about the Mercurial-devel
mailing list