martinvonz created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches.
REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D9699 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 @@ -278,10 +278,10 @@ $ hg unshelve abort: no shelved changes to apply! - [255] + [20] $ hg unshelve foo abort: shelved change 'foo' not found - [255] + [10] named shelves, specific filenames, and "commit messages" should all work (this tests also that editor is invoked, if '--edit' is specified) @@ -979,7 +979,7 @@ default (*s ago) changes to: create conflict (glob) $ hg shelve --delete doesnotexist abort: shelved change 'doesnotexist' not found - [255] + [10] $ hg shelve --delete default $ cd .. @@ -1408,7 +1408,7 @@ -- using --continue with --interactive should throw an error $ hg unshelve --continue -i abort: cannot use both continue and interactive - [255] + [10] $ cat bar1 A @@ -1511,4 +1511,4 @@ -- test for --interactive --keep $ hg unshelve -i --keep abort: --keep on --interactive is not yet supported - [255] + [10] diff --git a/mercurial/shelve.py b/mercurial/shelve.py --- a/mercurial/shelve.py +++ b/mercurial/shelve.py @@ -592,11 +592,13 @@ def deletecmd(ui, repo, pats): """subcommand that deletes a specific shelve""" if not pats: - raise error.Abort(_(b'no shelved changes specified!')) + raise error.InputError(_(b'no shelved changes specified!')) with repo.wlock(): for name in pats: if not shelvedfile(repo, name, patchextension).exists(): - raise error.Abort(_(b"shelved change '%s' not found") % name) + raise error.InputError( + _(b"shelved change '%s' not found") % name + ) for suffix in shelvefileextensions: shfile = shelvedfile(repo, name, suffix) if shfile.exists(): @@ -1066,12 +1068,14 @@ shelved.append(opts[b"name"]) if interactive and opts.get(b'keep'): - raise error.Abort(_(b'--keep on --interactive is not yet supported')) + raise error.InputError( + _(b'--keep on --interactive is not yet supported') + ) if abortf or continuef: if abortf and continuef: - raise error.Abort(_(b'cannot use both abort and continue')) + raise error.InputError(_(b'cannot use both abort and continue')) if shelved: - raise error.Abort( + raise error.InputError( _( b'cannot combine abort/continue with ' b'naming a shelved change' @@ -1084,22 +1088,24 @@ if abortf: return unshelveabort(ui, repo, state) elif continuef and interactive: - raise error.Abort(_(b'cannot use both continue and interactive')) + raise error.InputError( + _(b'cannot use both continue and interactive') + ) elif continuef: return unshelvecontinue(ui, repo, state, opts) elif len(shelved) > 1: - raise error.Abort(_(b'can only unshelve one change at a time')) + raise error.InputError(_(b'can only unshelve one change at a time')) elif not shelved: shelved = listshelves(repo) if not shelved: - raise error.Abort(_(b'no shelved changes to apply!')) + raise error.StateError(_(b'no shelved changes to apply!')) basename = util.split(shelved[0][1])[1] ui.status(_(b"unshelving change '%s'\n") % basename) else: basename = shelved[0] if not shelvedfile(repo, basename, patchextension).exists(): - raise error.Abort(_(b"shelved change '%s' not found") % basename) + raise error.InputError(_(b"shelved change '%s' not found") % basename) return _dounshelve(ui, repo, basename, opts) To: martinvonz, #hg-reviewers Cc: mercurial-patches, mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
