This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6739

unshelve: add abort on using --interactive and --unresolved together
Needs RevisionPublic

Authored by navaneeth.suresh on Aug 17 2019, 4:39 PM.

Details

Reviewers
baymax
Group Reviewers
hg-reviewers
Summary

It seems not to be a good idea to partially unshelve a mergestate. So,
let us abort on using --interactive and --unresolved together.`

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

baymax requested changes to this revision.Jan 24 2020, 12:32 PM

There seems to have been no activities on this Diff for the past 3 Months.

By policy, we are automatically moving it out of the need-review state.

Please, move it back to need-review without hesitation if this diff should still be discussed.

:baymax:need-review-idle:

This revision now requires changes to proceed.Jan 24 2020, 12:32 PM

Revision Contents
Changeset List

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

Diff 16255

mercurial/shelve.py

if not abortf and not continuef: if not abortf and not continuef:
cmdutil.checkunfinished(repo) cmdutil.checkunfinished(repo)
shelved = list(shelved) shelved = list(shelved)
if opts.get("name"): if opts.get("name"):
shelved.append(opts["name"]) shelved.append(opts["name"])
if interactive and opts.get('keep'): if interactive and opts.get('keep'):
raise error.Abort(_('--keep on --interactive is not yet supported')) raise error.Abort(_('--keep on --interactive is not yet supported'))
if interactive and unresolved:
raise error.Abort(_('cannot use both interactive and unresolved'))
if abortf or continuef: if abortf or continuef:
if abortf and continuef: if abortf and continuef:
raise error.Abort(_('cannot use both abort and continue')) raise error.Abort(_('cannot use both abort and continue'))
if shelved: if shelved:
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'))

tests/test-shelve-unresolved.t

[255] [255]
$ hg up 2 $ hg up 2
0 files updated, 0 files merged, 1 files removed, 0 files unresolved 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ cat file2 $ cat file2
A A
C C
-- abort on using both --interactive and --unresolved
$ hg unshelve --unresolved --interactive
abort: cannot use both interactive and unresolved
[255]
-- flag --unshelve is not passed. but, the last shelve is unresolved -- flag --unshelve is not passed. but, the last shelve is unresolved
$ hg unshelve $ hg unshelve
unshelving change 'default' unshelving change 'default'
abort: default is an unresolved shelve, use --unresolved to unshelve it abort: default is an unresolved shelve, use --unresolved to unshelve it
[255] [255]
$ hg unshelve --unresolved $ hg unshelve --unresolved
unshelving change 'default' unshelving change 'default'