This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6117

uncommit: convert _fixdirstate() into _movedirstate()
ClosedPublic

Authored by martinvonz on Mar 11 2019, 2:19 PM.

Download Raw Diff

Details

Reviewers

pulkit

Group Reviewers

hg-reviewers

Commits

rHGbf72e4c39f0b: uncommit: convert _fixdirstate() into _movedirstate()

Summary

_fixdirstate() already also updates to the given commit, so let's
rename it to _movedirstate(). Also update the documentation and drop
the unnecessary "curctx" argument, since that should always be
repo['.'].

Diff Detail

Repository

rHG Mercurial

Lint

Lint Skipped

Unit

Unit Tests Skipped

Event Timeline

martinvonz created this revision.Mar 11 2019, 2:19 PM

Herald added a reviewer: hg-reviewers. · View Herald TranscriptMar 11 2019, 2:19 PM

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

martinvonz added a child revision: D6118: copies: remove dependency on scmutil by directly using match.exact().Mar 11 2019, 2:19 PM

In the documentation part don't you think there should be information about the matcher as there was before D971

In D6117#89132, @taapas1128 wrote:

In the documentation part don't you think there should be information about the matcher as there was before D971

Yeah, we should document that. I'll send another patch.

pulkit accepted this revision.Mar 11 2019, 6:39 PM

Closed by commit rHGbf72e4c39f0b: uncommit: convert _fixdirstate() into _movedirstate() (authored by martinvonz). · Explain WhyMar 11 2019, 7:17 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

			Path	Packages
M			hgext/uncommit.py (11 lines)

Commit	Parents	Author	Summary	Date
		Martin von Zweigbergk		Mar 11 2019, 12:35 PM

Status	Author	Revision
Closed	martinvonz	D6120 scmutil: document matcher argument of movedirstate()
Closed	martinvonz	D6119 uncommit: move _movedirstate() to scmutil for reuse
Closed	martinvonz	D6118 copies: remove dependency on scmutil by directly using match.exact()
Closed	martinvonz	D6117 uncommit: convert _fixdirstate() into _movedirstate()

Diff 14466

hgext/uncommit.py

	text=ctx.description(),			text=ctx.description(),
	files=files,			files=files,
	filectxfn=filectxfn,			filectxfn=filectxfn,
	user=ctx.user(),			user=ctx.user(),
	date=ctx.date(),			date=ctx.date(),
	extra=ctx.extra())			extra=ctx.extra())
	return repo.commitctx(new)			return repo.commitctx(new)

	def _fixdirstate(repo, oldctx, newctx, match=None):			def _movedirstate(repo, newctx, match=None):
	""" fix the dirstate after switching the working directory from oldctx to			"""Move the dirstate to newctx and adjust it as necessary."""
	newctx which can be result of either unamend or uncommit.			oldctx = repo['.']
	"""
	ds = repo.dirstate			ds = repo.dirstate
	ds.setparents(newctx.node(), node.nullid)			ds.setparents(newctx.node(), node.nullid)
	copies = dict(ds.copies())			copies = dict(ds.copies())
	s = newctx.status(oldctx, match=match)			s = newctx.status(oldctx, match=match)
	for f in s.modified:			for f in s.modified:
	if ds[f] == 'r':			if ds[f] == 'r':
	# modified + removed -> removed			# modified + removed -> removed
	continue			continue
	if newid != old.p1().node():			if newid != old.p1().node():
	# Move local changes on filtered changeset			# Move local changes on filtered changeset
	mapping[old.node()] = (newid,)			mapping[old.node()] = (newid,)
	else:			else:
	# Fully removed the old commit			# Fully removed the old commit
	mapping[old.node()] = ()			mapping[old.node()] = ()

	with repo.dirstate.parentchange():			with repo.dirstate.parentchange():
	_fixdirstate(repo, old, repo[newid], match)			_movedirstate(repo, repo[newid], match)

	scmutil.cleanupnodes(repo, mapping, 'uncommit', fixphase=True)			scmutil.cleanupnodes(repo, mapping, 'uncommit', fixphase=True)

	def predecessormarkers(ctx):			def predecessormarkers(ctx):
	"""yields the obsolete markers marking the given changeset as a successor"""			"""yields the obsolete markers marking the given changeset as a successor"""
	for data in ctx.repo().obsstore.predecessors.get(ctx.node(), ()):			for data in ctx.repo().obsstore.predecessors.get(ctx.node(), ()):
	yield obsutil.marker(ctx.repo(), data)			yield obsutil.marker(ctx.repo(), data)

	user=predctx.user(),			user=predctx.user(),
	date=predctx.date(),			date=predctx.date(),
	extra=extras)			extra=extras)
	newprednode = repo.commitctx(newctx)			newprednode = repo.commitctx(newctx)
	newpredctx = repo[newprednode]			newpredctx = repo[newprednode]
	dirstate = repo.dirstate			dirstate = repo.dirstate

	with dirstate.parentchange():			with dirstate.parentchange():
	_fixdirstate(repo, curctx, newpredctx)			_movedirstate(repo, newpredctx)

	mapping = {curctx.node(): (newprednode,)}			mapping = {curctx.node(): (newprednode,)}
	scmutil.cleanupnodes(repo, mapping, 'unamend', fixphase=True)			scmutil.cleanupnodes(repo, mapping, 'unamend', fixphase=True)

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	14466		Mar 11 2019, 2:19 PM	★	★
Diff 2	14470	rHGbf72e4c39f0bed8f4a477a295dc761c7c47da1a3	Mar 11 2019, 12:35 PM	★	★