This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8071

copies: avoid filtering by short-circuit dirstate-only copies earlier
ClosedPublic

Authored by martinvonz on Feb 4 2020, 1:19 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG30862e226339: copies: avoid filtering by short-circuit dirstate-only copies earlier
Summary

The call to y.ancestor(x) triggered repo filtering, which we'd like
to avoid in the simple hg status --copies case.

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.Feb 4 2020, 1:19 PM
martinvonz added a commit: rHG30862e226339: copies: avoid filtering by short-circuit dirstate-only copies earlier.Feb 6 2020, 5:21 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG30862e226339: copies: avoid filtering by short-circuit dirstate-only copies earlier (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 19976

mercurial/copies.py

repo = x._repo repo = x._repo
debug = repo.ui.debugflag and repo.ui.configbool(b'devel', b'debug.copies') debug = repo.ui.debugflag and repo.ui.configbool(b'devel', b'debug.copies')
if debug: if debug:
repo.ui.debug( repo.ui.debug(
b'debug.copies: searching copies from %s to %s\n' % (x, y) b'debug.copies: searching copies from %s to %s\n' % (x, y)
) )
if x == y or not x or not y: if x == y or not x or not y:
return {} return {}
if y.rev() is None and x == y.p1():
if debug:
repo.ui.debug(b'debug.copies: search mode: dirstate\n')
# short-circuit to avoid issues with merge states
return _dirstatecopies(repo, match)
a = y.ancestor(x) a = y.ancestor(x)
if a == x: if a == x:
if debug: if debug:
repo.ui.debug(b'debug.copies: search mode: forward\n') repo.ui.debug(b'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)
copies = _forwardcopies(x, y, match=match) copies = _forwardcopies(x, y, match=match)
elif a == y: elif a == y:
if debug: if debug:
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')

tests/test-repo-filters-tiptoe.t

$ hg status $ hg status
M c M c
A d A d
R a R a
! b ! b
$ hg status --copies $ hg status --copies
debug.filters: computing revision filter for "visible"
M c M c
A d A d
R a R a
! b ! b
Getting data about the working copy parent Getting data about the working copy parent
$ hg log -r '.' -T "{node}\n{date}\n" $ hg log -r '.' -T "{node}\n{date}\n"