[PATCH 5 of 5] shelve: omit incorrect 'commit' suggestion at 'hg shelve -i'
FUJIWARA Katsunori
foozy at lares.dti.ne.jp
Tue Jul 14 14:58:27 CDT 2015
# HG changeset patch
# User FUJIWARA Katsunori <foozy at lares.dti.ne.jp>
# Date 1436903158 -32400
# Wed Jul 15 04:45:58 2015 +0900
# Node ID 83ca1cfef65f6653facc80efa77c312f6bb0673a
# Parent b7be795042aa172e56d5a298a200c3900a598109
shelve: omit incorrect 'commit' suggestion at 'hg shelve -i'
Before this patch, 'hg shelve -i' under non-interactive mode suggests
'use commit instead', and it obviously incorrect, because what user
wants to do isn't 'commit' but 'shelve'.
To omit incorrect 'commit' suggestion at 'hg shelve -i', this patch
specifies 'None' for 'cmdsuggest' argument of 'cmdutil.dorecord()'.
diff --git a/hgext/shelve.py b/hgext/shelve.py
--- a/hgext/shelve.py
+++ b/hgext/shelve.py
@@ -279,7 +279,7 @@
if not interactive:
node = cmdutil.commit(ui, repo, commitfunc, pats, opts)
else:
- node = cmdutil.dorecord(ui, repo, interactivecommitfunc, 'commit',
+ node = cmdutil.dorecord(ui, repo, interactivecommitfunc, None,
False, cmdutil.recordfilter, *pats, **opts)
if not node:
stat = repo.status(match=scmutil.match(repo[None], pats, opts))
diff --git a/tests/test-shelve.t b/tests/test-shelve.t
--- a/tests/test-shelve.t
+++ b/tests/test-shelve.t
@@ -860,6 +860,9 @@
$ cat foo/foo
foo
a
+ $ hg shelve --interactive --config ui.interactive=false
+ abort: running non-interactively
+ [255]
$ hg shelve --interactive << EOF
> y
> y
More information about the Mercurial-devel
mailing list