mercurial/shelve.py
807	How about: Handles creation of unshelve commit and updating the shelve if it was partially unshelved. If interactive is: * false: commit all the changes in working directory. * true: prompts user to select changes to unshelve and commit them. Update the shelve with remaining changes. Returns the node of the new commit formed and a bool indicating whether the shelve was partially unshelved.

mercurial/shelve.py
807	Awesome! Amending that right away.

			Path	Packages
M			mercurial/shelve.py (53 lines)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	16025		Jul 23 2019, 11:39 PM	★	★
Diff 2	16038		Jul 24 2019, 8:38 AM	★	★
Diff 3	16074		Jul 26 2019, 9:08 AM	★	★
Diff 4	16078		Jul 26 2019, 11:40 AM	★	★
Diff 5	16090	rHGc9114885c14b1487e4a7678244a93f985b6957b7	Jul 23 2019, 11:36 PM	★	★

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 16090

mercurial/shelve.py


	targetphase = phases.internal			targetphase = phases.internal
	if not phases.supportinternal(repo):			if not phases.supportinternal(repo):
	targetphase = phases.secret			targetphase = phases.secret
	overrides = {('phases', 'new-commit'): targetphase}			overrides = {('phases', 'new-commit'): targetphase}
	with repo.ui.configoverride(overrides, 'unshelve'):			with repo.ui.configoverride(overrides, 'unshelve'):
	with repo.dirstate.parentchange():			with repo.dirstate.parentchange():
	repo.setparents(state.parents[0], nodemod.nullid)			repo.setparents(state.parents[0], nodemod.nullid)
	if not interactive:			newnode, ispartialunshelve = _createunshelvectx(ui,
	ispartialunshelve = False			repo, shelvectx, basename, interactive, opts)
	newnode = repo.commit(text=shelvectx.description(),
	extra=shelvectx.extra(),
	user=shelvectx.user(),
	date=shelvectx.date())
	else:
	newnode, ispartialunshelve = _dounshelveinteractive(ui,
	repo, shelvectx, basename, opts)

	if newnode is None:			if newnode is None:
	# If it ended up being a no-op commit, then the normal			# If it ended up being a no-op commit, then the normal
	# merge state clean-up path doesn't happen, so do it			# merge state clean-up path doesn't happen, so do it
	# here. Fix issue5494			# here. Fix issue5494
	merge.mergestate.clean(repo)			merge.mergestate.clean(repo)
	shelvectx = state.pendingctx			shelvectx = state.pendingctx
	msg = _('note: unshelved changes already existed '			msg = _('note: unshelved changes already existed '
	if node is None:			if node is None:
	info = {'node': nodemod.hex(shelvectx.node())}			info = {'node': nodemod.hex(shelvectx.node())}
	shelvedfile(repo, basename, 'shelve').writeinfo(info)			shelvedfile(repo, basename, 'shelve').writeinfo(info)
	else:			else:
	shelvectx = repo[node]			shelvectx = repo[node]

	return repo, shelvectx			return repo, shelvectx

	def _dounshelveinteractive(ui, repo, shelvectx, basename, opts):			def _createunshelvectx(ui, repo, shelvectx, basename, interactive, opts):
	"""The user might want to unshelve certain changes only from the stored			"""Handles the creation of unshelve commit and updates the shelve if it
	shelve. So, we would create two commits. One with requested changes to			was partially unshelved.
	unshelve at that time and the latter is shelved for future.
				If interactive is:

				* False: Commits all the changes in the working directory.
				* True: Prompts the user to select changes to unshelve and commit them.
				pulkitUnsubmitted Not Done How about: Handles creation of unshelve commit and updating the shelve if it was partially unshelved. If interactive is: * false: commit all the changes in working directory. * true: prompts user to select changes to unshelve and commit them. Update the shelve with remaining changes. Returns the node of the new commit formed and a bool indicating whether the shelve was partially unshelved. pulkit: How about: ``` Handles creation of unshelve commit and updating the shelve if it was partially…
				navaneeth.sureshAuthorUnsubmitted Done Awesome! Amending that right away. navaneeth.suresh: Awesome! Amending that right away.
				Update the shelve with remaining changes.

				Returns the node of the new commit formed and a bool indicating whether
				the shelve was partially unshelved.Creates a commit ctx to unshelve
				interactively or non-interactively.

				The user might want to unshelve certain changes only from the stored
				shelve in interactive. So, we would create two commits. One with requested
				changes to unshelve at that time and the latter is shelved for future.

				Here, we return both the newnode which is created interactively and a
				bool to know whether the shelve is partly done or completely done.
	"""			"""
	opts['message'] = shelvectx.description()			opts['message'] = shelvectx.description()
	opts['interactive-unshelve'] = True			opts['interactive-unshelve'] = True
	pats = []			pats = []
				if not interactive:
				newnode = repo.commit(text=shelvectx.description(),
				extra=shelvectx.extra(),
				user=shelvectx.user(),
				date=shelvectx.date())
				return newnode, False

	commitfunc = getcommitfunc(shelvectx.extra(), interactive=True,			commitfunc = getcommitfunc(shelvectx.extra(), interactive=True,
	editor=True)			editor=True)
	newnode = cmdutil.dorecord(ui, repo, commitfunc, None, False,			newnode = cmdutil.dorecord(ui, repo, commitfunc, None, False,
	cmdutil.recordfilter, *pats,			cmdutil.recordfilter, *pats,
	**pycompat.strkwargs(opts))			**pycompat.strkwargs(opts))
	snode = repo.commit(text=shelvectx.description(),			snode = repo.commit(text=shelvectx.description(),
	extra=shelvectx.extra(),			extra=shelvectx.extra(),
	user=shelvectx.user(),			user=shelvectx.user(),
	shelvedstate.save(repo, basename, pctx, tmpwctx, nodestoremove,			shelvedstate.save(repo, basename, pctx, tmpwctx, nodestoremove,
	branchtorestore, opts.get('keep'), activebookmark)			branchtorestore, opts.get('keep'), activebookmark)
	raise error.InterventionRequired(			raise error.InterventionRequired(
	_("unresolved conflicts (see 'hg resolve', then "			_("unresolved conflicts (see 'hg resolve', then "
	"'hg unshelve --continue')"))			"'hg unshelve --continue')"))

	with repo.dirstate.parentchange():			with repo.dirstate.parentchange():
	repo.setparents(tmpwctx.node(), nodemod.nullid)			repo.setparents(tmpwctx.node(), nodemod.nullid)
	if not interactive:			newnode, ispartialunshelve = _createunshelvectx(ui, repo,
	ispartialunshelve = False			shelvectx, basename, interactive, opts)
	newnode = repo.commit(text=shelvectx.description(),
	extra=shelvectx.extra(),
	user=shelvectx.user(),
	date=shelvectx.date())
	else:
	newnode, ispartialunshelve = _dounshelveinteractive(ui, repo,
	shelvectx, basename, opts)

	if newnode is None:			if newnode is None:
	# If it ended up being a no-op commit, then the normal			# If it ended up being a no-op commit, then the normal
	# merge state clean-up path doesn't happen, so do it			# merge state clean-up path doesn't happen, so do it
	# here. Fix issue5494			# here. Fix issue5494
	merge.mergestate.clean(repo)			merge.mergestate.clean(repo)
	shelvectx = tmpwctx			shelvectx = tmpwctx
	msg = _('note: unshelved changes already existed '			msg = _('note: unshelved changes already existed '

This is an archive of the discontinued Mercurial Phabricator instance.

unshelve: unify logic around creating an unshelve changeset
ClosedPublic

Details

Diff Detail

Event Timeline

Revision Contents
Changeset List

Diff 16090

mercurial/shelve.py

This is an archive of the discontinued Mercurial Phabricator instance.

unshelve: unify logic around creating an unshelve changesetClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 16090

mercurial/shelve.py

unshelve: unify logic around creating an unshelve changeset
ClosedPublic

Revision Contents
Changeset List