This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5988

copies: make _backwardrenames() filter out copies by destination
ClosedPublic

Authored by martinvonz on Feb 20 2019, 7:27 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG3158cb74fbca: copies: make _backwardrenames() filter out copies by destination
rHG3f94deee167c: copies: make _backwardrenames() filter out copies by destination
Summary

As shown by the test case, _backwardrenames() doesn't filter by the
matcher. It doesn't show up in hg status --copies because that only
prints files changed between the two commits. I wouldn't be surprised
if some other command that replies on pathcopies() was broken before
this patch, but I haven't bothered to check other commands.

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.

Revision Contents
Changeset List

Diff 14168

mercurial/copies.py

# short-circuit to avoid issues with merge states # short-circuit to avoid issues with merge states
return _dirstatecopies(b._repo, match) return _dirstatecopies(b._repo, match)
cm = _committedforwardcopies(a, b.p1(), match) cm = _committedforwardcopies(a, b.p1(), match)
# combine copies from dirstate if necessary # combine copies from dirstate if necessary
return _chain(a, b, cm, _dirstatecopies(b._repo, match)) return _chain(a, b, cm, _dirstatecopies(b._repo, match))
return _committedforwardcopies(a, b, match) return _committedforwardcopies(a, b, match)
def _backwardrenames(a, b): def _backwardrenames(a, b, match):
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
# can still exist (e.g. hg cp a b; hg mv a c). In those cases we # can still exist (e.g. hg cp a b; hg mv a c). In those cases we
# arbitrarily pick one of the renames. # arbitrarily pick one of the renames.
# We don't want to pass in "match" here, since that would filter
# the destination by it. Since we're reversing the copies, we want
# to filter the source instead.
f = _forwardcopies(b, a) f = _forwardcopies(b, a)
r = {} r = {}
for k, v in sorted(f.iteritems()): for k, v in sorted(f.iteritems()):
if match and not match(v):
continue
# remove copies # remove copies
if v in a: if v in a:
continue continue
r[v] = k r[v] = k
return r return r
def pathcopies(x, y, match=None): def pathcopies(x, y, match=None):
"""find {dst@y: src@x} copy mapping for directed compare""" """find {dst@y: src@x} copy mapping for directed compare"""
repo = x._repo repo = x._repo
debug = repo.ui.debugflag and repo.ui.configbool('devel', 'debug.copies') debug = repo.ui.debugflag and repo.ui.configbool('devel', 'debug.copies')
if debug: if debug:
repo.ui.debug('debug.copies: searching copies from %s to %s\n' repo.ui.debug('debug.copies: searching copies from %s to %s\n'
% (x, y)) % (x, y))
if x == y or not x or not y: if x == y or not x or not y:
return {} return {}
a = y.ancestor(x) a = y.ancestor(x)
if a == x: if a == x:
if debug: if debug:
repo.ui.debug('debug.copies: search mode: forward\n') repo.ui.debug('debug.copies: search mode: forward\n')
return _forwardcopies(x, y, match=match) return _forwardcopies(x, y, match=match)
if a == y: if a == y:
if debug: if debug:
repo.ui.debug('debug.copies: search mode: backward\n') repo.ui.debug('debug.copies: search mode: backward\n')
return _backwardrenames(x, y) return _backwardrenames(x, y, match=match)
if debug: if debug:
repo.ui.debug('debug.copies: search mode: combined\n') repo.ui.debug('debug.copies: search mode: combined\n')
return _chain(x, y, _backwardrenames(x, a), return _chain(x, y, _backwardrenames(x, a, match=match),
_forwardcopies(a, y, match=match)) _forwardcopies(a, y, match=match))
def _computenonoverlap(repo, c1, c2, addedinm1, addedinm2, baselabel=''): def _computenonoverlap(repo, c1, c2, addedinm1, addedinm2, baselabel=''):
"""Computes, based on addedinm1 and addedinm2, the files exclusive to c1 """Computes, based on addedinm1 and addedinm2, the files exclusive to c1
and c2. This is its own function so extensions can easily wrap this call and c2. This is its own function so extensions can easily wrap this call
to see what files mergecopies is about to process. to see what files mergecopies is about to process.
Even though c1 and c2 are not used in this function, they are useful in Even though c1 and c2 are not used in this function, they are useful in

tests/test-copies.t

$ hg debugpathcopies 1 0 $ hg debugpathcopies 1 0
y -> x y -> x
Test filtering copies by path. We do filtering by destination. Test filtering copies by path. We do filtering by destination.
$ hg debugpathcopies 0 1 x $ hg debugpathcopies 0 1 x
$ hg debugpathcopies 1 0 x $ hg debugpathcopies 1 0 x
y -> x y -> x
$ hg debugpathcopies 0 1 y $ hg debugpathcopies 0 1 y
x -> y x -> y
BROKEN: the following command should not include the copy
$ hg debugpathcopies 1 0 y $ hg debugpathcopies 1 0 y
y -> x
Copy a file onto another file Copy a file onto another file
$ newrepo $ newrepo
$ echo x > x $ echo x > x
$ echo y > y $ echo y > y
$ hg ci -Aqm 'add x and y' $ hg ci -Aqm 'add x and y'
$ hg cp -f x y $ hg cp -f x y
$ hg ci -m 'copy x onto y' $ hg ci -m 'copy x onto y'