( )⚙ D6587 copies: return only path from _tracefile() since that's all caller needs

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6587

copies: return only path from _tracefile() since that's all caller needs
ClosedPublic

Authored by martinvonz on Jun 28 2019, 7:52 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG4ebbd7c4a3c5: copies: return only path from _tracefile() since that's all caller needs

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.Jun 28 2019, 7:52 PM
martinvonz added a commit: rHG4ebbd7c4a3c5: copies: return only path from _tracefile() since that's all caller needs.Jun 30 2019, 6:57 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG4ebbd7c4a3c5: copies: return only path from _tracefile() since that's all caller needs (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/copies.py (13 lines)

Diff 15722

mercurial/copies.py

t[k] = v t[k] = v
return t return t
def _tracefile(fctx, am, limit): def _tracefile(fctx, am, limit):
"""return file context that is the ancestor of fctx present in ancestor """return file context that is the ancestor of fctx present in ancestor
manifest am, stopping after the first ancestor lower than limit""" manifest am, stopping after the first ancestor lower than limit"""
for f in fctx.ancestors(): for f in fctx.ancestors():
if am.get(f.path(), None) == f.filenode(): path = f.path()
return f if am.get(path, None) == f.filenode():
return path
if not f.isintroducedafter(limit): if not f.isintroducedafter(limit):
return None return None
def _dirstatecopies(repo, match=None): def _dirstatecopies(repo, match=None):
ds = repo.dirstate ds = repo.dirstate
c = ds.copies().copy() c = ds.copies().copy()
for k in list(c): for k in list(c):
if ds[k] not in 'anm' or (match and not match(k)): if ds[k] not in 'anm' or (match and not match(k)):
for f in sorted(missing): for f in sorted(missing):
if debug: if debug:
dbg('debug.copies: tracing file: %s\n' % f) dbg('debug.copies: tracing file: %s\n' % f)
fctx = b[f] fctx = b[f]
fctx._ancestrycontext = ancestrycontext fctx._ancestrycontext = ancestrycontext
if debug: if debug:
start = util.timer() start = util.timer()
ofctx = _tracefile(fctx, am, limit) opath = _tracefile(fctx, am, limit)
if ofctx: if opath:
if debug: if debug:
dbg('debug.copies: rename of: %s\n' % ofctx._path) dbg('debug.copies: rename of: %s\n' % opath)
cm[f] = ofctx.path() cm[f] = opath
if debug: if debug:
dbg('debug.copies: time: %f seconds\n' dbg('debug.copies: time: %f seconds\n'
% (util.timer() - start)) % (util.timer() - start))
return cm return cm
def _changesetforwardcopies(a, b, match): def _changesetforwardcopies(a, b, match):
if a.rev() == node.nullrev: if a.rev() == node.nullrev:
return {} return {}