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

Issue1678: IndexError when pushing

     2

     3

setting up base repo

     4

  $ hg init a

     5

  $ cd a

     6

  $ touch a

     7

  $ hg ci -Am a

     8

  adding a

     9

  $ cd ..

    10

    11

cloning base repo

    12

  $ hg clone a b

    13

  updating to branch default

    14

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

    15

  $ cd b

    16

    17

setting up cset to push

    18

  $ hg up null

    19

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

    20

  $ touch a

    21

different msg so we get a clog new entry

    22

  $ hg ci -Am b

    23

  adding a

    24

  created new head

    25

    26

pushing

    27

  $ hg push -f ../a

    28

  pushing to ../a

    29

  searching for changes

    30

  adding changesets

    31

  adding manifests

    32

  adding file changes

    33

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

    34

    35

  $ cd ..