This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6686

unshelve: handle stripping changesets on interactive mode
ClosedPublic

Authored by navaneeth.suresh on Jul 24 2019, 8:48 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG4814d993fe21: unshelve: handle stripping changesets on interactive mode
Summary

On interactive mode, changesets on nodestoremove should be
stripped regardless of the shelve is partial or not. This patch
modifies unshelvecontinue() to do that.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

pulkit added a subscriber: pulkit.Jul 24 2019, 10:48 AM

Can you add tests for this? There is no test which passes or fails because of this change.

navaneeth.suresh added a comment.Jul 25 2019, 12:36 PM

I just found that this change is not required while creating D6694. We will be needing the nodes which we are removing for later in case of a partial unshelve.
The stripbased approach of unshelve failed on the change in D6694 on having this change. Should I abandon this?

pulkit added a comment.Jul 26 2019, 10:44 AM
In D6686#97957, @navaneeth.suresh wrote:

I just found that this change is not required while creating D6694. We will be needing the nodes which we are removing for later in case of a partial unshelve.
The stripbased approach of unshelve failed on the change in D6694 on having this change. Should I abandon this?

I think this change is required. A nice way to figure out will be to add the test which you added and not make the change in code and see whether do we remove the extra cset or not.

navaneeth.suresh added a comment.Jul 26 2019, 11:22 AM
In D6686#98006, @pulkit wrote:
In D6686#97957, @navaneeth.suresh wrote:

I just found that this change is not required while creating D6694. We will be needing the nodes which we are removing for later in case of a partial unshelve.
The stripbased approach of unshelve failed on the change in D6694 on having this change. Should I abandon this?

I think this change is required. A nice way to figure out will be to add the test which you added and not make the change in code and see whether do we remove the extra cset or not.

Yes, this change is required. D6694 is modified and rebased on top of this change.

pulkit accepted this revision.Aug 6 2019, 7:09 AM
This revision is now accepted and ready to land.Aug 6 2019, 7:09 AM
pulkit added a comment.Aug 6 2019, 7:53 AM

I am not sure why, but test-shelve.t fails for me with some hash changes. Can you have a look?

Revision Contents
Changeset List

PathPackages
Mmercurial/shelve.py (6 lines)
Mtests/test-shelve.t (41 lines)

Diff 16065

mercurial/shelve.py

# only strip the shelvectx if we produced one # only strip the shelvectx if we produced one
state.nodestoremove.append(newnode) state.nodestoremove.append(newnode)
shelvectx = repo[newnode] shelvectx = repo[newnode]
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 ispartialunshelve:
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)
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():

tests/test-shelve.t

> EOF > EOF
$ hg resolve -m bar1 bar2 $ hg resolve -m bar1 bar2
(no more unresolved files) (no more unresolved files)
continue: hg unshelve --continue continue: hg unshelve --continue
$ cat bar1 $ cat bar1
A A
B B
C C
#if stripbased
$ hg log -r 3:: -G
@ changeset: 5:506510493902
| tag: tip
| parent: 3:adfeba9a1ac4
| user: shelve@localhost
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: changes to: add A to bars
|
| @ changeset: 4:8b023952e29c
|/ user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: add C to bars
|
o changeset: 3:adfeba9a1ac4
| user: test
~ date: Thu Jan 01 00:00:00 1970 +0000
summary: add A to bars
#endif
$ hg unshelve --continue <<EOF $ hg unshelve --continue <<EOF
> y > y
> y > y
> y > y
> y > n
> EOF > EOF
diff --git a/bar1 b/bar1 diff --git a/bar1 b/bar1
1 hunks, 1 lines changed 1 hunks, 1 lines changed
examine changes to 'bar1'? examine changes to 'bar1'?
(enter ? for help) [Ynesfdaq?] y (enter ? for help) [Ynesfdaq?] y
@@ -1,2 +1,3 @@ @@ -1,2 +1,3 @@
A A
+B +B
C C
record change 1/2 to 'bar1'? record change 1/2 to 'bar1'?
(enter ? for help) [Ynesfdaq?] y (enter ? for help) [Ynesfdaq?] y
diff --git a/bar2 b/bar2 diff --git a/bar2 b/bar2
1 hunks, 1 lines changed 1 hunks, 1 lines changed
examine changes to 'bar2'? examine changes to 'bar2'?
(enter ? for help) [Ynesfdaq?] y (enter ? for help) [Ynesfdaq?] y
@@ -1,2 +1,3 @@ @@ -1,2 +1,3 @@
A A
+B +B
C C
record change 2/2 to 'bar2'? record change 2/2 to 'bar2'?
(enter ? for help) [Ynesfdaq?] y (enter ? for help) [Ynesfdaq?] n
unshelve of 'default-01' complete unshelve of 'default-01' complete
#if stripbased
$ hg log -r 3:: -G
@ changeset: 4:8b023952e29c
| tag: tip
| user: test
| date: Thu Jan 01 00:00:00 1970 +0000
| summary: add C to bars
|
o changeset: 3:adfeba9a1ac4
| user: test
~ date: Thu Jan 01 00:00:00 1970 +0000
summary: add A to bars
#endif