Page MenuHomePhabricator

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

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

Details

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.Sat, Jul 27, 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)Sat, Jul 27, 2:25 AM
durin42 requested changes to this revision.Thu, Aug 1, 2:32 PM
durin42 added a subscriber: durin42.

needs rebased

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

These timing needs to be globbed.

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

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

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

the above sentence is confusing and maybe incorrect too.

tests/test-shelve.t
1430

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

This revision was not accepted when it landed; it landed in state Needs Review.
This revision was automatically updated to reflect the committed changes.