Let commit recurse into subrepos by default to match pre-2.0 behavior:

  $ echo "[ui]" >> $HGRCPATH

  $ echo "commitsubrepos = Yes" >> $HGRCPATH

  $ hg init t

  $ cd t

first revision, no sub

  $ echo a > a

  $ hg ci -Am0

  adding a

add first sub

  $ echo s = s > .hgsub

  $ hg add .hgsub

  $ hg init s

  $ echo a > s/a

Issue2232: committing a subrepo without .hgsub

  $ hg ci -mbad s

  abort: can't commit subrepos without .hgsub

  [255]

  $ hg -R s add s/a

  $ hg files -S

  .hgsub

  a

  s/a (glob)

  $ hg -R s ci -Ams0

  $ hg sum

  parent: 0:f7b1eb17ad24 tip

   0

  branch: default

  commit: 1 added, 1 subrepos

  update: (current)

  phases: 1 draft

  $ hg ci -m1

test handling .hgsubstate "added" explicitly.

  $ hg parents --template '{node}\n{files}\n'

  7cf8cfea66e410e8e3336508dfeec07b3192de51

  .hgsub .hgsubstate

  $ hg rollback -q

  $ hg add .hgsubstate

  $ hg ci -m1

  $ hg parents --template '{node}\n{files}\n'

  7cf8cfea66e410e8e3336508dfeec07b3192de51

  .hgsub .hgsubstate

Revert subrepo and test subrepo fileset keyword:

  $ echo b > s/a

  $ hg revert --dry-run "set:subrepo('glob:s*')"

  reverting subrepo s

  reverting s/a (glob)

  $ cat s/a

  b

  $ hg revert "set:subrepo('glob:s*')"

  reverting subrepo s

  reverting s/a (glob)

  $ cat s/a

  a

  $ rm s/a.orig

Revert subrepo with no backup. The "reverting s/a" line is gone since

we're really running 'hg update' in the subrepo:

  $ echo b > s/a

  $ hg revert --no-backup s

  reverting subrepo s

Issue2022: update -C

  $ echo b > s/a

  $ hg sum

  parent: 1:7cf8cfea66e4 tip

   1

  branch: default

  commit: 1 subrepos

  update: (current)

  phases: 2 draft

  $ hg co -C 1

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

  $ hg sum

  parent: 1:7cf8cfea66e4 tip

   1

  branch: default

  commit: (clean)

  update: (current)

  phases: 2 draft

commands that require a clean repo should respect subrepos

  $ echo b >> s/a

  $ hg backout tip

  abort: uncommitted changes in subrepository 's'

  [255]

  $ hg revert -C -R s s/a

add sub sub

  $ echo ss = ss > s/.hgsub

  $ hg init s/ss

  $ echo a > s/ss/a

  $ hg -R s add s/.hgsub

  $ hg -R s/ss add s/ss/a

  $ hg sum

  parent: 1:7cf8cfea66e4 tip

   1

  branch: default

  commit: 1 subrepos

  update: (current)

  phases: 2 draft

  $ hg ci -m2

  committing subrepository s

  committing subrepository s/ss (glob)

  $ hg sum

  parent: 2:df30734270ae tip

   2

  branch: default

  commit: (clean)

  update: (current)

  phases: 3 draft

test handling .hgsubstate "modified" explicitly.

  $ hg parents --template '{node}\n{files}\n'

  df30734270ae757feb35e643b7018e818e78a9aa

  .hgsubstate

  $ hg rollback -q

  $ hg status -A .hgsubstate

  M .hgsubstate

  $ hg ci -m2

  $ hg parents --template '{node}\n{files}\n'

  df30734270ae757feb35e643b7018e818e78a9aa

  .hgsubstate

bump sub rev (and check it is ignored by ui.commitsubrepos)

  $ echo b > s/a

  $ hg -R s ci -ms1

  $ hg --config ui.commitsubrepos=no ci -m3

leave sub dirty (and check ui.commitsubrepos=no aborts the commit)

  $ echo c > s/a

  $ hg --config ui.commitsubrepos=no ci -m4

  abort: uncommitted changes in subrepository 's'

  (use --subrepos for recursive commit)

  [255]

  $ hg id

  f6affe3fbfaa+ tip

  $ hg -R s ci -mc

  $ hg id

  f6affe3fbfaa+ tip

  $ echo d > s/a

  $ hg ci -m4

  committing subrepository s

  $ hg tip -R s

  changeset:   4:02dcf1d70411

  tag:         tip

  user:        test

  date:        Thu Jan 01 00:00:00 1970 +0000

  summary:     4

check caching

  $ hg co 0

  0 files updated, 0 files merged, 2 files removed, 0 files unresolved

  $ hg debugsub

restore

  $ hg co

  2 files updated, 0 files merged, 0 files removed, 0 files unresolved

  $ hg debugsub

  path s

   source   s

   revision 02dcf1d704118aee3ee306ccfa1910850d5b05ef

new branch for merge tests

  $ hg co 1

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

  $ echo t = t >> .hgsub

  $ hg init t

  $ echo t > t/t

  $ hg -R t add t

  adding t/t (glob)

5

  $ hg ci -m5 # add sub

  committing subrepository t

  created new head

  $ echo t2 > t/t

6

  $ hg st -R s

  $ hg ci -m6 # change sub

  committing subrepository t

  $ hg debugsub

  path s

   source   s

   revision e4ece1bf43360ddc8f6a96432201a37b7cd27ae4

  path t

   source   t

   revision 6747d179aa9a688023c4b0cad32e4c92bb7f34ad

  $ echo t3 > t/t

7

  $ hg ci -m7 # change sub again for conflict test

  committing subrepository t

  $ hg rm .hgsub

