#require git

make git commits repeatable

  $ cat >> $HGRCPATH <<EOF

  > [defaults]

  > commit = -d "0 0"

  > EOF

  $ echo "[core]" >> $HOME/.gitconfig

  $ echo "autocrlf = false" >> $HOME/.gitconfig

  $ GIT_AUTHOR_NAME='test'; export GIT_AUTHOR_NAME

  $ GIT_AUTHOR_EMAIL='test@example.org'; export GIT_AUTHOR_EMAIL

  $ GIT_AUTHOR_DATE='1234567891 +0000'; export GIT_AUTHOR_DATE

  $ GIT_COMMITTER_NAME="$GIT_AUTHOR_NAME"; export GIT_COMMITTER_NAME

  $ GIT_COMMITTER_EMAIL="$GIT_AUTHOR_EMAIL"; export GIT_COMMITTER_EMAIL

  $ GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"; export GIT_COMMITTER_DATE

  $ GIT_CONFIG_NOSYSTEM=1; export GIT_CONFIG_NOSYSTEM

root hg repo

  $ hg init t

  $ cd t

  $ echo a > a

  $ hg add a

  $ hg commit -m a

  $ cd ..

new external git repo

  $ mkdir gitroot

  $ cd gitroot

  $ git init -q

  $ echo g > g

  $ git add g

  $ git commit -q -m g

add subrepo clone

  $ cd ../t

  $ echo 's = [git]../gitroot' > .hgsub

  $ git clone -q ../gitroot s

  $ hg add .hgsub

git subrepo is disabled by default

  $ hg commit -m 'new git subrepo'

  abort: git subrepos not allowed

  (see 'hg help config.subrepos' for details)

  [255]

so enable it

  $ cat >> $HGRCPATH <<EOF

  > [subrepos]

  > git:allowed = true

  > EOF

  $ hg commit -m 'new git subrepo'

  $ hg debugsub

  path s

   source   ../gitroot

   revision da5f5b1d8ffcf62fb8327bcd3c89a4367a6018e7

record a new commit from upstream from a different branch

  $ cd ../gitroot

  $ git checkout -q -b testing

  $ echo gg >> g

  $ git commit -q -a -m gg

  $ cd ../t/s

  $ git pull -q >/dev/null 2>/dev/null

  $ git checkout -q -b testing origin/testing >/dev/null

  $ cd ..

  $ hg status --subrepos

  M s/g

  $ hg commit -m 'update git subrepo'

  $ hg debugsub

  path s

   source   ../gitroot

   revision 126f2a14290cd5ce061fdedc430170e8d39e1c5a

make $GITROOT pushable, by replacing it with a clone with nothing checked out

  $ cd ..

  $ git clone gitroot gitrootbare --bare -q

  $ rm -rf gitroot

  $ mv gitrootbare gitroot

clone root

  $ cd t

  $ hg clone . ../tc 2> /dev/null

  updating to branch default

  cloning subrepo s from $TESTTMP/gitroot

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

  $ cd ../tc

  $ hg debugsub

  path s

   source   ../gitroot

   revision 126f2a14290cd5ce061fdedc430170e8d39e1c5a

  $ cd ..

clone with subrepo disabled (update should fail)

  $ hg clone t -U tc2 --config subrepos.allowed=false

  $ hg update -R tc2 --config subrepos.allowed=false

  abort: subrepos not enabled

  (see 'hg help config.subrepos' for details)

  [255]

  $ ls tc2

  a

  $ hg clone t tc3 --config subrepos.allowed=false

  updating to branch default

  abort: subrepos not enabled

  (see 'hg help config.subrepos' for details)

  [255]

  $ ls tc3

  a

update to previous substate

  $ cd tc

  $ hg update 1 -q

  $ cat s/g

  g

  $ hg debugsub

  path s

   source   ../gitroot

   revision da5f5b1d8ffcf62fb8327bcd3c89a4367a6018e7

clone root, make local change

  $ cd ../t

  $ hg clone . ../ta 2> /dev/null

  updating to branch default

  cloning subrepo s from $TESTTMP/gitroot

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

  $ cd ../ta

  $ echo ggg >> s/g

  $ hg status --subrepos

  M s/g

  $ hg diff --subrepos

  diff --git a/s/g b/s/g

  index 089258f..85341ee 100644

  --- a/s/g

  +++ b/s/g

  @@ -1,2 +1,3 @@

   g

   gg

  +ggg

  $ hg commit --subrepos -m ggg

  committing subrepository s

  $ hg debugsub

  path s

   source   ../gitroot

   revision 79695940086840c99328513acbe35f90fcd55e57

clone root separately, make different local change

  $ cd ../t

  $ hg clone . ../tb 2> /dev/null

  updating to branch default

  cloning subrepo s from $TESTTMP/gitroot

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

  $ cd ../tb/s

  $ hg status --subrepos

  $ echo f > f

  $ hg status --subrepos

  ? s/f

  $ hg add .

  adding f

  $ git add f

  $ cd ..

  $ hg status --subrepos

  A s/f

  $ hg commit --subrepos -m f

  committing subrepository s

  $ hg debugsub

  path s

   source   ../gitroot

   revision aa84837ccfbdfedcdcdeeedc309d73e6eb069edc

user b push changes

  $ hg push 2>/dev/null

  pushing to $TESTTMP/t

  pushing branch testing of subrepository "s"

  searching for changes

  adding changesets

  adding manifests

  adding file changes

  added 1 changesets with 1 changes to 1 files

