This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6545

copies: create helper for getting all copies for changeset
ClosedPublic

Authored by martinvonz on Jun 19 2019, 2:31 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG88ba0ff94605: copies: create helper for getting all copies for changeset
Summary

There are a few places where we get all the copies for a changeset (at
least the {file_copies} template and in two places in `hg log
--copies` code). These places currently call scmutil.getrenamedfn() to
get a caching "getrenamed" function. They all use it in a similar
way. We will be able to reuse more code by having a function for
getting all the copies for a changeset. This patch introduces such a
function. It uses it in the {file_copies} template to show that it
works. It relies on the existing scmutil.getrenamedfn() for caching in
the filelog-centric case.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mmercurial/scmutil.py (22 lines)
Mmercurial/templatekw.py (12 lines)

Diff 15607

mercurial/scmutil.py

# filectx logic. # filectx logic.
try: try:
return repo[rev][fn].copysource() return repo[rev][fn].copysource()
except error.LookupError: except error.LookupError:
return None return None
return getrenamed return getrenamed
def getcopiesfn(repo, endrev=None):
if copiesmod.usechangesetcentricalgo(repo):
def copiesfn(ctx):
if ctx.p2copies():
allcopies = ctx.p1copies().copy()
# There should be no overlap
allcopies.update(ctx.p2copies())
return sorted(allcopies.items())
else:
return sorted(ctx.p1copies().items())
else:
getrenamed = getrenamedfn(repo, endrev)
def copiesfn(ctx):
copies = []
for fn in ctx.files():
rename = getrenamed(fn, ctx.rev())
if rename:
copies.append((fn, rename))
return copies
return copiesfn
def dirstatecopy(ui, repo, wctx, src, dst, dryrun=False, cwd=None): def dirstatecopy(ui, repo, wctx, src, dst, dryrun=False, cwd=None):
"""Update the dirstate to reflect the intent of copying src to dst. For """Update the dirstate to reflect the intent of copying src to dst. For
different reasons it might not end with dst being marked as copied from src. different reasons it might not end with dst being marked as copied from src.
""" """
origsrc = repo.dirstate.copied(src) or src origsrc = repo.dirstate.copied(src) or src
if dst == origsrc: # copying back a copy? if dst == origsrc: # copying back a copy?
if repo.dirstate[dst] not in 'mn' and not dryrun: if repo.dirstate[dst] not in 'mn' and not dryrun:
repo.dirstate.normallookup(dst) repo.dirstate.normallookup(dst)

mercurial/templatekw.py

"""List of strings. Files copied in this changeset with """List of strings. Files copied in this changeset with
their sources. their sources.
""" """
repo = context.resource(mapping, 'repo') repo = context.resource(mapping, 'repo')
ctx = context.resource(mapping, 'ctx') ctx = context.resource(mapping, 'ctx')
cache = context.resource(mapping, 'cache') cache = context.resource(mapping, 'cache')
copies = context.resource(mapping, 'revcache').get('copies') copies = context.resource(mapping, 'revcache').get('copies')
if copies is None: if copies is None:
if 'getrenamed' not in cache: if 'getcopies' not in cache:
cache['getrenamed'] = scmutil.getrenamedfn(repo) cache['getcopies'] = scmutil.getcopiesfn(repo)
copies = [] getcopies = cache['getcopies']
getrenamed = cache['getrenamed'] copies = getcopies(ctx)
for fn in ctx.files():
rename = getrenamed(fn, ctx.rev())
if rename:
copies.append((fn, rename))
return templateutil.compatfilecopiesdict(context, mapping, 'file_copy', return templateutil.compatfilecopiesdict(context, mapping, 'file_copy',
copies) copies)
# showfilecopiesswitch() displays file copies only if copy records are # showfilecopiesswitch() displays file copies only if copy records are
# provided before calling the templater, usually with a --copies # provided before calling the templater, usually with a --copies
# command line switch. # command line switch.
@templatekeyword('file_copies_switch', requires={'revcache'}) @templatekeyword('file_copies_switch', requires={'revcache'})
def showfilecopiesswitch(context, mapping): def showfilecopiesswitch(context, mapping):