Mercurial > hg-stable

changeset 42554:4ebbd7c4a3c5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
copies: return only path from _tracefile() since that's all caller needs Differential Revision: https://phab.mercurial-scm.org/D6587
author Martin von Zweigbergk <martinvonz@google.com>
date Fri, 28 Jun 2019 16:40:36 -0700
parents 6a3872e34503
children fa2071753dc2
files mercurial/copies.py
diffstat 1 files changed, 7 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/copies.py	Sun Jun 30 13:04:26 2019 +0530
+++ b/mercurial/copies.py	Fri Jun 28 16:40:36 2019 -0700
@@ -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))