This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5576

remotefilelog: fix {file_copies} template keyword
ClosedPublic

Authored by martinvonz on Jan 11 2019, 8:02 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG2338eab5f8b7: remotefilelog: fix {file_copies} template keyword
Summary

remotefilelog overrides templatekw.getrenamedfn(). I changed the
return type of that function in ec37df9042f9 (templatekw: make
getrenamed() return only filename, not nodeid, 2018-03-26). So we need
to change remotefilelog too. The function is used by the {file_copies}
template keyword and by hg log --copies.

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.Jan 11 2019, 8:02 PM
Closed by commit rHG2338eab5f8b7: remotefilelog: fix {file_copies} template keyword (authored by martinvonz). · Explain WhyJan 11 2019, 9:30 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 13185

hgext/remotefilelog/__init__.py

if rev in rcache.setdefault(fn, {}): if rev in rcache.setdefault(fn, {}):
return rcache[fn][rev] return rcache[fn][rev]
try: try:
fctx = repo[rev].filectx(fn) fctx = repo[rev].filectx(fn)
for ancestor in fctx.ancestors(): for ancestor in fctx.ancestors():
if ancestor.path() == fn: if ancestor.path() == fn:
renamed = ancestor.renamed() renamed = ancestor.renamed()
rcache[fn][ancestor.rev()] = renamed rcache[fn][ancestor.rev()] = renamed and renamed[0]
return fctx.renamed() renamed = fctx.renamed()
return renamed and renamed[0]
except error.LookupError: except error.LookupError:
return None return None
return getrenamed return getrenamed
def walkfilerevs(orig, repo, match, follow, revs, fncache): def walkfilerevs(orig, repo, match, follow, revs, fncache):
if not isenabled(repo): if not isenabled(repo):
return orig(repo, match, follow, revs, fncache) return orig(repo, match, follow, revs, fncache)

tests/test-remotefilelog-log.t

$ cd .. $ cd ..
$ hg log -fr tip dir/ --template '{rev}\n' $ hg log -fr tip dir/ --template '{rev}\n'
1 1
Trace renames Trace renames
$ hg mv x z $ hg mv x z
$ hg commit -m move $ hg commit -m move
$ hg log -f z -T '{desc} {file_copies}\n' -G $ hg log -f z -T '{desc} {file_copies}\n' -G
@ move z (x\x14\x06\xe7A\x18bv\x94&\x84\x17I\x1f\x01\x8aJ\x881R\xf0) (esc) @ move z (x)
: :
o x o x
Verify remotefilelog handles rename metadata stripping when comparing file sizes Verify remotefilelog handles rename metadata stripping when comparing file sizes
$ hg debugrebuilddirstate $ hg debugrebuilddirstate
$ hg status $ hg status