D6587: copies: return only path from _tracefile() since that's all caller needs
martinvonz (Martin von Zweigbergk)
phabricator at mercurial-scm.org
Sun Jun 30 06:57:12 EDT 2019
Closed by commit rHG4ebbd7c4a3c5: copies: return only path from _tracefile() since that's all caller needs (authored by martinvonz).
This revision was automatically updated to reflect the committed changes.
This revision was not accepted when it landed; it landed in state "Needs Review".
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D6587?vs=15705&id=15722
CHANGES SINCE LAST ACTION
https://phab.mercurial-scm.org/D6587/new/
REVISION DETAIL
https://phab.mercurial-scm.org/D6587
AFFECTED FILES
mercurial/copies.py
CHANGE DETAILS
diff --git a/mercurial/copies.py b/mercurial/copies.py
--- a/mercurial/copies.py
+++ b/mercurial/copies.py
@@ -161,8 +161,9 @@
manifest am, stopping after the first ancestor lower than limit"""
for f in fctx.ancestors():
- if am.get(f.path(), None) == f.filenode():
- return f
+ path = f.path()
+ if am.get(path, None) == f.filenode():
+ return path
if not f.isintroducedafter(limit):
return None
@@ -237,11 +238,11 @@
if debug:
start = util.timer()
- ofctx = _tracefile(fctx, am, limit)
- if ofctx:
+ opath = _tracefile(fctx, am, limit)
+ if opath:
if debug:
- dbg('debug.copies: rename of: %s\n' % ofctx._path)
- cm[f] = ofctx.path()
+ dbg('debug.copies: rename of: %s\n' % opath)
+ cm[f] = opath
if debug:
dbg('debug.copies: time: %f seconds\n'
% (util.timer() - start))
To: martinvonz, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list