Page MenuHomePhabricator

unshelve: modify --continue on interactive unshelve
AbandonedPublic

Authored by pulkit on Jul 24 2019, 8:14 AM.

Details

Reviewers
navaneeth.suresh
Group Reviewers
hg-reviewers
Summary

shelvedstate should store info about interactive mode after D6679.
This patch modifies the behavior of hg unshelve --continue after
an unshelve on interactive mode to get the basename from the
shelvedstate.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

pulkit added a subscriber: pulkit.Jul 24 2019, 10:06 AM
pulkit added inline comments.
tests/test-shelve.t
1354 ↗(On Diff #16037)

This test change should be in the parent differential.

pulkit added inline comments.Jul 24 2019, 10:54 AM
mercurial/shelve.py
949

Now I understand how this and the parent patches are arranged.

Why don't be have all the logic related to interactive in unshelvecontinue, including getting the name of the shelve we are processing.

Right now, we are getting name of top most shelve, however we should read the shelvedstate and get the name from there.

mercurial/shelve.py
949

Doing that right away!

navaneeth.suresh edited the summary of this revision. (Show Details)Jul 24 2019, 1:43 PM
navaneeth.suresh updated this revision to Diff 16056.
navaneeth.suresh edited the summary of this revision. (Show Details)Jul 24 2019, 2:02 PM
navaneeth.suresh updated this revision to Diff 16058.
navaneeth.suresh marked an inline comment as done.Jul 24 2019, 2:04 PM

Sorry for getting this and the parent patch split before, after the recent improvements, it looks like they should be folded into one.

In D6684#97930, @pulkit wrote:

Sorry for getting this and the parent patch split before, after the recent improvements, it looks like they should be folded into one.

Cool. Changes from this patch is folded to affect in D6679. Abandoning this.

pulkit commandeered this revision.
pulkit abandoned this revision.