( )⚙ D6703 unshelve: add abort on using continue and interactive together

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6703

unshelve: add abort on using continue and interactive together
ClosedPublic

Authored by navaneeth.suresh on Jul 30 2019, 12:10 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG52a383451739: unshelve: add abort on using continue and interactive together
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.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Revision Contents
Changeset List

PathPackages
Mmercurial/shelve.py (2 lines)
Mtests/test-shelve.t (6 lines)

Diff 16095

mercurial/shelve.py

raise error.Abort(_('cannot combine abort/continue with ' raise error.Abort(_('cannot combine abort/continue with '
'naming a shelved change')) 'naming a shelved change'))
if abortf and opts.get('tool', False): if abortf and opts.get('tool', False):
ui.warn(_('tool option will be ignored\n')) ui.warn(_('tool option will be ignored\n'))
state = _loadshelvedstate(ui, repo, opts) state = _loadshelvedstate(ui, repo, opts)
if abortf: if abortf:
return unshelveabort(ui, repo, state) return unshelveabort(ui, repo, state)
elif continuef and interactive:
raise error.Abort(_('cannot use both continue and interactive'))
elif continuef: elif continuef:
return unshelvecontinue(ui, repo, state, opts) return unshelvecontinue(ui, repo, state, opts)
elif len(shelved) > 1: elif len(shelved) > 1:
raise error.Abort(_('can only unshelve one change at a time')) raise error.Abort(_('can only unshelve one change at a time'))
elif not shelved: elif not shelved:
shelved = listshelves(repo) shelved = listshelves(repo)
if not shelved: if not shelved:
raise error.Abort(_('no shelved changes to apply!')) raise error.Abort(_('no shelved changes to apply!'))

tests/test-shelve.t

$ cat > bar2 <<EOF $ cat > bar2 <<EOF
> A > A
> B > B
> C > C
> EOF > EOF
$ hg resolve -m bar1 bar2 $ hg resolve -m bar1 bar2
(no more unresolved files) (no more unresolved files)
continue: hg unshelve --continue 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 $ cat bar1
A A
B B
C C
$ hg unshelve --continue <<EOF $ hg unshelve --continue <<EOF
> y > y
> y > y
> y > y