verify: replace _validpath() by matcher The verifier calls out to _validpath() to check if it should verify that path and the narrowhg extension overrides _validpath() to tell the verifier to skip that path. In treemanifest repos, the verifier calls the same method to check if it should visit a directory. However, the decision to visit a directory is different from the condition that it's a matching path, and narrowhg was working around it by returning True from its _validpath() override if *either* was true. Similar to how one can do "hg files -I foo/bar/ -X foo/" (making the include pointless), narrowhg can be configured to track the same paths. In that case match("foo/bar/baz") would be false, but match.visitdir("foo/bar/baz") turns out to be true, causing verify to fail. This may seem like a bug in visitdir(), but it's explicitly documented to be undefined for subdirectories of excluded directories. When using treemanifests, the walk would not descend into foo/, so verification would pass. However, when using flat manifests, there is no recursive directory walk and the file path "foo/bar/baz" would be passed to _validpath() without "foo/" (actually without the slash) being passed first. As explained above, _validpath() would return true for the file path and "hg verify" would fail. Replacing the _validpath() method by a matcher seems like the obvious fix. Narrowhg can then pass in its own matcher and not have to conflate the two matching functions (for dirs and files). I think it also makes the code clearer.

     1

  $ cat <<EOF >> $HGRCPATH

     2

  > [extensions]

     3

  > purge =

     4

  > EOF

     5

     6

  $ hg init test

     7

  $ cd test

     8

  $ echo a > changed

     9

  $ echo a > removed

    10

  $ echo a > source

    11

  $ hg ci -Am addfiles

    12

  adding changed

    13

  adding removed

    14

  adding source

    15

  $ echo a >> changed

    16

  $ echo a > added

    17

  $ hg add added

    18

  $ hg rm removed

    19

  $ hg cp source copied

    20

  $ hg diff --git > ../unknown.diff

    21

    22

Test adding on top of an unknown file

    23

    24

  $ hg up -qC 0

    25

  $ hg purge

    26

  $ echo a > added

    27

  $ hg import --no-commit ../unknown.diff

    28

  applying ../unknown.diff

    29

  file added already exists

    30

  1 out of 1 hunks FAILED -- saving rejects to file added.rej

    31

  abort: patch failed to apply

    32

  [255]

    33

    34

Test modifying an unknown file

    35

    36

  $ hg revert -aq

    37

  $ hg purge

    38

  $ hg rm changed

    39

  $ hg ci -m removechanged

    40

  $ echo a > changed

    41

  $ hg import --no-commit ../unknown.diff

    42

  applying ../unknown.diff

    43

  abort: cannot patch changed: file is not tracked

    44

  [255]

    45

    46

Test removing an unknown file

    47

    48

  $ hg up -qC 0

    49

  $ hg purge

    50

  $ hg rm removed

    51

  $ hg ci -m removeremoved

    52

  created new head

    53

  $ echo a > removed

    54

  $ hg import --no-commit ../unknown.diff

    55

  applying ../unknown.diff

    56

  abort: cannot patch removed: file is not tracked

    57

  [255]

    58

    59

Test copying onto an unknown file

    60

    61

  $ hg up -qC 0

    62

  $ hg purge

    63

  $ echo a > copied

    64

  $ hg import --no-commit ../unknown.diff

    65

  applying ../unknown.diff

    66

  abort: cannot create copied: destination already exists

    67

  [255]

    68

    69

  $ cd ..