( )⚙ D6652 continue: added support for unshelve

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6652

continue: added support for unshelve
ClosedPublic

Authored by taapas1128 on Jul 17 2019, 1:00 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG117437f3f541: continue: added support for unshelve
rHG3072efd46d1c: continue: added support for unshelve
Summary

This patch adds the support for ushelve in hg continue plan.

hgcontinueunshelve() has been created for independent calls.
In case an interrupted unshelve is resumed via hg continue the
shelvedstate needs to be loaded seperately. This has been
ensured by _loadunshelvedstate()

hgcontinueunshelve() is then registered as continuefunc for state
detection API.

Results are shown as tests.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

taapas1128 created this revision.Jul 17 2019, 1:00 PM
taapas1128 added a commit: rHG3072efd46d1c: continue: added support for unshelve.Jul 17 2019, 7:05 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG3072efd46d1c: continue: added support for unshelve (authored by taapas1128). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (1 line)
Mmercurial/shelve.py (6 lines)
Mtests/test-shelve2.t (24 lines)

Diff 15943

mercurial/commands.py

prevents from deciding exact order of them, for safety. prevents from deciding exact order of them, for safety.
""" """
with repo.wlock(): with repo.wlock():
return shelvemod.dounshelve(ui, repo, *shelved, **opts) return shelvemod.dounshelve(ui, repo, *shelved, **opts)
statemod.addunfinished( statemod.addunfinished(
'unshelve', fname='shelvedstate', continueflag=True, 'unshelve', fname='shelvedstate', continueflag=True,
abortfunc=shelvemod.hgabortunshelve, abortfunc=shelvemod.hgabortunshelve,
continuefunc=shelvemod.hgcontinueunshelve,
cmdmsg=_('unshelve already in progress'), cmdmsg=_('unshelve already in progress'),
) )
@command('update|up|checkout|co', @command('update|up|checkout|co',
[('C', 'clean', None, _('discard uncommitted changes (no backup)')), [('C', 'clean', None, _('discard uncommitted changes (no backup)')),
('c', 'check', None, _('require clean working directory')), ('c', 'check', None, _('require clean working directory')),
('m', 'merge', None, _('merge uncommitted changes')), ('m', 'merge', None, _('merge uncommitted changes')),
('d', 'date', '', _('tipmost revision matching date'), _('DATE')), ('d', 'date', '', _('tipmost revision matching date'), _('DATE')),

mercurial/shelve.py

if not phases.supportinternal(repo): if not phases.supportinternal(repo):
repair.strip(ui, repo, state.nodestoremove, backup=False, repair.strip(ui, repo, state.nodestoremove, backup=False,
topic='shelve') topic='shelve')
_restoreactivebookmark(repo, state.activebookmark) _restoreactivebookmark(repo, state.activebookmark)
shelvedstate.clear(repo) shelvedstate.clear(repo)
unshelvecleanup(ui, repo, state.name, opts) unshelvecleanup(ui, repo, state.name, opts)
ui.status(_("unshelve of '%s' complete\n") % state.name) ui.status(_("unshelve of '%s' complete\n") % state.name)
def hgcontinueunshelve(ui, repo):
"""logic to resume unshelve using 'hg continue'"""
with repo.wlock():
state = _loadshelvedstate(ui, repo, {'continue' : True})
return unshelvecontinue(ui, repo, state, {'keep' : state.keep})
def _commitworkingcopychanges(ui, repo, opts, tmpwctx): def _commitworkingcopychanges(ui, repo, opts, tmpwctx):
"""Temporarily commit working copy changes before moving unshelve commit""" """Temporarily commit working copy changes before moving unshelve commit"""
# Store pending changes in a commit and remember added in case a shelve # Store pending changes in a commit and remember added in case a shelve
# contains unknown files that are part of the pending change # contains unknown files that are part of the pending change
s = repo.status() s = repo.status()
addedbefore = frozenset(s.added) addedbefore = frozenset(s.added)
if not (s.modified or s.added or s.removed): if not (s.modified or s.added or s.removed):
return tmpwctx, addedbefore return tmpwctx, addedbefore

tests/test-shelve2.t

#testcases stripbased phasebased #testcases stripbased phasebased
#testcases abortflag abortcommand #testcases abortflag abortcommand
#testcases continueflag continuecommand
$ cat <<EOF >> $HGRCPATH $ cat <<EOF >> $HGRCPATH
> [extensions] > [extensions]
> mq = > mq =
> [defaults] > [defaults]
> diff = --nodates --git > diff = --nodates --git
> qnew = --date '0 0' > qnew = --date '0 0'
> [shelve] > [shelve]
#if abortflag #if abortflag
$ cat >> $HGRCPATH <<EOF $ cat >> $HGRCPATH <<EOF
> [alias] > [alias]
> abort = unshelve --abort > abort = unshelve --abort
> EOF > EOF
#endif #endif
#if continueflag
$ cat >> $HGRCPATH <<EOF
> [alias]
> continue = unshelve --continue
> EOF
#endif
shelve should leave dirstate clean (issue4055) shelve should leave dirstate clean (issue4055)
$ hg init shelverebase $ hg init shelverebase
$ cd shelverebase $ cd shelverebase
$ printf 'x\ny\n' > x $ printf 'x\ny\n' > x
$ echo z > z $ echo z > z
$ hg commit -Aqm xy $ hg commit -Aqm xy
$ echo z >> x $ echo z >> x
warning: conflicts while merging a! (edit, then use 'hg resolve --mark') warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
[1] [1]
$ echo "aaabbbccc" > a $ echo "aaabbbccc" > a
$ rm a.orig $ rm a.orig
$ hg resolve --mark a $ hg resolve --mark a
(no more unresolved files) (no more unresolved files)
continue: hg unshelve --continue continue: hg unshelve --continue
$ hg unshelve --continue $ hg continue
marked working directory as branch test marked working directory as branch test
unshelve of 'default' complete unshelve of 'default' complete
$ cat a $ cat a
aaabbbccc aaabbbccc
$ hg status $ hg status
M a M a
$ hg branch $ hg branch
test test
$ cp .hg/shelvedstate .hg/shelvedstate_old $ cp .hg/shelvedstate .hg/shelvedstate_old
$ cat .hg/shelvedstate_old | grep -v 'branchtorestore' > .hg/shelvedstate $ cat .hg/shelvedstate_old | grep -v 'branchtorestore' > .hg/shelvedstate
$ echo "aaabbbccc" > a $ echo "aaabbbccc" > a
$ rm a.orig $ rm a.orig
$ hg resolve --mark a $ hg resolve --mark a
(no more unresolved files) (no more unresolved files)
continue: hg unshelve --continue continue: hg unshelve --continue
$ hg unshelve --continue
#if continuecommand
$ hg continue --dry-run
unshelve in progress, will be resumed
#endif
$ hg continue
unshelve of 'default' complete unshelve of 'default' complete
$ cat a $ cat a
aaabbbccc aaabbbccc
$ hg status $ hg status
M a M a
$ hg branch $ hg branch
default default
$ cd .. $ cd ..
rebasing shelved changes rebasing shelved changes
merging file merging file
warning: conflicts while merging file! (edit, then use 'hg resolve --mark') warning: conflicts while merging file! (edit, then use 'hg resolve --mark')
unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
[1] [1]
$ echo somethingsomething > .hg/shelvedstate $ echo somethingsomething > .hg/shelvedstate
Unshelve --continue fails with appropriate message if shelvedstate is corrupted Unshelve --continue fails with appropriate message if shelvedstate is corrupted
$ hg unshelve --continue $ hg continue
abort: corrupted shelved state file abort: corrupted shelved state file
(please run hg unshelve --abort to abort unshelve operation) (please run hg unshelve --abort to abort unshelve operation)
[255] [255]
Unshelve --abort works with a corrupted shelvedstate Unshelve --abort works with a corrupted shelvedstate
$ hg abort $ hg abort
abort: could not read shelved state file, your working copy may be in an unexpected state abort: could not read shelved state file, your working copy may be in an unexpected state
please update to some commit please update to some commit
rebasing shelved changes rebasing shelved changes
merging file merging file
warning: conflicts while merging file! (edit, then use 'hg resolve --mark') warning: conflicts while merging file! (edit, then use 'hg resolve --mark')
unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue') unresolved conflicts (see 'hg resolve', then 'hg unshelve --continue')
[1] [1]
$ hg resolve --mark file $ hg resolve --mark file
(no more unresolved files) (no more unresolved files)
continue: hg unshelve --continue continue: hg unshelve --continue
$ hg unshelve --continue $ hg continue
unshelve of 'default' complete unshelve of 'default' complete
$ hg shelve --list $ hg shelve --list
default (*s ago) * changes to: 1 (glob) default (*s ago) * changes to: 1 (glob)
$ cd .. $ cd ..
Unshelving when there are deleted files does not crash (issue4176) Unshelving when there are deleted files does not crash (issue4176)
$ hg init unshelve-deleted-file && cd unshelve-deleted-file $ hg init unshelve-deleted-file && cd unshelve-deleted-file
$ echo a > a && echo b > b && hg ci -Am ab $ echo a > a && echo b > b && hg ci -Am ab
> nokeep > nokeep
> :no-active-bookmark > :no-active-bookmark
> EOF > EOF
$ echo 1 > a $ echo 1 > a
$ hg resolve --mark a $ hg resolve --mark a
(no more unresolved files) (no more unresolved files)
continue: hg unshelve --continue continue: hg unshelve --continue
mercurial does not crash mercurial does not crash
$ hg unshelve --continue $ hg continue
unshelve of 'ashelve' complete unshelve of 'ashelve' complete
#if phasebased #if phasebased
Unshelve with some metadata file missing Unshelve with some metadata file missing
---------------------------------------- ----------------------------------------
$ hg shelve $ hg shelve