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

  $ echo 123 > a

     4

  $ hg add a

     5

  $ hg commit -m "a" -u a

     6

     7

  $ cd ..

     8

  $ hg init b

     9

  $ cd b

    10

  $ echo 321 > b

    11

  $ hg add b

    12

  $ hg commit -m "b" -u b

    13

    14

  $ hg pull ../a

    15

  pulling from ../a

    16

  searching for changes

    17

  abort: repository is unrelated

    18

  [255]

    19

    20

  $ hg pull -f ../a

    21

  pulling from ../a

    22

  searching for changes

    23

  warning: repository is unrelated

    24

  requesting all changes

    25

  adding changesets

    26

  adding manifests

    27

  adding file changes

    28

  added 1 changesets with 1 changes to 1 files (+1 heads)

    29

  (run 'hg heads' to see heads, 'hg merge' to merge)

    30

    31

  $ hg heads

    32

  changeset:   1:9a79c33a9db3

    33

  tag:         tip

    34

  parent:      -1:000000000000

    35

  user:        a

    36

  date:        Thu Jan 01 00:00:00 1970 +0000

    37

  summary:     a

    38

    39

  changeset:   0:01f8062b2de5

    40

  user:        b

    41

  date:        Thu Jan 01 00:00:00 1970 +0000

    42

  summary:     b

    43

    44

    45

  $ cd ..