This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4823

narrow: drop unnecessary overrides of patch
ClosedPublic

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

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG84092edd5c88: narrow: drop unnecessary overrides of patch
Summary

The patch overrides became unnecessary when I made context.status()
filter by the narrowspec in e411774a2e0f (narrow: move
status-filtering to core and to ctx, 2018-08-02).

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

martinvonz created this revision.Oct 1 2018, 1:01 PM
Closed by commit rHG84092edd5c88: narrow: drop unnecessary overrides of patch (authored by martinvonz). · Explain WhyOct 1 2018, 1:14 PM
This revision was automatically updated to reflect the committed changes.
martinvonz updated this revision to Diff 11534.Oct 1 2018, 1:15 PM
pulkit added a subscriber: pulkit.Oct 2 2018, 7:24 AM
pulkit added inline comments.
hgext/narrow/__init__.py
71

I think you want to delete narrowpatch here, not narrowcopies.

Revision Contents
Changeset List

PathPackages
Mhgext/narrow/__init__.py (2 lines)
DMhgext/narrow/narrowpatch.py (41 lines)

Diff 11534

hgext/narrow/__init__.py

registrar, registrar,
repository, repository,
verify as verifymod, verify as verifymod,
) )
from . import ( from . import (
narrowbundle2, narrowbundle2,
narrowcommands, narrowcommands,
narrowcopies,
narrowpatch, narrowpatch,
narrowrepo, narrowrepo,
narrowtemplates, narrowtemplates,
narrowwirepeer, narrowwirepeer,
) )
configtable = {} configtable = {}
configitem = registrar.configitem(configtable) configitem = registrar.configitem(configtable)
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)
pulkitUnsubmitted
Not Done

I think you want to delete narrowpatch here, not narrowcopies.

pulkit: I think you want to delete narrowpatch here, not narrowcopies.
narrowpatch.setup(repo) narrowpatch.setup(repo)
narrowwirepeer.reposetup(repo) narrowwirepeer.reposetup(repo)
def _verifierinit(orig, self, repo, matcher=None): def _verifierinit(orig, self, repo, matcher=None):
# The verifier's matcher argument was desgined for narrowhg, so it should # The verifier's matcher argument was desgined for narrowhg, so it should
# be None from core. If another extension passes a matcher (unlikely), # be None from core. If another extension passes a matcher (unlikely),
# we'll have to fail until matchers can be composed more easily. # we'll have to fail until matchers can be composed more easily.
assert matcher is None assert matcher is None
orig(self, repo, repo.narrowmatch()) orig(self, repo, repo.narrowmatch())
def extsetup(ui): def extsetup(ui):
extensions.wrapfunction(verifymod.verifier, '__init__', _verifierinit) extensions.wrapfunction(verifymod.verifier, '__init__', _verifierinit)
templatekeyword = narrowtemplates.templatekeyword templatekeyword = narrowtemplates.templatekeyword
revsetpredicate = narrowtemplates.revsetpredicate revsetpredicate = narrowtemplates.revsetpredicate

hgext/narrow/narrowpatch.py

  • This file was deleted.
# narrowpatch.py - extensions to mercurial patch 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 (
extensions,
patch,
)
def setup(repo):
def _filepairs(orig, *args):
"""Only includes files within the narrow spec in the diff."""
narrowmatch = repo.narrowmatch()
if not narrowmatch.always():
for x in orig(*args):
f1, f2, copyop = x
if ((not f1 or narrowmatch(f1)) and
(not f2 or narrowmatch(f2))):
yield x
else:
for x in orig(*args):
yield x
def trydiff(orig, repo, revs, ctx1, ctx2, modified, added, removed,
copy, getfilectx, *args, **kwargs):
narrowmatch = repo.narrowmatch()
if not narrowmatch.always():
modified = [f for f in modified if narrowmatch(f)]
added = [f for f in added if narrowmatch(f)]
removed = [f for f in removed if narrowmatch(f)]
copy = {k: v for k, v in copy.iteritems() if narrowmatch(k)}
return orig(repo, revs, ctx1, ctx2, modified, added, removed, copy,
getfilectx, *args, **kwargs)
extensions.wrapfunction(patch, '_filepairs', _filepairs)
extensions.wrapfunction(patch, 'trydiff', trydiff)
hgext/narrow/__init__.py