Mercurial > hg
view hgext/narrow/narrowpatch.py @ 38618:c829749e7639
shelve: directly handle the initial parent alignment
Shelve is currently sub-contracting some of its work to the rebase extension.
In order to make shelve more independent and flexible we would like shelve to
handle the parent alignment directly.
After this change, we no longer need to use rebase in shelve.
Differential Revision: https://phab.mercurial-scm.org/D3693
author | Boris Feld <boris.feld@octobus.net> |
---|---|
date | Tue, 29 May 2018 00:30:50 +0200 |
parents | d0d5eef57fb0 |
children |
line wrap: on
line source
# 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)