This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3666

templatekw: make getrenamed() return only filename, not nodeid
ClosedPublic

Authored by martinvonz on May 27 2018, 3:25 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGec37df9042f9: templatekw: make getrenamed() return only filename, not nodeid
Summary

No callers cared about the nodeid and I want to make getrenamed() not
look up the node (although it's currently free, I hope to store copy
info in changesets and not include the nodeid).

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.

Event Timeline

martinvonz created this revision.May 27 2018, 3:25 AM
Closed by commit rHGec37df9042f9: templatekw: make getrenamed() return only filename, not nodeid (authored by martinvonz). · Explain WhyMay 28 2018, 8:57 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/logcmdutil.py (4 lines)
Mmercurial/templatekw.py (7 lines)

Diff 8912

mercurial/logcmdutil.py

for rev, type, ctx, parents in dag: for rev, type, ctx, parents in dag:
char = formatnode(repo, ctx) char = formatnode(repo, ctx)
copies = None copies = None
if getrenamed and ctx.rev(): if getrenamed and ctx.rev():
copies = [] copies = []
for fn in ctx.files(): for fn in ctx.files():
rename = getrenamed(fn, ctx.rev()) rename = getrenamed(fn, ctx.rev())
if rename: if rename:
copies.append((fn, rename[0])) copies.append((fn, rename))
edges = edgefn(type, char, state, rev, parents) edges = edgefn(type, char, state, rev, parents)
firstedge = next(edges) firstedge = next(edges)
width = firstedge[2] width = firstedge[2]
displayer.show(ctx, copies=copies, displayer.show(ctx, copies=copies,
graphwidth=width, **pycompat.strkwargs(props)) graphwidth=width, **pycompat.strkwargs(props))
lines = displayer.hunk.pop(rev).split('\n') lines = displayer.hunk.pop(rev).split('\n')
if not lines[-1]: if not lines[-1]:
del lines[-1] del lines[-1]
for rev in revs: for rev in revs:
ctx = repo[rev] ctx = repo[rev]
copies = None copies = None
if getrenamed is not None and rev: if getrenamed is not None and rev:
copies = [] copies = []
for fn in ctx.files(): for fn in ctx.files():
rename = getrenamed(fn, rev) rename = getrenamed(fn, rev)
if rename: if rename:
copies.append((fn, rename[0])) copies.append((fn, rename))
displayer.show(ctx, copies=copies) displayer.show(ctx, copies=copies)
displayer.flush(ctx) displayer.flush(ctx)
displayer.close() displayer.close()
def checkunsupportedgraphflags(pats, opts): def checkunsupportedgraphflags(pats, opts):
for op in ["newest_first"]: for op in ["newest_first"]:
if op in opts and opts[op]: if op in opts and opts[op]:
raise error.Abort(_("-G/--graph option is incompatible with --%s") raise error.Abort(_("-G/--graph option is incompatible with --%s")
% op.replace("_", "-")) % op.replace("_", "-"))
def graphrevs(repo, nodes, opts): def graphrevs(repo, nodes, opts):
limit = getlimit(opts) limit = getlimit(opts)
nodes.reverse() nodes.reverse()
if limit is not None: if limit is not None:
nodes = nodes[:limit] nodes = nodes[:limit]
return graphmod.nodes(repo, nodes) return graphmod.nodes(repo, nodes)

mercurial/templatekw.py

parses the manifest if linkrev != changerev. parses the manifest if linkrev != changerev.
Returns rename info for fn at changerev rev.''' Returns rename info for fn at changerev rev.'''
if fn not in rcache: if fn not in rcache:
rcache[fn] = {} rcache[fn] = {}
fl = repo.file(fn) fl = repo.file(fn)
for i in fl: for i in fl:
lr = fl.linkrev(i) lr = fl.linkrev(i)
renamed = fl.renamed(fl.node(i)) renamed = fl.renamed(fl.node(i))
rcache[fn][lr] = renamed rcache[fn][lr] = renamed and renamed[0]
if lr >= endrev: if lr >= endrev:
break break
if rev in rcache[fn]: if rev in rcache[fn]:
return rcache[fn][rev] return rcache[fn][rev]
# If linkrev != rev (i.e. rev not found in rcache) fallback to # If linkrev != rev (i.e. rev not found in rcache) fallback to
# filectx logic. # filectx logic.
try: try:
return repo[rev][fn].renamed() renamed = repo[rev][fn].renamed()
return renamed and renamed[0]
except error.LookupError: except error.LookupError:
return None return None
return getrenamed return getrenamed
def getlogcolumns(): def getlogcolumns():
"""Return a dict of log column labels""" """Return a dict of log column labels"""
_ = pycompat.identity # temporarily disable gettext _ = pycompat.identity # temporarily disable gettext
if copies is None: if copies is None:
if 'getrenamed' not in cache: if 'getrenamed' not in cache:
cache['getrenamed'] = getrenamedfn(repo) cache['getrenamed'] = getrenamedfn(repo)
copies = [] copies = []
getrenamed = cache['getrenamed'] getrenamed = cache['getrenamed']
for fn in ctx.files(): for fn in ctx.files():
rename = getrenamed(fn, ctx.rev()) rename = getrenamed(fn, ctx.rev())
if rename: if rename:
copies.append((fn, rename[0])) copies.append((fn, rename))
copies = util.sortdict(copies) copies = util.sortdict(copies)
return compatdict(context, mapping, 'file_copy', copies, return compatdict(context, mapping, 'file_copy', copies,
key='name', value='source', fmt='%s (%s)', key='name', value='source', fmt='%s (%s)',
plural='file_copies') plural='file_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