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

http://mercurial.selenic.com/bts/issue612

     2

     3

  $ hg init

     4

  $ mkdir src

     5

  $ echo a > src/a.c

     6

  $ hg ci -Ama

     7

  adding src/a.c

     8

     9

  $ hg mv src source

    10

  moving src/a.c to source/a.c (glob)

    11

    12

  $ hg ci -Ammove

    13

    14

  $ hg co -C 0

    15

  1 files updated, 0 files merged, 1 files removed, 0 files unresolved

    16

    17

  $ echo new > src/a.c

    18

  $ echo compiled > src/a.o

    19

  $ hg ci -mupdate

    20

  created new head

    21

    22

  $ hg status

    23

  ? src/a.o

    24

    25

  $ hg merge

    26

  merging src/a.c and source/a.c to source/a.c

    27

  0 files updated, 1 files merged, 0 files removed, 0 files unresolved

    28

  (branch merge, don't forget to commit)

    29

    30

  $ hg status

    31

  M source/a.c

    32

  R src/a.c

    33

  ? src/a.o

    34