This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6708

unshelve: clear shelvedstate and _finishunshelve() on partial unshelve
ClosedPublic

Authored by navaneeth.suresh on Aug 2 2019, 4:17 AM.

Download Raw Diff

Details

Reviewers

pulkit

Group Reviewers

hg-reviewers

Commits

rHG6957f7b93e03: unshelve: clear shelvedstate and _finishunshelve() on partial unshelve

Summary

On a partial unshelve, shelvedstate was not cleared and _finishunshelve()
was not called. Ideally, these should be called on this case. This patch makes
shelvedstate to delete after a successful partial unshelve and calls
_finishunshelve() in the same case.

Diff Detail

Repository

rHG Mercurial

Lint

Lint Skipped

Unit

Unit Tests Skipped

Event Timeline

navaneeth.suresh created this revision.Aug 2 2019, 4:17 AM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptAug 2 2019, 4:17 AM

Herald added a subscriber: mercurial-devel. · View Herald Transcript

navaneeth.suresh added a parent revision: D6699: unshelve: abort on using --keep and --interactive together.Aug 2 2019, 4:23 AM

pulkit added a subscriber: pulkit.Aug 6 2019, 7:18 AM

pulkit added inline comments.

mercurial/shelve.py
1008	IIUC, we don't need `_forgetunknownfiles()` too in this if statement. Can you add some related tests and see if we need this as a followup?

pulkit accepted this revision.Aug 6 2019, 7:19 AM

This revision is now accepted and ready to land.Aug 6 2019, 7:19 AM

Sorry for not noticing this before, but this patch needs tests.

navaneeth.suresh updated this revision to Diff 16141.Aug 6 2019, 11:59 AM

navaneeth.suresh added inline comments.Aug 6 2019, 12:00 PM

mercurial/shelve.py
1008	sure, will investigate on that.

navaneeth.suresh updated this revision to Diff 16146.Aug 6 2019, 1:10 PM

Applied the following diff in flight which was result of test output changes.

--- /home/pulkit/repo/paccess/tests/test-shelve.t
+++ /home/pulkit/repo/paccess/tests/test-shelve.t
@@ -1365,19 +1365,19 @@
 
 #if stripbased
   $ hg log -r 3:: -G
-  @  changeset:   5:506510493902
+  @  changeset:   5:f1d5f53e397b
   |  tag:         tip
-  |  parent:      3:adfeba9a1ac4
+  |  parent:      3:e28fd7fa7938
   |  user:        shelve@localhost
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     changes to: add A to bars
   |
-  | @  changeset:   4:8b023952e29c
+  | @  changeset:   4:fe451a778c81
   |/   user:        test
   |    date:        Thu Jan 01 00:00:00 1970 +0000
   |    summary:     add C to bars
   |
-  o  changeset:   3:adfeba9a1ac4
+  o  changeset:   3:e28fd7fa7938
   |  user:        test
   ~  date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     add A to bars
@@ -1418,13 +1418,13 @@
 
 #if stripbased
   $ hg log -r 3:: -G
-  @  changeset:   4:8b023952e29c
+  @  changeset:   4:fe451a778c81
   |  tag:         tip
   |  user:        test
   |  date:        Thu Jan 01 00:00:00 1970 +0000
   |  summary:     add C to bars
   |
-  o  changeset:   3:adfeba9a1ac4
+  o  changeset:   3:e28fd7fa7938
   |  user:        test
   ~  date:        Thu Jan 01 00:00:00 1970 +0000
      summary:     add A to bars

navaneeth.suresh added a commit: rHG6957f7b93e03: unshelve: clear shelvedstate and _finishunshelve() on partial unshelve.Aug 6 2019, 1:22 PM

Closed by commit rHG6957f7b93e03: unshelve: clear shelvedstate and _finishunshelve() on partial unshelve (authored by navaneeth.suresh). · Explain Why

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			mercurial/shelve.py (5 lines)
M			tests/test-shelve.t (1 line)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	16112		Aug 2 2019, 4:17 AM	★	★
Diff 2	16141		Aug 6 2019, 11:59 AM	★	★
Diff 3	16146		Aug 6 2019, 1:10 PM	★	★
Diff 4	16147	rHG6957f7b93e034d881e84d0029e952ce6ebbdf38a	Jul 27 2019, 2:49 AM	★	★

