Mercurial > public > mercurial-scm > hg

diff mercurial/shelve.py @ 42761:5c285c8e4f98

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
unshelve: abort on using --keep and --interactive together I am working on making interactive mode support `--keep` flag. Until we support the usage of `--interactive` and `--keep` together, let us abort on it. Differential Revision: https://phab.mercurial-scm.org/D6699
author Navaneeth Suresh <navaneeths1998@gmail.com>
date Thu, 15 Aug 2019 20:43:25 +0530
parents d684449eef67
children 2372284d9457
line wrap: on
line diff
--- a/mercurial/shelve.py	Tue Aug 20 18:35:16 2019 +0300
+++ b/mercurial/shelve.py	Thu Aug 15 20:43:25 2019 +0530
@@ -942,6 +942,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'))