D6699: unshelve: abort on using --keep and --interactive together
navaneeth.suresh (Navaneeth Suresh)
phabricator at mercurial-scm.org
Thu Aug 15 11:16:07 EDT 2019
navaneeth.suresh updated this revision to Diff 16211.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D6699?vs=16168&id=16211
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D6699/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D6699
AFFECTED FILES
mercurial/shelve.py
tests/test-shelve.t
CHANGE DETAILS
diff --git a/tests/test-shelve.t b/tests/test-shelve.t
--- a/tests/test-shelve.t
+++ b/tests/test-shelve.t
@@ -1456,3 +1456,7 @@
record this change to 'bar2'?
(enter ? for help) [Ynesfdaq?] y
+-- test for --interactive --keep
+ $ hg unshelve -i --keep
+ abort: --keep on --interactive is not yet supported
+ [255]
diff --git a/mercurial/shelve.py b/mercurial/shelve.py
--- a/mercurial/shelve.py
+++ b/mercurial/shelve.py
@@ -941,6 +941,8 @@
if opts.get("name"):
shelved.append(opts["name"])
+ if interactive and opts.get('keep'):
+ raise error.Abort(_('--keep on --interactive is not yet supported'))
if abortf or continuef:
if abortf and continuef:
raise error.Abort(_('cannot use both abort and continue'))
To: navaneeth.suresh, #hg-reviewers, pulkit
Cc: pulkit, mercurial-devel
More information about the Mercurial-devel
mailing list