D3666: templatekw: make getrenamed() return only filename, not nodeid
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Sun May 27 07:25:33 UTC 2018
martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION 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).
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D3666
AFFECTED FILES
mercurial/logcmdutil.py
mercurial/templatekw.py
CHANGE DETAILS
diff --git a/mercurial/templatekw.py b/mercurial/templatekw.py
--- a/mercurial/templatekw.py
+++ b/mercurial/templatekw.py
@@ -111,16 +111,17 @@
for i in fl:
lr = fl.linkrev(i)
renamed = fl.renamed(fl.node(i))
- rcache[fn][lr] = renamed
+ rcache[fn][lr] = renamed and renamed[0]
if lr >= endrev:
break
if rev in rcache[fn]:
return rcache[fn][rev]
# If linkrev != rev (i.e. rev not found in rcache) fallback to
# filectx logic.
try:
- return repo[rev][fn].renamed()
+ renamed = repo[rev][fn].renamed()
+ return renamed and renamed[0]
except error.LookupError:
return None
@@ -318,7 +319,7 @@
for fn in ctx.files():
rename = getrenamed(fn, ctx.rev())
if rename:
- copies.append((fn, rename[0]))
+ copies.append((fn, rename))
copies = util.sortdict(copies)
return compatdict(context, mapping, 'file_copy', copies,
diff --git a/mercurial/logcmdutil.py b/mercurial/logcmdutil.py
--- a/mercurial/logcmdutil.py
+++ b/mercurial/logcmdutil.py
@@ -865,7 +865,7 @@
for fn in ctx.files():
rename = getrenamed(fn, ctx.rev())
if rename:
- copies.append((fn, rename[0]))
+ copies.append((fn, rename))
edges = edgefn(type, char, state, rev, parents)
firstedge = next(edges)
width = firstedge[2]
@@ -893,7 +893,7 @@
for fn in ctx.files():
rename = getrenamed(fn, rev)
if rename:
- copies.append((fn, rename[0]))
+ copies.append((fn, rename))
displayer.show(ctx, copies=copies)
displayer.flush(ctx)
displayer.close()
To: martinvonz, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list