( )⚙ D6694 unshelve: delete shelvedstate after a successful unshelve --continue

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6694

unshelve: delete shelvedstate after a successful unshelve --continue
ClosedPublic

Authored by navaneeth.suresh on Jul 25 2019, 12:33 PM.

Details

Reviewers
durin42
pulkit
Group Reviewers
hg-reviewers
Commits
rHG073cfff9aaef: unshelve: delete shelvedstate after a successful unshelve --continue
Summary

unshelve --continue was preventing the deletion of shelvedstate on
a partial unshelve. Ideally, shelvedstate should be deleted after
a successful unshelve. Now, the behavior of unshelve --continue
will be as follows in interactive mode:

1] The user tried to unshelve changes interactively but, ran into
conflicts.
2] They resolved the conflicts and triggered unshelve --continue
but, unshelved changes partially.
3] Now, on trying to do unshelve --continue again will abort as
the last unshelve was successful and we are deleting the
shelvedstate.
4] If they want to unshelve the remaining shelved change, they
need to trigger unshelve without --continue.

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

navaneeth.suresh retitled this revision from unshelve: fix bug on a partial unshelve with --continue to unshelve: delete shelvedstate after a successful unshelve --continue.Jul 27 2019, 2:21 AM
navaneeth.suresh edited the summary of this revision. (Show Details)
navaneeth.suresh updated this revision to Diff 16085.
navaneeth.suresh edited the summary of this revision. (Show Details)Jul 27 2019, 2:25 AM
durin42 requested changes to this revision.Aug 1 2019, 2:32 PM
durin42 added a subscriber: durin42.

needs rebased

This revision now requires changes to proceed.Aug 1 2019, 2:32 PM
pulkit accepted this revision.Aug 6 2019, 7:11 AM
pulkit added inline comments.Aug 6 2019, 8:02 AM
tests/test-shelve.t
1436

These timing needs to be globbed.

navaneeth.suresh marked an inline comment as done.Aug 6 2019, 8:11 AM
navaneeth.suresh updated this revision to Diff 16133.
pulkit accepted this revision.Aug 6 2019, 9:09 AM

This fails to apply on tip of default. Can you rebase and resend?

pulkit added inline comments.Aug 6 2019, 11:50 AM
tests/test-shelve.t
1430

the above sentence is confusing and maybe incorrect too.

navaneeth.suresh added inline comments.Aug 6 2019, 12:03 PM
tests/test-shelve.t
1430

okay, maybe i should remove it. doing that right away.

navaneeth.suresh added a commit: rHG073cfff9aaef: unshelve: delete shelvedstate after a successful unshelve --continue.Aug 6 2019, 12:43 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG073cfff9aaef: unshelve: delete shelvedstate after a successful unshelve --continue (authored by navaneeth.suresh). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

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

Diff 16143

mercurial/shelve.py

hg.updaterepo(repo, pendingctx.node(), overwrite=False) hg.updaterepo(repo, pendingctx.node(), overwrite=False)
mergefiles(ui, repo, state.wctx, shelvectx) mergefiles(ui, repo, state.wctx, shelvectx)
restorebranch(ui, repo, state.branchtorestore) restorebranch(ui, repo, state.branchtorestore)
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')
if not ispartialunshelve:
shelvedstate.clear(repo) shelvedstate.clear(repo)
if not ispartialunshelve:
unshelvecleanup(ui, repo, state.name, opts) unshelvecleanup(ui, repo, state.name, opts)
_restoreactivebookmark(repo, state.activebookmark) _restoreactivebookmark(repo, state.activebookmark)
ui.status(_("unshelve of '%s' complete\n") % state.name) ui.status(_("unshelve of '%s' complete\n") % state.name)
def hgcontinueunshelve(ui, repo): def hgcontinueunshelve(ui, repo):
"""logic to resume unshelve using 'hg continue'""" """logic to resume unshelve using 'hg continue'"""
with repo.wlock(): with repo.wlock():
state = _loadshelvedstate(ui, repo, {'continue' : True}) state = _loadshelvedstate(ui, repo, {'continue' : True})

tests/test-shelve.t

| summary: add C to bars | summary: add C to bars
| |
o changeset: 3:adfeba9a1ac4 o changeset: 3:adfeba9a1ac4
| user: test | user: test
~ date: Thu Jan 01 00:00:00 1970 +0000 ~ date: Thu Jan 01 00:00:00 1970 +0000
summary: add A to bars summary: add A to bars
#endif #endif
$ hg unshelve --continue
abort: no unshelve in progress
pulkitUnsubmitted
Not Done

the above sentence is confusing and maybe incorrect too.

pulkit: the above sentence is confusing and maybe incorrect too.
navaneeth.sureshAuthorUnsubmitted
Done

okay, maybe i should remove it. doing that right away.

navaneeth.suresh: okay, maybe i should remove it. doing that right away.
[255]
$ hg shelve --list
default-01 (*)* changes to: add A to bars (glob)
default (*)* changes to: add B to foo (glob)
$ hg unshelve -n default-01 -i <<EOF
pulkitUnsubmitted
Done

These timing needs to be globbed.

pulkit: These timing needs to be globbed.
> y
> y
> EOF
temporarily committing pending changes (restore with 'hg unshelve --abort')
rebasing shelved changes
diff --git a/bar2 b/bar2
1 hunks, 1 lines changed
examine changes to 'bar2'?
(enter ? for help) [Ynesfdaq?] y
@@ -1,2 +1,3 @@
A
+B
C
record this change to 'bar2'?
(enter ? for help) [Ynesfdaq?] y