8

  $ hg ci -m8 # remove sub

test handling .hgsubstate "removed" explicitly.

  $ hg parents --template '{node}\n{files}\n'

  96615c1dad2dc8e3796d7332c77ce69156f7b78e

  .hgsub .hgsubstate

  $ hg rollback -q

  $ hg remove .hgsubstate

  $ hg ci -m8

  $ hg parents --template '{node}\n{files}\n'

  96615c1dad2dc8e3796d7332c77ce69156f7b78e

  .hgsub .hgsubstate

merge tests

  $ hg co -C 3

  2 files updated, 0 files merged, 0 files removed, 0 files unresolved

  $ hg merge 5 # test adding

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

  (branch merge, don't forget to commit)

  $ hg debugsub

  path s

   source   s

   revision fc627a69481fcbe5f1135069e8a3881c023e4cf5

  path t

   source   t

   revision 60ca1237c19474e7a3978b0dc1ca4e6f36d51382

  $ hg ci -m9

  created new head

  $ hg merge 6 --debug # test change

    searching for copies back to rev 2

  resolving manifests

   branchmerge: True, force: False, partial: False

   ancestor: 1f14a2e2d3ec, local: f0d2028bf86d+, remote: 1831e14459c4

   .hgsubstate: versions differ -> m

  subrepo merge f0d2028bf86d+ 1831e14459c4 1f14a2e2d3ec

    subrepo t: other changed, get t:6747d179aa9a688023c4b0cad32e4c92bb7f34ad:hg

  getting subrepo t

  resolving manifests

   branchmerge: False, force: False, partial: False

   ancestor: 60ca1237c194, local: 60ca1237c194+, remote: 6747d179aa9a

   t: remote is newer -> g

  getting t

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

  (branch merge, don't forget to commit)

  $ hg debugsub

  path s

   source   s

   revision fc627a69481fcbe5f1135069e8a3881c023e4cf5

  path t

   source   t

   revision 6747d179aa9a688023c4b0cad32e4c92bb7f34ad

  $ echo conflict > t/t

  $ hg ci -m10

  committing subrepository t

  $ HGMERGE=internal:merge hg merge --debug 7 # test conflict

    searching for copies back to rev 2

  resolving manifests

   branchmerge: True, force: False, partial: False

   ancestor: 1831e14459c4, local: e45c8b14af55+, remote: f94576341bcf

   .hgsubstate: versions differ -> m

  subrepo merge e45c8b14af55+ f94576341bcf 1831e14459c4

    subrepo t: both sides changed 

   subrepository t diverged (local revision: 20a0db6fbf6c, remote revision: 7af322bc1198)

  (M)erge, keep (l)ocal or keep (r)emote? m

  merging subrepo t

    searching for copies back to rev 2

  resolving manifests

   branchmerge: True, force: False, partial: False

   ancestor: 6747d179aa9a, local: 20a0db6fbf6c+, remote: 7af322bc1198

   preserving t for resolve of t

   t: versions differ -> m

  picked tool ':merge' for t (binary False symlink False)

  merging t

  my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a

  warning: conflicts during merge.

  merging t incomplete! (edit conflicts, then use 'hg resolve --mark')

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

  use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon

    subrepo t: merge with t:7af322bc1198a32402fe903e0b7ebcfc5c9bf8f4:hg

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

  (branch merge, don't forget to commit)

should conflict

  $ cat t/t

  <<<<<<< local: 20a0db6fbf6c - test: 10

  conflict

  =======

  t3

  >>>>>>> other: 7af322bc1198  - test: 7

11: remove subrepo t

  $ hg co -C 5

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

  $ hg revert -r 4 .hgsub # remove t

  $ hg ci -m11

  created new head

  $ hg debugsub

  path s

   source   s

   revision e4ece1bf43360ddc8f6a96432201a37b7cd27ae4

local removed, remote changed, keep changed

  $ hg merge 6

   remote changed subrepository t which local removed

  use (c)hanged version or (d)elete? c

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

  (branch merge, don't forget to commit)

BROKEN: should include subrepo t

  $ hg debugsub

  path s

   source   s

   revision e4ece1bf43360ddc8f6a96432201a37b7cd27ae4

  $ cat .hgsubstate

  e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 s

  6747d179aa9a688023c4b0cad32e4c92bb7f34ad t

  $ hg ci -m 'local removed, remote changed, keep changed'

BROKEN: should include subrepo t

  $ hg debugsub

  path s

   source   s

   revision e4ece1bf43360ddc8f6a96432201a37b7cd27ae4

BROKEN: should include subrepo t

  $ cat .hgsubstate

  e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 s

  $ cat t/t

  t2

local removed, remote changed, keep removed

  $ hg co -C 11

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

  $ hg merge --config ui.interactive=true 6 <<EOF

  > d

  > EOF

   remote changed subrepository t which local removed

  use (c)hanged version or (d)elete? d

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

  (branch merge, don't forget to commit)

  $ hg debugsub

  path s

   source   s

   revision e4ece1bf43360ddc8f6a96432201a37b7cd27ae4

  $ cat .hgsubstate

  e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 s

  $ hg ci -m 'local removed, remote changed, keep removed'

  created new head

  $ hg debugsub

  path s

   source   s

   revision e4ece1bf43360ddc8f6a96432201a37b7cd27ae4

  $ cat .hgsubstate

  e4ece1bf43360ddc8f6a96432201a37b7cd27ae4 s

local changed, remote removed, keep changed

  $ hg co -C 6

  2 files updated, 0 files merged, 0 files removed, 0 files unresolved

  $ hg merge 11

   local changed subrepository t which remote removed

  use (c)hanged version or (d)elete? c

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