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 a

     2

  $ cd a

     3

     4

  $ hg diff inexistent1 inexistent2

     5

  inexistent1: * (glob)

     6

  inexistent2: * (glob)

     7

     8

  $ echo bar > foo

     9

  $ hg add foo

    10

  $ hg ci -m 'add foo'

    11

    12

  $ echo foobar > foo

    13

  $ hg ci -m 'change foo'

    14

    15

  $ hg --quiet diff -r 0 -r 1

    16

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

    17

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

    18

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

    19

  -bar

    20

  +foobar

    21

    22

  $ hg diff -r 0 -r 1

    23

  diff -r a99fb63adac3 -r 9b8568d3af2f foo

    24

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

    25

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

    26

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

    27

  -bar

    28

  +foobar

    29

    30

  $ hg --verbose diff -r 0 -r 1

    31

  diff -r a99fb63adac3 -r 9b8568d3af2f foo

    32

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

    33

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

    34

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

    35

  -bar

    36

  +foobar

    37

    38

  $ hg --debug diff -r 0 -r 1

    39

  diff -r a99fb63adac3f31816a22f665bc3b7a7655b30f4 -r 9b8568d3af2f1749445eef03aede868a6f39f210 foo

    40

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

    41

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

    42

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

    43

  -bar

    44

  +foobar

    45

    46

  $ cd ..