( )⚙ D6653 unshelve: mark unshelve interactive as experimental

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6653

unshelve: mark unshelve interactive as experimental
ClosedPublic

Authored by navaneeth.suresh on Jul 18 2019, 11:27 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG74ba82abbf29: unshelve: mark unshelve interactive as experimental
Summary

This is a follow-up patch to rHG5162753c4c14.
We have the logic for interactive unshelve under _rebaserestorecommit().
So, we might get conflicts even if there are conflicting changes other than
selected changes by the user. We should mark unshelve --interactive as
EXPERIMENTAL until we solve this issue.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

navaneeth.suresh edited the summary of this revision. (Show Details)Jul 18 2019, 11:35 AM
navaneeth.suresh added a commit: rHG74ba82abbf29: unshelve: mark unshelve interactive as experimental.Jul 18 2019, 1:59 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG74ba82abbf29: unshelve: mark unshelve interactive as experimental (authored by navaneeth.suresh). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (2 lines)

Diff 15964

mercurial/commands.py

return postincoming(ui, repo, modheads, opts.get(r'update'), None, None) return postincoming(ui, repo, modheads, opts.get(r'update'), None, None)
@command('unshelve', @command('unshelve',
[('a', 'abort', None, [('a', 'abort', None,
_('abort an incomplete unshelve operation')), _('abort an incomplete unshelve operation')),
('c', 'continue', None, ('c', 'continue', None,
_('continue an incomplete unshelve operation')), _('continue an incomplete unshelve operation')),
('i', 'interactive', None, ('i', 'interactive', None,
_('use interactive mode')), _('use interactive mode (EXPERIMENTAL)')),
('k', 'keep', None, ('k', 'keep', None,
_('keep shelve after unshelving')), _('keep shelve after unshelving')),
('n', 'name', '', ('n', 'name', '',
_('restore shelved change with given name'), _('NAME')), _('restore shelved change with given name'), _('NAME')),
('t', 'tool', '', _('specify merge tool')), ('t', 'tool', '', _('specify merge tool')),
('', 'date', '', ('', 'date', '',
_('set date for temporary commits (DEPRECATED)'), _('DATE'))], _('set date for temporary commits (DEPRECATED)'), _('DATE'))],
_('hg unshelve [OPTION]... [FILE]... [-n SHELVED]'), _('hg unshelve [OPTION]... [FILE]... [-n SHELVED]'),