This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6116

uncommit: updated explanation of _fixdirstate()
AbandonedPublic

Authored by taapas1128 on Mar 11 2019, 12:19 PM.

Download Raw Diff

Details

Reviewers

None

Group Reviewers

hg-reviewers

Summary

This patch updates the explanation for _fixdirstate() which was changed in D971 when the matcher was removed and not updated when the matcher was reused in D5661 between oldctx and newctx

Diff Detail

Repository

rHG Mercurial

Lint

Lint Skipped

Unit

Unit Tests Skipped

Event Timeline

taapas1128 created this revision.Mar 11 2019, 12:19 PM

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

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

taapas1128 edited the summary of this revision. (Show Details)Mar 11 2019, 12:22 PM

taapas1128 edited the summary of this revision. (Show Details)Mar 11 2019, 12:27 PM

Sorry, I was actually about to send a different patch for updating its documentation. I'll send it in a few minutes and you can let me know what you think.

okay then I am closing this .

taapas1128 abandoned this revision.Mar 11 2019, 12:48 PM

Revision Contents
Changeset List

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

Commit	Parents	Author	Summary	Date
		Taapas Agrawal		Mar 11 2019, 5:44 PM

Diff 14463

hgext/uncommit.py

	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 _fixdirstate(repo, oldctx, newctx, match=None):
	""" fix the dirstate after switching the working directory from oldctx to			"""Fix the dirstate after switching the working directory from
	newctx which can be result of either unamend or uncommit.			oldctx to newctx not containing changed files matched by
				match. Works for both unamend or uncommit.
	"""			"""
	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

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	14463			Mar 11 2019, 12:19 PM	★	★