# HG changeset patch # User FUJIWARA Katsunori # Date 1436903158 -32400 # Node ID 0eb093e40813f5867c8d19050fba318cf20aeed9 # Parent 08f2177b15c7a0d2408ba818efd0a8297702039b 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 -r 08f2177b15c7 -r 0eb093e40813 hgext/shelve.py --- a/hgext/shelve.py Wed Jul 15 04:45:58 2015 +0900 +++ b/hgext/shelve.py Wed Jul 15 04:45:58 2015 +0900 @@ -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 -r 08f2177b15c7 -r 0eb093e40813 tests/test-shelve.t --- a/tests/test-shelve.t Wed Jul 15 04:45:58 2015 +0900 +++ b/tests/test-shelve.t Wed Jul 15 04:45:58 2015 +0900 @@ -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