# HG changeset patch # User Martin von Zweigbergk # Date 1538168117 25200 # Node ID 84092edd5c88bbb3c2a5de377cfd9ca79019fa39 # Parent 277a6fb460a68543516572df2bc560b571379a39 narrow: drop unnecessary overrides of patch 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). Differential Revision: https://phab.mercurial-scm.org/D4823 diff -r 277a6fb460a6 -r 84092edd5c88 hgext/narrow/__init__.py --- a/hgext/narrow/__init__.py Fri Sep 28 00:00:36 2018 -0700 +++ b/hgext/narrow/__init__.py Fri Sep 28 13:55:17 2018 -0700 @@ -25,7 +25,6 @@ from . import ( narrowbundle2, narrowcommands, - narrowcopies, narrowpatch, narrowrepo, narrowtemplates, @@ -68,7 +67,6 @@ if repository.NARROW_REQUIREMENT in repo.requirements: narrowrepo.wraprepo(repo) - narrowcopies.setup(repo) narrowpatch.setup(repo) narrowwirepeer.reposetup(repo) diff -r 277a6fb460a6 -r 84092edd5c88 hgext/narrow/narrowpatch.py --- a/hgext/narrow/narrowpatch.py Fri Sep 28 00:00:36 2018 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,41 +0,0 @@ -# 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)