match: resolve filesets in subrepos for commands given the '-S' argument This will work for any command that creates its matcher via scmutil.match(), but only the files command is tested here (both workingctx and basectx based tests). The previous behavior was to completely ignore the files in the subrepo, even though -S was given. My first attempt was to teach context.walk() to optionally recurse, but once that was in place and the complete file list was built up, the predicate test would fail with 'path in nested repo' when a file in a subrepo was accessed through the parent context. There are two slightly surprising behaviors with this functionality. First, any path provided inside the fileset isn't narrowed when it is passed to the subrepo. I dont see any clean way to do that in the matcher. Fortunately, the 'subrepo()' fileset is the only one to take a path. The second surprise is that status predicates are resolved against the subrepo, not the parent like 'hg status -S' is. I don't see any way to fix that either, given the path auditor error mentioned above.

     1

  $ hg init

     2

     3

  $ cat > a <<EOF

     4

  > a

     5

  > b

     6

  > c

     7

  > EOF

     8

  $ hg ci -Am adda

     9

  adding a

    10

    11

  $ cat > a <<EOF

    12

  > d

    13

  > e

    14

  > f

    15

  > EOF

    16

  $ hg ci -m moda

    17

    18

  $ hg diff --reverse -r0 -r1

    19

  diff -r 2855cdcfcbb7 -r 8e1805a3cf6e a

    20

  --- a/a	Thu Jan 01 00:00:00 1970 +0000

    21

  +++ b/a	Thu Jan 01 00:00:00 1970 +0000

    22

  @@ -1,3 +1,3 @@

    23

  -d

    24

  -e

    25

  -f

    26

  +a

    27

  +b

    28

  +c

    29

    30

  $ cat >> a <<EOF

    31

  > g

    32

  > h

    33

  > EOF

    34

  $ hg diff --reverse --nodates

    35

  diff -r 2855cdcfcbb7 a

    36

  --- a/a

    37

  +++ b/a

    38

  @@ -1,5 +1,3 @@

    39

   d

    40

   e

    41

   f

    42

  -g

    43

  -h

    44

    45

should show removed file 'a' as being added

    46

  $ hg revert a

    47

  $ hg rm a

    48

  $ hg diff --reverse --nodates a

    49

  diff -r 2855cdcfcbb7 a

    50

  --- /dev/null

    51

  +++ b/a

    52

  @@ -0,0 +1,3 @@

    53

  +d

    54

  +e

    55

  +f

    56

    57

should show added file 'b' as being removed

    58

  $ echo b >> b

    59

  $ hg add b

    60

  $ hg diff --reverse --nodates b

    61

  diff -r 2855cdcfcbb7 b

    62

  --- a/b

    63

  +++ /dev/null

    64

  @@ -1,1 +0,0 @@

    65

  -b