dirstate: drop explicit files that shouldn't match (BC) (issue4679) Before, wctx.walk() could include files excluded by -X pattern, which disagrees with wctx.matches() and ctx.walk()/matches() behavior. This patch fixes the problem by testing stat results against the matcher if the matcher may contain false paths. I have no idea if the fix should be made before the workaround for case- insensitive filesystems, but that shouldn't matter since match.anypats() means 'not match.isexact()'. This patch also makes narrow and sparse extensions to not exclude explicit paths on walk() because they appear to depend on the buggy behavior. More detailed analysis about this issue by Martin von Zweigbergk: "I think it's just an unintended consequence of how the dirstate walk works, but I'm not sure. The exception for explicit files also bothered me when I was working on the matcher code a year or so ago. I actually added the exception to the matcher code because I thought it was always working like that (not just for dirstate) in a83a7d27911e (match: handle excludes using new differencematcher, 2017-05-16). It was only recently that Yuya realized that it used to be inconsistent and that I probably made it consistently bad because I didn't realize it was inconsistent to start with, see 821d8a5ab4ff (match: do not weirdly include explicit files excluded by -X option, 2018-01-16)." .. bc:: Working-directory commands now respect ``-X PATTERN`` no matter if PATTERN matches explicitly-specified FILEs. For example, ``hg add foo -X foo`` no longer add the file ``foo``.

     1

# narrowpatch.py - extensions to mercurial patch module to support narrow clones

     2

#

     3

# Copyright 2017 Google, Inc.

     4

#

     5

# This software may be used and distributed according to the terms of the

     6

# GNU General Public License version 2 or any later version.

     7

     8

from __future__ import absolute_import

     9

    10

from mercurial import (

    11

    extensions,

    12

    patch,

    13

    util,

    14

)

    15

    16

def setup(repo):

    17

    def _filepairs(orig, *args):

    18

        """Only includes files within the narrow spec in the diff."""

    19

        if util.safehasattr(repo, 'narrowmatch'):

    20

            narrowmatch = repo.narrowmatch()

    21

            for x in orig(*args):

    22

                f1, f2, copyop = x

    23

                if ((not f1 or narrowmatch(f1)) and

    24

                    (not f2 or narrowmatch(f2))):

    25

                    yield x

    26

        else:

    27

            for x in orig(*args):

    28

                yield x

    29

    30

    def trydiff(orig, repo, revs, ctx1, ctx2, modified, added, removed,

    31

                copy, getfilectx, *args, **kwargs):

    32

        if util.safehasattr(repo, 'narrowmatch'):

    33

            narrowmatch = repo.narrowmatch()

    34

            modified = filter(narrowmatch, modified)

    35

            added = filter(narrowmatch, added)

    36

            removed = filter(narrowmatch, removed)

    37

            copy = {k: v for k, v in copy.iteritems() if narrowmatch(k)}

    38

        return orig(repo, revs, ctx1, ctx2, modified, added, removed, copy,

    39

                    getfilectx, *args, **kwargs)

    40

    41

    extensions.wrapfunction(patch, '_filepairs', _filepairs)

    42

    extensions.wrapfunction(patch, 'trydiff', trydiff)