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 1

     2

     3

  $ echo '[ui]' >> 1/.hg/hgrc

     4

  $ echo 'timeout = 10' >> 1/.hg/hgrc

     5

     6

  $ echo foo > 1/foo

     7

  $ hg --cwd 1 ci -A -m foo

     8

  adding foo

     9

    10

  $ hg clone 1 2

    11

  updating to branch default

    12

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

    13

    14

  $ hg clone 2 3

    15

  updating to branch default

    16

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

    17

    18

  $ cat <<EOF > $TESTTMP/debuglocks-pretxn-hook.sh

    19

  > hg debuglocks

    20

  > true

    21

  > EOF

    22

  $ echo '[hooks]' >> 2/.hg/hgrc

    23

  $ echo "pretxnchangegroup.a = sh $TESTTMP/debuglocks-pretxn-hook.sh" >> 2/.hg/hgrc

    24

  $ echo 'changegroup.push = hg push -qf ../1' >> 2/.hg/hgrc

    25

    26

  $ echo bar >> 3/foo

    27

  $ hg --cwd 3 ci -m bar

    28

    29

  $ hg --cwd 3 push ../2

    30

  pushing to ../2

    31

  searching for changes

    32

  adding changesets

    33

  adding manifests

    34

  adding file changes

    35

  added 1 changesets with 1 changes to 1 files

    36

  lock:  user *, process * (*s) (glob)

    37

  wlock: free

    38