Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
unshelve: add abort on using continue and interactive together
authorNavaneeth Suresh <navaneeths1998@gmail.com>
Tue, 30 Jul 2019 21:36:15 +0530
changeset 42668 52a383451739
parent 42667 6d50a7ebf7e0
child 42669 36c692eb28d3
unshelve: add abort on using continue and interactive together `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`. Differential Revision: https://phab.mercurial-scm.org/D6703
mercurial/shelve.py file | annotate | diff | comparison | revisions
tests/test-shelve.t file | annotate | diff | comparison | revisions 
--- a/mercurial/shelve.py	Mon Jul 29 13:22:52 2019 +0300
+++ b/mercurial/shelve.py	Tue Jul 30 21:36:15 2019 +0530
@@ -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:
--- a/tests/test-shelve.t	Mon Jul 29 13:22:52 2019 +0300
+++ b/tests/test-shelve.t	Tue Jul 30 21:36:15 2019 +0530
@@ -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
Mercurial