##// END OF EJS Templates
copies: return only path from _tracefile() since that's all caller needs...
Martin von Zweigbergk -
r42751:4ebbd7c4 default
parent child Browse files
Show More
@@ -161,8 +161,9 b' def _tracefile(fctx, am, limit):'
161 manifest am, stopping after the first ancestor lower than limit"""
161 manifest am, stopping after the first ancestor lower than limit"""
162
162
163 for f in fctx.ancestors():
163 for f in fctx.ancestors():
164 if am.get(f.path(), None) == f.filenode():
164 path = f.path()
165 return f
165 if am.get(path, None) == f.filenode():
166 return path
166 if not f.isintroducedafter(limit):
167 if not f.isintroducedafter(limit):
167 return None
168 return None
168
169
@@ -237,11 +238,11 b' def _committedforwardcopies(a, b, match)'
237
238
238 if debug:
239 if debug:
239 start = util.timer()
240 start = util.timer()
240 ofctx = _tracefile(fctx, am, limit)
241 opath = _tracefile(fctx, am, limit)
241 if ofctx:
242 if opath:
242 if debug:
243 if debug:
243 dbg('debug.copies: rename of: %s\n' % ofctx._path)
244 dbg('debug.copies: rename of: %s\n' % opath)
244 cm[f] = ofctx.path()
245 cm[f] = opath
245 if debug:
246 if debug:
246 dbg('debug.copies: time: %f seconds\n'
247 dbg('debug.copies: time: %f seconds\n'
247 % (util.timer() - start))
248 % (util.timer() - start))
General Comments 0
You need to be logged in to leave comments. Login now