subrepo: share instead of clone if the parent repo is shared (issue5675) (BC) Previously, only the top level repo was shared, and then any subrepos were cloned on demand. This is problematic because commits to the parent repo would write an updated .hgsubstate to the share source, but the corresponding subrepo commit would be stuck in the local subrepo. That would prevent an update in the source repo. We already go to great lengths to avoid having inconsistent repos (e.g., `hg push -r rev` will push _everything_ in a subrepo, even if it isn't referenced in one of the parent's outgoing commits). Therefore, this seems like a bug fix, and there's no option to get the old behavior. I can't imagine the previous behavior was useful to anybody. There shouldn't be an issue with svn, since it is centralized. Maybe --git-dir can be used for git subrepos, but I'll leave that to someone more familiar with git. An integer was previously being implicitly returned from commands.share(), which caused dispatch() to start crashing when changing over to returning the shared repo. All error paths appear to raise, so this can be hardcoded to success. The clone command checks for 'is None' in a similar pattern, but since hg.clone() always returns a tuple, that seems wrong? .. fix:: Issue 5675 Creating a share of a repository with a Mercurial subrepository will now share the subrepository. and .. bc:: Mercurial subrepositories are now shared instead of cloned when the parent repository is shared. This prevents dangling subrepository references in the share source. Previously shared repositories with cloned subrepositories will continue to function unchanged.

     1

https://bz.mercurial-scm.org/612

     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