D6703: unshelve: add abort on using continue and interactive together
navaneeth.suresh (Navaneeth Suresh)
phabricator at mercurial-scm.org
Tue Jul 30 16:10:18 UTC 2019
navaneeth.suresh created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
`unshelve --continue --interactive` will not work as expected by the
user as the mode of in-progress unshelve is preserved and cannot be
overwritten. This patch makes `unshelve` to throw an error on using
both `--continue` and `--interactive` together with `unshelve`.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D6703
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
@@ -1347,6 +1347,12 @@
$ hg resolve -m bar1 bar2
(no more unresolved files)
continue: hg unshelve --continue
+
+-- using --continue with --interactive should throw an error
+ $ hg unshelve --continue -i
+ abort: cannot use both continue and interactive
+ [255]
+
$ cat bar1
A
B
diff --git a/mercurial/shelve.py b/mercurial/shelve.py
--- a/mercurial/shelve.py
+++ b/mercurial/shelve.py
@@ -954,6 +954,8 @@
state = _loadshelvedstate(ui, repo, opts)
if abortf:
return unshelveabort(ui, repo, state)
+ elif continuef and interactive:
+ raise error.Abort(_('cannot use both continue and interactive'))
elif continuef:
return unshelvecontinue(ui, repo, state, opts)
elif len(shelved) > 1:
To: navaneeth.suresh, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list