This is an archive of the discontinued Mercurial Phabricator instance.

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 14469

	"data will be stored for %s.\n")			"data will be stored for %s.\n")
	% (repo.pathto(origsrc, cwd), repo.pathto(dst, cwd)))			% (repo.pathto(origsrc, cwd), repo.pathto(dst, cwd)))
	if repo.dirstate[dst] in '?r' and not dryrun:			if repo.dirstate[dst] in '?r' and not dryrun:
	wctx.add([dst])			wctx.add([dst])
	elif not dryrun:			elif not dryrun:
	wctx.copy(origsrc, dst)			wctx.copy(origsrc, dst)

	def movedirstate(repo, newctx, match=None):			def movedirstate(repo, newctx, match=None):
	"""Move the dirstate to newctx and adjust it as necessary."""			"""Move the dirstate to newctx and adjust it as necessary.

				A matcher can be provided as an optimization. It is probably a bug to pass
				a matcher that doesn't match all the differences between the parent of the
				working copy and newctx.
				"""
	oldctx = repo['.']			oldctx = repo['.']
	ds = repo.dirstate			ds = repo.dirstate
	ds.setparents(newctx.node(), nullid)			ds.setparents(newctx.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