This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3689

shelve: directly handle `--continue`
ClosedPublic

Authored by lothiraldan on Jun 5 2018, 6:57 AM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHGf4776f8b98e0: shelve: directly handle `--continue`
Summary

Shelve is currently sub-contracting some of its work to the rebase extension.
In order to make shelve more independent and flexible we would like shelve to
handle the parent alignment directly.

This changeset takes on the next step, handling the abort process. Same as for
--abort. It turns out we have all the necessary bits in the shelvestate
file. So we do not need anything from the interrupted rebase.

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

lothiraldan created this revision.Jun 5 2018, 6:57 AM
durin42 accepted this revision.Jun 25 2018, 10:51 AM
This revision is now accepted and ready to land.Jun 25 2018, 10:51 AM
Closed by commit rHGf4776f8b98e0: shelve: directly handle `--continue` (authored by lothiraldan). · Explain WhyJun 25 2018, 11:21 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/shelve.py (41 lines)
Mtests/test-shelve.t (8 lines)

Diff 9290

hgext/shelve.py

with repo.lock(): with repo.lock():
checkparents(repo, state) checkparents(repo, state)
ms = merge.mergestate.read(repo) ms = merge.mergestate.read(repo)
if list(ms.unresolved()): if list(ms.unresolved()):
raise error.Abort( raise error.Abort(
_("unresolved conflicts, can't continue"), _("unresolved conflicts, can't continue"),
hint=_("see 'hg resolve', then 'hg unshelve --continue'")) hint=_("see 'hg resolve', then 'hg unshelve --continue'"))
repo.vfs.rename('unshelverebasestate', 'rebasestate') shelvectx = repo[state.parents[1]]
try: pendingctx = state.pendingctx
rebase.rebase(ui, repo, **{
r'continue' : True
})
except Exception:
repo.vfs.rename('rebasestate', 'unshelverebasestate')
raise
shelvectx = repo['tip'] overrides = {('phases', 'new-commit'): phases.secret}
if state.pendingctx not in shelvectx.parents(): with repo.ui.configoverride(overrides, 'unshelve'):
# rebase was a no-op, so it produced no child commit with repo.dirstate.parentchange():
repo.setparents(state.parents[0], nodemod.nullid)
newnode = repo.commit(text=shelvectx.description(),
extra=shelvectx.extra(),
user=shelvectx.user(),
date=shelvectx.date())
if newnode is None:
# If it ended up being a no-op commit, then the normal
# merge state clean-up path doesn't happen, so do it
# here. Fix issue5494
merge.mergestate.clean(repo)
shelvectx = state.pendingctx shelvectx = state.pendingctx
msg = _('note: unshelved changes already existed '
'in the working copy\n')
ui.status(msg)
else: else:
# only strip the shelvectx if the rebase produced it # only strip the shelvectx if we produced one
state.nodestoremove.append(shelvectx.node()) state.nodestoremove.append(newnode)
shelvectx = repo[newnode]
hg.updaterepo(repo, pendingctx.node(), False)
if repo.vfs.exists('unshelverebasestate'):
repo.vfs.rename('unshelverebasestate', 'rebasestate')
rebase.clearstatus(repo)
mergefiles(ui, repo, state.wctx, shelvectx) mergefiles(ui, repo, state.wctx, shelvectx)
restorebranch(ui, repo, state.branchtorestore) restorebranch(ui, repo, state.branchtorestore)
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)

tests/test-shelve.t

(use 'hg unshelve --continue' or 'hg unshelve --abort') (use 'hg unshelve --continue' or 'hg unshelve --abort')
[255] [255]
$ hg graft --continue $ hg graft --continue
abort: no graft in progress abort: no graft in progress
(continue: hg unshelve --continue) (continue: hg unshelve --continue)
[255] [255]
$ hg unshelve -c $ hg unshelve -c
rebasing 5:32c69314e062 "changes to: [mq]: second.patch" (tip)
unshelve of 'default' complete unshelve of 'default' complete
ensure the repo is as we hope ensure the repo is as we hope
$ hg parents $ hg parents
changeset: 3:2e69b451d1ea changeset: 3:2e69b451d1ea
tag: tip tag: tip
user: test user: test
is a no-op), works (issue4398) is a no-op), works (issue4398)
$ hg revert -a -r . $ hg revert -a -r .
reverting a/a reverting a/a
$ hg resolve -m a/a $ hg resolve -m a/a
(no more unresolved files) (no more unresolved files)
continue: hg unshelve --continue continue: hg unshelve --continue
$ hg unshelve -c $ hg unshelve -c
rebasing 5:e42a7da90865 "changes to: second" (tip) note: unshelved changes already existed in the working copy
note: rebase of 5:e42a7da90865 created no changes to commit
unshelve of 'default' complete unshelve of 'default' complete
$ hg bookmark $ hg bookmark
* test 4:33f7f61e6c5e * test 4:33f7f61e6c5e
$ hg diff $ hg diff
$ hg status $ hg status
? a/a.orig ? a/a.orig
? foo/foo ? foo/foo
$ hg summary $ hg summary
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 unshelve --continue
rebasing 2:425c97ef07f3 "changes to: a" (tip)
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
$ 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 $ hg unshelve --continue
rebasing 2:425c97ef07f3 "changes to: a" (tip)
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 ..
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 unshelve --continue
rebasing 2:3fbe6fbb0bef "changes to: 1" (tip)
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
> :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 unshelve --continue
rebasing 2:003d2d94241c "changes to: root" (tip)
unshelve of 'ashelve' complete unshelve of 'ashelve' complete
$ cd .. $ cd ..