This is an archive of the discontinued Mercurial Phabricator instance.

getrenamedfn: get copy data from context object if configured
ClosedPublic

Authored by martinvonz on Mar 20 2019, 3:03 PM.

Reviewers

None

Group Reviewers

hg-reviewers

Commits

Summary

The function returned from getrenamedfn() calls
filelog.renamed(). That won't work when storing copy metadata in the
changeset.

I've just switched to a simple implementation here. We may or may not
need to optimize it later, possibly by optimizing the callers.

No more tests fail with "--extra-config-opt
experimental.copies.read-from=compatibility)" than they did before
this patch.

Repository

rHG Mercurial

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

This revision was automatically updated to reflect the committed changes.

			Path	Packages
M			mercurial/scmutil.py (12 lines)

Status	Author	Revision
Abandoned	martinvonz	D6185 changelog: pass default extras into decodeextra()
Closed	martinvonz	D6184 changelog: extract a _string_unescape() to mirror _string_escape()
Closed	martinvonz	D6186 changelog: parse copy metadata if available in extras
Closed	martinvonz	D6183 copies: add config option for writing copy metadata to file and/or changset
Closed	martinvonz	D6181 localrepo: rename crev in _filecommit() to cnode, since it's a node
Closed	martinvonz	D6163 copies: extract function for deciding whether to use changeset-centric algos
Closed	martinvonz	D6162 getrenamedfn: get copy data from context object if configured

	wctx = repo[None]			wctx = repo[None]
	with repo.wlock():			with repo.wlock():
	wctx.forget(deleted)			wctx.forget(deleted)
	wctx.add(unknown)			wctx.add(unknown)
	for new, old in renames.iteritems():			for new, old in renames.iteritems():
	wctx.copy(old, new)			wctx.copy(old, new)

	def getrenamedfn(repo, endrev=None):			def getrenamedfn(repo, endrev=None):
				if repo.ui.config('experimental', 'copies.read-from') == 'compatibility':
				def getrenamed(fn, rev):
				ctx = repo[rev]
				p1copies = ctx.p1copies()
				if fn in p1copies:
				return p1copies[fn]
				p2copies = ctx.p2copies()
				if fn in p2copies:
				return p2copies[fn]
				return None
				return getrenamed

	rcache = {}			rcache = {}
	if endrev is None:			if endrev is None:
	endrev = len(repo)			endrev = len(repo)

	def getrenamed(fn, rev):			def getrenamed(fn, rev):
	'''looks up all renames for a file (up to endrev) the first			'''looks up all renames for a file (up to endrev) the first
	time the file is given. It indexes on the changerev and only			time the file is given. It indexes on the changerev and only
	parses the manifest if linkrev != changerev.			parses the manifest if linkrev != changerev.