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/issue842

     2

     3

  $ hg init

     4

  $ echo foo > a

     5

  $ hg ci -Ama

     6

  adding a

     7

     8

  $ hg up -r0000

     9

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

    10

    11

  $ echo bar > a

    12

    13

Should issue new head warning:

    14

    15

  $ hg ci -Amb

    16

  adding a

    17

  created new head

    18

    19

  $ hg up -r0000

    20

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

    21

    22

  $ echo stuffy > a

    23

    24

Should not issue new head warning:

    25

    26

  $ hg ci -q -Amc

    27

    28

  $ hg up -r0000

    29

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

    30

    31

  $ echo crap > a

    32

  $ hg branch testing

    33

  marked working directory as branch testing

    34

  (branches are permanent and global, did you want a bookmark?)

    35

    36

Should not issue warning:

    37

    38

  $ hg ci -q -Amd

    39