comparison hgext/narrow/narrowpatch.py @ 36467:2d82a24d0c78

narrow: consider both local and remote matchers in narrowchangegroup The existing code that picked one or the other seemed very suspicious. This patch makes us intersect the local matcher with the matcher from the remote, which seems better. It fixes one test case and makes another one that used to crash no longer crash, but instead silently succeed with a push that's lossy, so that remains to be fixed. The real reason for doing this now is that I'm going to move narrowrepo.narrowmatch() onto localrepo and then it will always be defined, which would otherwise break this code. Differential Revision: https://phab.mercurial-scm.org/D2490
author Martin von Zweigbergk <martinvonz@google.com>
date Wed, 28 Feb 2018 10:29:04 -0800
parents f85e32a5e5c8
children d0d5eef57fb0
comparison
equal deleted inserted replaced
36466:a8b4d7673d8e 36467:2d82a24d0c78