Commit	Parents	Author	Summary	Date
		Navaneeth Suresh		Jul 27 2019, 2:49 AM

Status	Author	Revision
Closed	navaneeth.suresh	D6708 unshelve: clear shelvedstate and _finishunshelve() on partial unshelve
Closed	navaneeth.suresh	D6699 unshelve: abort on using --keep and --interactive together
Closed	navaneeth.suresh	D6694 unshelve: delete shelvedstate after a successful unshelve --continue
Closed	navaneeth.suresh	D6687 unshelve: create a matcher only if required on creating unshelve ctx
Closed	navaneeth.suresh	D6686 unshelve: handle stripping changesets on interactive mode
Closed	navaneeth.suresh	D6685 unshelve: changes how date is set on interactive mode
Closed	navaneeth.suresh	D6683 unshelve: unify logic around creating an unshelve changeset

Diff 16112

mercurial/shelve.py


	shelvectx, ispartialunshelve = _rebaserestoredcommit(ui, repo, opts,			shelvectx, ispartialunshelve = _rebaserestoredcommit(ui, repo, opts,
	tr, oldtiprev, basename, pctx, tmpwctx, shelvectx,			tr, oldtiprev, basename, pctx, tmpwctx, shelvectx,
	branchtorestore, activebookmark)			branchtorestore, activebookmark)
	overrides = {('ui', 'forcemerge'): opts.get('tool', '')}			overrides = {('ui', 'forcemerge'): opts.get('tool', '')}
	with ui.configoverride(overrides, 'unshelve'):			with ui.configoverride(overrides, 'unshelve'):
	mergefiles(ui, repo, pctx, shelvectx)			mergefiles(ui, repo, pctx, shelvectx)
	restorebranch(ui, repo, branchtorestore)			restorebranch(ui, repo, branchtorestore)
	if not ispartialunshelve:
	_forgetunknownfiles(repo, shelvectx, addedbefore)

	shelvedstate.clear(repo)			shelvedstate.clear(repo)
	_finishunshelve(repo, oldtiprev, tr, activebookmark)			_finishunshelve(repo, oldtiprev, tr, activebookmark)
				if not ispartialunshelve:
				_forgetunknownfiles(repo, shelvectx, addedbefore)
				pulkitUnsubmitted Not Done IIUC, we don't need `_forgetunknownfiles()` too in this if statement. Can you add some related tests and see if we need this as a followup? pulkit: IIUC, we don't need `_forgetunknownfiles()` too in this if statement. Can you add some related…
				navaneeth.sureshAuthorUnsubmitted Done sure, will investigate on that. navaneeth.suresh: sure, will investigate on that.
	unshelvecleanup(ui, repo, basename, opts)			unshelvecleanup(ui, repo, basename, opts)
	finally:			finally:
	if tr:			if tr:
	tr.release()			tr.release()
	lockmod.release(lock)			lockmod.release(lock)

tests/test-shelve.t

	+++ b/d			+++ b/d
	@@ -0,0 +1,1 @@			@@ -0,0 +1,1 @@
	+			+
	$ hg unshelve -i <<EOF			$ hg unshelve -i <<EOF
	> y			> y
	> y			> y
	> EOF			> EOF
	unshelving change 'default'			unshelving change 'default'
				temporarily committing pending changes (restore with 'hg unshelve --abort')
	rebasing shelved changes			rebasing shelved changes
	diff --git a/d b/d			diff --git a/d b/d
	new file mode 100644			new file mode 100644
	examine changes to 'd'?			examine changes to 'd'?
	(enter ? for help) [Ynesfdaq?] y			(enter ? for help) [Ynesfdaq?] y

	@@ -0,0 +1,1 @@			@@ -0,0 +1,1 @@
	+			+