This is an archive of the discontinued Mercurial Phabricator instance.

Differential D6118

copies: remove dependency on scmutil by directly using match.exact()
ClosedPublic

Authored by martinvonz on Mar 11 2019, 2:19 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHGa791623458ef: copies: remove dependency on scmutil by directly using match.exact()
Summary

I want to add a dependency from scmutil.copies(), so I need to remove
this dependency first.

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

PathPackages
Mmercurial/copies.py (3 lines)

Diff 14471

mercurial/copies.py

import os import os
from .i18n import _ from .i18n import _
from . import ( from . import (
match as matchmod, match as matchmod,
node, node,
pathutil, pathutil,
scmutil,
util, util,
) )
from .utils import ( from .utils import (
stringutil, stringutil,
) )
def _findlimit(repo, ctxa, ctxb): def _findlimit(repo, ctxa, ctxb):
""" """
# Computing the forward missing is quite expensive on large manifests, since # Computing the forward missing is quite expensive on large manifests, since
# it compares the entire manifests. We can optimize it in the common use # it compares the entire manifests. We can optimize it in the common use
# case of computing what copies are in a commit versus its parent (like # case of computing what copies are in a commit versus its parent (like
# during a rebase or histedit). Note, we exclude merge commits from this # during a rebase or histedit). Note, we exclude merge commits from this
# optimization, since the ctx.files() for a merge commit is not correct for # optimization, since the ctx.files() for a merge commit is not correct for
# this comparison. # this comparison.
forwardmissingmatch = match forwardmissingmatch = match
if b.p1() == a and b.p2().node() == node.nullid: if b.p1() == a and b.p2().node() == node.nullid:
filesmatcher = scmutil.matchfiles(a._repo, b.files()) filesmatcher = matchmod.exact(b.files())
forwardmissingmatch = matchmod.intersectmatchers(match, filesmatcher) forwardmissingmatch = matchmod.intersectmatchers(match, filesmatcher)
missing = _computeforwardmissing(a, b, match=forwardmissingmatch) missing = _computeforwardmissing(a, b, match=forwardmissingmatch)
ancestrycontext = a._repo.changelog.ancestors([b.rev()], inclusive=True) ancestrycontext = a._repo.changelog.ancestors([b.rev()], inclusive=True)
if debug: if debug:
dbg('debug.copies: missing file to search: %d\n' % len(missing)) dbg('debug.copies: missing file to search: %d\n' % len(missing))