This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4825

narrow: move copies overrides to core
ClosedPublic

Authored by martinvonz on Oct 1 2018, 1:01 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG707c3804e607: narrow: move copies overrides to core
Summary

The copies overrides seems to have been a little complicated just by
not being in core. When moved to core, it becomes trivial (at least I
think these overrides have the same effect).

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.Oct 1 2018, 1:01 PM
martinvonz updated this revision to Diff 11563.Oct 2 2018, 11:16 AM
Closed by commit rHG707c3804e607: narrow: move copies overrides to core (authored by martinvonz). · Explain WhyOct 2 2018, 1:17 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 11571

hgext/narrow/__init__.py

localrepo, localrepo,
registrar, registrar,
repository, repository,
) )
from . import ( from . import (
narrowbundle2, narrowbundle2,
narrowcommands, narrowcommands,
narrowcopies,
narrowrepo, narrowrepo,
narrowtemplates, narrowtemplates,
narrowwirepeer, narrowwirepeer,
) )
configtable = {} configtable = {}
configitem = registrar.configitem(configtable) configitem = registrar.configitem(configtable)
# Narrowhg *has* support for serving ellipsis nodes (which are used at # Narrowhg *has* support for serving ellipsis nodes (which are used at
def reposetup(ui, repo): def reposetup(ui, repo):
"""Wraps local repositories with narrow repo support.""" """Wraps local repositories with narrow repo support."""
if not repo.local(): if not repo.local():
return return
if repository.NARROW_REQUIREMENT in repo.requirements: if repository.NARROW_REQUIREMENT in repo.requirements:
narrowrepo.wraprepo(repo) narrowrepo.wraprepo(repo)
narrowcopies.setup(repo)
narrowwirepeer.reposetup(repo) narrowwirepeer.reposetup(repo)
templatekeyword = narrowtemplates.templatekeyword templatekeyword = narrowtemplates.templatekeyword
revsetpredicate = narrowtemplates.revsetpredicate revsetpredicate = narrowtemplates.revsetpredicate

hgext/narrow/narrowcopies.py

  • This file was deleted.
# narrowcopies.py - extensions to mercurial copies module to support narrow
# clones
#
# Copyright 2017 Google, Inc.
#
# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.
from __future__ import absolute_import
from mercurial import (
copies,
extensions,
)
def setup(repo):
def _computeforwardmissing(orig, a, b, match=None):
missing = orig(a, b, match)
narrowmatch = repo.narrowmatch()
if narrowmatch.always():
return missing
missing = [f for f in missing if narrowmatch(f)]
return missing
def _checkcopies(orig, srcctx, dstctx, f, base, tca, remotebase, limit,
data):
narrowmatch = repo.narrowmatch()
if not narrowmatch(f):
return
orig(srcctx, dstctx, f, base, tca, remotebase, limit, data)
extensions.wrapfunction(copies, '_computeforwardmissing',
_computeforwardmissing)
extensions.wrapfunction(copies, '_checkcopies', _checkcopies)

mercurial/copies.py

header = " unmatched files in %s" header = " unmatched files in %s"
if baselabel: if baselabel:
header += ' (from %s)' % baselabel header += ' (from %s)' % baselabel
if u1: if u1:
repo.ui.debug("%s:\n %s\n" % (header % 'local', "\n ".join(u1))) repo.ui.debug("%s:\n %s\n" % (header % 'local', "\n ".join(u1)))
if u2: if u2:
repo.ui.debug("%s:\n %s\n" % (header % 'other', "\n ".join(u2))) repo.ui.debug("%s:\n %s\n" % (header % 'other', "\n ".join(u2)))
narrowmatch = repo.narrowmatch()
if not narrowmatch.always():
u1 = [f for f in u1 if narrowmatch(f)]
u2 = [f for f in u2 if narrowmatch(f)]
return u1, u2 return u1, u2
def _makegetfctx(ctx): def _makegetfctx(ctx):
"""return a 'getfctx' function suitable for _checkcopies usage """return a 'getfctx' function suitable for _checkcopies usage
We have to re-setup the function building 'filectx' for each We have to re-setup the function building 'filectx' for each
'_checkcopies' to ensure the linkrev adjustment is properly setup for '_checkcopies' to ensure the linkrev adjustment is properly setup for
each. Linkrev adjustment is important to avoid bug in rename each. Linkrev adjustment is important to avoid bug in rename
data2 = {'copy': {}, data2 = {'copy': {},
'fullcopy': {}, 'fullcopy': {},
'incomplete': {}, 'incomplete': {},
'diverge': diverge, 'diverge': diverge,
'incompletediverge': incompletediverge, 'incompletediverge': incompletediverge,
} }
# find interesting file sets from manifests # find interesting file sets from manifests
addedinm1 = m1.filesnotin(mb) addedinm1 = m1.filesnotin(mb, repo.narrowmatch())
addedinm2 = m2.filesnotin(mb) addedinm2 = m2.filesnotin(mb, repo.narrowmatch())
bothnew = sorted(addedinm1 & addedinm2) bothnew = sorted(addedinm1 & addedinm2)
if tca == base: if tca == base:
# unmatched file from base # unmatched file from base
u1r, u2r = _computenonoverlap(repo, c1, c2, addedinm1, addedinm2) u1r, u2r = _computenonoverlap(repo, c1, c2, addedinm1, addedinm2)
u1u, u2u = u1r, u2r u1u, u2u = u1r, u2r
else: else:
# unmatched file from base (DAG rotation in the graft case) # unmatched file from base (DAG rotation in the graft case)
u1r, u2r = _computenonoverlap(repo, c1, c2, addedinm1, addedinm2, u1r, u2r = _computenonoverlap(repo, c1, c2, addedinm1, addedinm2,
hgext/narrow/__init__.py