This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1695

copies: always respect matcher arg to _forwardcopies()
ClosedPublic

Authored by martinvonz on Dec 14 2017, 8:01 PM.

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHG7ddc1e96d9b0: copies: always respect matcher arg to _forwardcopies()
Summary

The function would ignore the matcher if the dirstate copies were
requested. It doesn't matter in practice because all callers used the
returned map only for looking up specific files from and those files
had already been filtered by the matcher (AFACT). Still, it's a little
confusing, so let's make it clearer by respecting the matcher in this
case too.

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.Dec 14 2017, 8:01 PM
yuja accepted this revision.Dec 15 2017, 8:38 AM
This revision is now accepted and ready to land.Dec 15 2017, 8:38 AM
Closed by commit rHG7ddc1e96d9b0: copies: always respect matcher arg to _forwardcopies() (authored by martinvonz). · Explain WhyDec 15 2017, 8:52 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/copies.py (8 lines)

Diff 4476

mercurial/copies.py

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(): if am.get(f.path(), None) == f.filenode():
return f return f
if limit >= 0 and f.linkrev() < limit and f.rev() < limit: if limit >= 0 and f.linkrev() < limit and f.rev() < limit:
return None return None
def _dirstatecopies(d): def _dirstatecopies(d, match=None):
ds = d._repo.dirstate ds = d._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': if ds[k] not in 'anm' or (match and not match(k)):
del c[k] del c[k]
return c return c
def _computeforwardmissing(a, b, match=None): def _computeforwardmissing(a, b, match=None):
"""Computes which files are in b but not a. """Computes which files are in b but not a.
This is its own function so extensions can easily wrap this call to see what This is its own function so extensions can easily wrap this call to see what
files _forwardcopies is about to process. files _forwardcopies is about to process.
""" """
ma = a.manifest() ma = a.manifest()
mb = b.manifest() mb = b.manifest()
return mb.filesnotin(ma, match=match) return mb.filesnotin(ma, match=match)
def _forwardcopies(a, b, match=None): def _forwardcopies(a, b, match=None):
'''find {dst@b: src@a} copy mapping where a is an ancestor of b''' '''find {dst@b: src@a} copy mapping where a is an ancestor of b'''
# check for working copy # check for working copy
w = None w = None
if b.rev() is None: if b.rev() is None:
w = b w = b
b = w.p1() b = w.p1()
if a == b: if a == b:
# short-circuit to avoid issues with merge states # short-circuit to avoid issues with merge states
return _dirstatecopies(w) return _dirstatecopies(w, match)
# files might have to be traced back to the fctx parent of the last # files might have to be traced back to the fctx parent of the last
# one-side-only changeset, but not further back than that # one-side-only changeset, but not further back than that
limit = _findlimit(a._repo, a.rev(), b.rev()) limit = _findlimit(a._repo, a.rev(), b.rev())
if limit is None: if limit is None:
limit = -1 limit = -1
am = a.manifest() am = a.manifest()
fctx = b[f] fctx = b[f]
fctx._ancestrycontext = ancestrycontext fctx._ancestrycontext = ancestrycontext
ofctx = _tracefile(fctx, am, limit) ofctx = _tracefile(fctx, am, limit)
if ofctx: if ofctx:
cm[f] = ofctx.path() cm[f] = ofctx.path()
# combine copies from dirstate if necessary # combine copies from dirstate if necessary
if w is not None: if w is not None:
cm = _chain(a, w, cm, _dirstatecopies(w)) cm = _chain(a, w, cm, _dirstatecopies(w, match))
return cm return cm
def _backwardrenames(a, b): def _backwardrenames(a, b):
if a._repo.ui.config('experimental', 'copytrace') == 'off': if a._repo.ui.config('experimental', 'copytrace') == 'off':
return {} return {}
# Even though we're not taking copies into account, 1:n rename situations # Even though we're not taking copies into account, 1:n rename situations