user a pulls, merges, commits

  $ cd ../ta

  $ hg pull

  pulling from $TESTTMP/t

  searching for changes

  adding changesets

  adding manifests

  adding file changes

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

  new changesets 089416c11d73

  (run 'hg heads' to see heads, 'hg merge' to merge)

  $ hg merge 2>/dev/null

   subrepository s diverged (local revision: 7969594, remote revision: aa84837)

  (M)erge, keep (l)ocal [working copy] or keep (r)emote [merge rev]? m

  pulling subrepo s from $TESTTMP/gitroot

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

  (branch merge, don't forget to commit)

  $ hg st --subrepos s

  A s/f

  $ cat s/f

  f

  $ cat s/g

  g

  gg

  ggg

  $ hg commit --subrepos -m 'merge'

  committing subrepository s

  $ hg status --subrepos --rev 1:5

  M .hgsubstate

  M s/g

  A s/f

  $ hg debugsub

  path s

   source   ../gitroot

   revision f47b465e1bce645dbf37232a00574aa1546ca8d3

  $ hg push 2>/dev/null

  pushing to $TESTTMP/t

  pushing branch testing of subrepository "s"

  searching for changes

  adding changesets

  adding manifests

  adding file changes

  added 2 changesets with 2 changes to 1 files

make upstream git changes

  $ cd ..

  $ git clone -q gitroot gitclone

  $ cd gitclone

  $ echo ff >> f

  $ git commit -q -a -m ff

  $ echo fff >> f

  $ git commit -q -a -m fff

  $ git push origin testing 2>/dev/null

make and push changes to hg without updating the subrepo

  $ cd ../t

  $ hg clone . ../td 2>&1 | egrep -v '^Cloning into|^done\.'

  updating to branch default

  cloning subrepo s from $TESTTMP/gitroot

  checking out detached HEAD in subrepository "s"

  check out a git branch if you intend to make changes

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

  $ cd ../td

  $ echo aa >> a

  $ hg commit -m aa

  $ hg push

  pushing to $TESTTMP/t

  searching for changes

  adding changesets

  adding manifests

  adding file changes

  added 1 changesets with 1 changes to 1 files

sync to upstream git, distribute changes

  $ cd ../ta

  $ hg pull -u -q

  $ cd s

  $ git pull -q >/dev/null 2>/dev/null

  $ cd ..

  $ hg commit -m 'git upstream sync'

  $ hg debugsub

  path s

   source   ../gitroot

   revision 32a343883b74769118bb1d3b4b1fbf9156f4dddc

  $ hg push -q

  $ cd ../tb

  $ hg pull -q

  $ hg update 2>/dev/null

  pulling subrepo s from $TESTTMP/gitroot

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

  $ hg debugsub

  path s

   source   ../gitroot

   revision 32a343883b74769118bb1d3b4b1fbf9156f4dddc

create a new git branch

  $ cd s

  $ git checkout -b b2

  Switched to a new branch 'b2'

  $ echo a>a

  $ git add a

  $ git commit -qm 'add a'

  $ cd ..

  $ hg commit -m 'add branch in s'

pulling new git branch should not create tracking branch named 'origin/b2'

(issue3870)

  $ cd ../td/s

  $ git remote set-url origin $TESTTMP/tb/s

  $ git branch --no-track oldtesting

  $ cd ..

  $ hg pull -q ../tb

  $ hg up

  From $TESTTMP/tb/s

   * [new branch]      b2         -> origin/b2

  Previous HEAD position was f47b465* merge (glob)

  Switched to a new branch 'b2'

  pulling subrepo s from $TESTTMP/tb/s

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

update to a revision without the subrepo, keeping the local git repository

  $ cd ../t

  $ hg up 0

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

  $ ls -a s

  .

  ..

  .git

  $ hg up 2

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

  $ ls -a s

  .

  ..

  .git

  g

archive subrepos

  $ cd ../tc

  $ hg pull -q

  $ hg archive --subrepos -r 5 ../archive 2>/dev/null

  pulling subrepo s from $TESTTMP/gitroot

  $ cd ../archive

  $ cat s/f

  f

  $ cat s/g

  g

  gg

  ggg

  $ hg -R ../tc archive --subrepo -r 5 -X ../tc/**f ../archive_x 2>/dev/null

  $ find ../archive_x | sort | grep -v pax_global_header

  ../archive_x

  ../archive_x/.hg_archival.txt

  ../archive_x/.hgsub

  ../archive_x/.hgsubstate

  ../archive_x/a

  ../archive_x/s

  ../archive_x/s/g

  $ hg -R ../tc archive -S ../archive.tgz --prefix '.' 2>/dev/null

  $ tar -tzf ../archive.tgz | sort | grep -v pax_global_header

  .hg_archival.txt

  .hgsub

  .hgsubstate

  a

  s/g

create nested repo

  $ cd ..

  $ hg init outer

  $ cd outer

  $ echo b>b

  $ hg add b

  $ hg commit -m b

  $ hg clone ../t inner 2> /dev/null

  updating to branch default

  cloning subrepo s from $TESTTMP/gitroot

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

  $ echo inner = inner > .hgsub

  $ hg add .hgsub

  $ hg commit -m 'nested sub'

nested commit

  $ echo ffff >> inner/s/f

  $ hg status --subrepos

  M inner/s/f

  $ hg commit --subrepos -m nested

  committing subrepository inner

  committing subrepository inner/s

nested archive

  $ hg archive --subrepos ../narchive

  $ ls ../narchive/inner/s | grep -v pax_global_header

  f

  g

relative source expansion

  $ cd ..

  $ mkdir d