navaneeth.suresh edited the summary of this revision. navaneeth.suresh retitled this revision from "tests: add test for unshelve --interactive --keep" to "unshelve: abort on using --keep and --interactive together". navaneeth.suresh updated this revision to Diff 16166.
REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6699?vs=16145&id=16166 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,8 @@ record this change to 'bar2'? (enter ? for help) [Ynesfdaq?] y +-- test for --interactive --keep + $ hg unshelve -i --keep + unshelving change 'default' + 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 @@ -967,6 +967,8 @@ ui.status(_("unshelving change '%s'\n") % basename) else: basename = shelved[0] + if interactive and opts.get('keep'): + raise error.Abort(_('--keep on interactive is not yet supported')) if not shelvedfile(repo, basename, patchextension).exists(): raise error.Abort(_("shelved change '%s' not found") % basename) To: navaneeth.suresh, #hg-reviewers Cc: pulkit, mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
