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

     1

Our full contribution guidelines are in our wiki, please see:

     2

     3

https://www.mercurial-scm.org/wiki/ContributingChanges

     4

     5

If you just want a checklist to follow, you can go straight to

     6

     7

https://www.mercurial-scm.org/wiki/ContributingChanges#Submission_checklist

     8

     9

If you can't run the entire testsuite for some reason (it can be

    10

difficult on Windows), please at least run `contrib/check-code.py` on

    11

any files you've modified and run `python contrib/check-commit` on any

    12

commits you've made (for example, `python contrib/check-commit

    13

273ce12ad8f1` will report some style violations on a very old commit).