This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8595

copies: make _chain() and _filter() public
Changes PlannedPublic

Authored by martinvonz on May 29 2020, 11:57 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Summary

The next patch will add a call to chain(). I made _filter() public
just for consistency.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

martinvonz created this revision.May 29 2020, 11:57 AM
indygreg accepted this revision.May 30 2020, 12:20 PM
This revision is now accepted and ready to land.May 30 2020, 12:20 PM
marmoute added a subscriber: marmoute.Jun 9 2020, 6:47 AM

This patch seems related to D8596 which @martinvonz pointed as "not meant to be merged". What should we do with this diff ? is it intended for landing ? If not could get we it out of need-review and marke it RFC ?

martinvonz added a comment.Jun 9 2020, 10:11 AM
In D8595#128708, @marmoute wrote:

This patch seems related to D8596 which @martinvonz pointed as "not meant to be merged". What should we do with this diff ? is it intended for landing ? If not could get we it out of need-review and marke it RFC ?

That was on an earlier version of the series; this series is now ready.

martinvonz updated this revision to Diff 21604.Jun 10 2020, 1:54 PM
martinvonz planned changes to this revision.Jul 16 2020, 11:23 AM

Changes planned to earlier patch in the series

Revision Contents
Changeset List

PathPackages
Mmercurial/copies.py (18 lines)

Diff 21604

mercurial/copies.py

pycompat, pycompat,
util, util,
) )
from .utils import stringutil from .utils import stringutil
def _filter(src, dst, t): def filter(src, dst, t):
"""filters out invalid copies after chaining""" """filters out invalid copies after chaining"""
# When _chain()'ing copies in 'a' (from 'src' via some other commit 'mid') # When chain()'ing copies in 'a' (from 'src' via some other commit 'mid')
# with copies in 'b' (from 'mid' to 'dst'), we can get the different cases # with copies in 'b' (from 'mid' to 'dst'), we can get the different cases
# in the following table (not including trivial cases). For example, case 2 # in the following table (not including trivial cases). For example, case 2
# is where a file existed in 'src' and remained under that name in 'mid' and # is where a file existed in 'src' and remained under that name in 'mid' and
# then was renamed between 'mid' and 'dst'. # then was renamed between 'mid' and 'dst'.
# #
# case src mid dst result # case src mid dst result
# 1 x y - - # 1 x y - -
# 2 x y y x->y # 2 x y y x->y
# 3 x y x - # 3 x y x -
# 4 x y z x->z # 4 x y z x->z
# 5 - x y - # 5 - x y -
# 6 x x y x->y # 6 x x y x->y
# #
# _chain() takes care of chaining the copies in 'a' and 'b', but it # chain() takes care of chaining the copies in 'a' and 'b', but it
# cannot tell the difference between cases 1 and 2, between 3 and 4, or # cannot tell the difference between cases 1 and 2, between 3 and 4, or
# between 5 and 6, so it includes all cases in its result. # between 5 and 6, so it includes all cases in its result.
# Cases 1, 3, and 5 are then removed by _filter(). # Cases 1, 3, and 5 are then removed by filter().
for k, v in list(t.items()): for k, v in list(t.items()):
# remove copies from files that didn't exist # remove copies from files that didn't exist
if v not in src: if v not in src:
del t[k] del t[k]
# remove criss-crossed copies # remove criss-crossed copies
elif k in src and v in dst: elif k in src and v in dst:
del t[k] del t[k]
# remove copies to files that were then removed # remove copies to files that were then removed
elif k not in dst: elif k not in dst:
del t[k] del t[k]
def _chain(prefix, suffix): def chain(prefix, suffix):
"""chain two sets of copies 'prefix' and 'suffix'""" """chain two sets of copies 'prefix' and 'suffix'"""
result = prefix.copy() result = prefix.copy()
for key, value in pycompat.iteritems(suffix): for key, value in pycompat.iteritems(suffix):
result[key] = prefix.get(value, value) result[key] = prefix.get(value, value)
return result return result
def _tracefile(fctx, am, basemf): def _tracefile(fctx, am, basemf):
if base is None: if base is None:
base = a base = a
match = a.repo().narrowmatch(match) match = a.repo().narrowmatch(match)
# check for working copy # check for working copy
if b.rev() is None: if b.rev() is None:
cm = _committedforwardcopies(a, b.p1(), base, match) cm = _committedforwardcopies(a, b.p1(), base, match)
# combine copies from dirstate if necessary # combine copies from dirstate if necessary
copies = _chain(cm, _dirstatecopies(b._repo, match)) copies = chain(cm, _dirstatecopies(b._repo, match))
else: else:
copies = _committedforwardcopies(a, b, base, match) copies = _committedforwardcopies(a, b, base, match)
return copies return copies
def _backwardrenames(a, b, match): def _backwardrenames(a, b, match):
if a._repo.ui.config(b'experimental', b'copytrace') == b'off': if a._repo.ui.config(b'experimental', b'copytrace') == b'off':
return {} return {}
repo.ui.debug(b'debug.copies: search mode: backward\n') repo.ui.debug(b'debug.copies: search mode: backward\n')
copies = _backwardrenames(x, y, match=match) copies = _backwardrenames(x, y, match=match)
else: else:
if debug: if debug:
repo.ui.debug(b'debug.copies: search mode: combined\n') repo.ui.debug(b'debug.copies: search mode: combined\n')
base = None base = None
if a.rev() != node.nullrev: if a.rev() != node.nullrev:
base = x base = x
copies = _chain( copies = chain(
_backwardrenames(x, a, match=match), _backwardrenames(x, a, match=match),
_forwardcopies(a, y, base, match=match), _forwardcopies(a, y, base, match=match),
) )
_filter(x, y, copies) filter(x, y, copies)
return copies return copies
def mergecopies(repo, c1, c2, base): def mergecopies(repo, c1, c2, base):
""" """
Finds moves and copies between context c1 and c2 that are relevant for Finds moves and copies between context c1 and c2 that are relevant for
merging. 'base' will be used as the merge base. merging. 'base' will be used as the merge base.
merge.update() will have already marked most copies, but it will only merge.update() will have already marked most copies, but it will only
mark copies if it thinks the source files are related (see mark copies if it thinks the source files are related (see
merge._related()). It will also not mark copies if the file wasn't modified merge._related()). It will also not mark copies if the file wasn't modified
on the local side. This function adds the copies that were "missed" on the local side. This function adds the copies that were "missed"
by merge.update(). by merge.update().
""" """
new_copies = pathcopies(base, ctx) new_copies = pathcopies(base, ctx)
_filter(wctx.p1(), wctx, new_copies) filter(wctx.p1(), wctx, new_copies)
for dst, src in pycompat.iteritems(new_copies): for dst, src in pycompat.iteritems(new_copies):
wctx[dst].markcopied(src) wctx[dst].markcopied(src)