This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1697

copies: extract method for getting non-wdir forward copies
ClosedPublic

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

Details

Reviewers
yuja
Group Reviewers
hg-reviewers
Commits
rHG8801cdcea01f: copies: extract method for getting non-wdir forward copies
Summary

I may add an alternative way of getting copy metadata (from changelog,
not filelog) but the chaining with the dirstate copy metadata will be
the same, so it will probably help to have this extracted. Even if
that doesn't happen, the next patch will show that we can simplify
this a bit after this refactoring, so it seems worth it regardless.

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 rHG8801cdcea01f: copies: extract method for getting non-wdir forward copies (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 (29 lines)

Diff 4478

mercurial/copies.py

"""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 _committedforwardcopies(a, b, match):
"""find {dst@b: src@a} copy mapping where a is an ancestor of b""" """Like _forwardcopies(), but b.rev() cannot be None (working copy)"""
# check for working copy
w = None
if b.rev() is None:
w = b
b = w.p1()
if a == b:
# short-circuit to avoid issues with merge states
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()
# find where new files came from # find where new files came from
ancestrycontext = a._repo.changelog.ancestors([b.rev()], inclusive=True) ancestrycontext = a._repo.changelog.ancestors([b.rev()], inclusive=True)
for f in missing: for f in missing:
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()
return cm
def _forwardcopies(a, b, match=None):
"""find {dst@b: src@a} copy mapping where a is an ancestor of b"""
# check for working copy
w = None
if b.rev() is None:
w = b
b = w.p1()
if a == b:
# short-circuit to avoid issues with merge states
return _dirstatecopies(w, match)
cm = _committedforwardcopies(a, b, match)
# 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, match)) cm = _chain(a, w, cm, _dirstatecopies(w, match))
return cm return cm
def _backwardrenames(a, b): def _backwardrenames(a, b):