This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6600

copies: move short-circuiting of dirstate copies out of _forwardcopies()
ClosedPublic

Authored by martinvonz on Jul 2 2019, 1:13 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGbcb4b5c5964b: copies: move short-circuiting of dirstate copies out of _forwardcopies()
Summary

I'd like to move the filtering of copies we do after chaining to the
end of all chaining (in a single place in pathcopies()). One problem
that came up when trying that was that we allow things like `hg cp -f
<file> <existing file>` so the user can later amend that in. Filtering
at the end would mean that we remove those copies. That would break
hg st -C. This patch therefore moves the short-circuiting of
dirstate copies into pathcopies() so we can more easily handle the
dirstate-only case differently.

I initially thought this might change some behavior when the user does
hg status --rev 'wdir()' --rev . during an uncommitted merge, since
_backwardrenames() would reverse the copies in that case. However, I
couldn't come up with a test case where it made a difference.

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.Jul 2 2019, 1:13 PM
martinvonz added a commit: rHGbcb4b5c5964b: copies: move short-circuiting of dirstate copies out of _forwardcopies().Jul 10 2019, 3:39 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGbcb4b5c5964b: copies: move short-circuiting of dirstate copies out of _forwardcopies() (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/copies.py (7 lines)

Diff 15872

mercurial/copies.py

assert False assert False
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"""
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:
if a == b.p1():
# short-circuit to avoid issues with merge states
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 _chainandfilter(a, b, cm, _dirstatecopies(b._repo, match)) return _chainandfilter(a, b, cm, _dirstatecopies(b._repo, match))
return _committedforwardcopies(a, b, match) return _committedforwardcopies(a, b, match)
def _backwardrenames(a, b, match): def _backwardrenames(a, b, match):
if a._repo.ui.config('experimental', 'copytrace') == 'off': if a._repo.ui.config('experimental', 'copytrace') == 'off':
return {} return {}
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')
if y.rev() is None and x == y.p1():
# short-circuit to avoid issues with merge states
return _dirstatecopies(repo, match)
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, match=match) 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 _chainandfilter(x, y, _backwardrenames(x, a, match=match), return _chainandfilter(x, y, _backwardrenames(x, a, match=match),