Mercurial > hg > hg-git

changeset 532:ebb26b675663

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: unify test-subrepos
author David M. Carr <david@carrclan.us>
date Fri, 14 Sep 2012 19:08:51 -0400
parents 800625c63100
children a6989fabe86d
files tests/test-subrepos tests/test-subrepos.out tests/test-subrepos.t
diffstat 2 files changed, 167 insertions(+), 176 deletions(-) [+]
line wrap: on
line diff
deleted file mode 100644
--- a/tests/test-subrepos.out
+++ /dev/null
@@ -1,54 +0,0 @@
-Initialized empty Git repository in gitsubrepo/.git/
-
-Initialized empty Git repository in gitrepo1/.git/
-
-Cloning into 'subrepo1'...
-done.
-Cloning into 'xyz/subrepo2'...
-done.
-
-% Ensure gitlinks are transformed to .hgsubstate on hg pull from git
-importing git objects into hg
-updating to branch default
-cloning subrepo subrepo1 from git://localhost/gitsubrepo
-cloning subrepo xyz/subrepo2 from git://localhost/gitsubrepo
-4 files updated, 0 files merged, 0 files removed, 0 files unresolved
-% .hgsub shall list two [git] subrepos
-subrepo1 = [git]../gitsubrepo
-xyz/subrepo2 = [git]../gitsubrepo
-% .hgsubstate shall list two idenitcal revisions
-56f0304c5250308f14cfbafdc27bd12d40154d17 subrepo1
-56f0304c5250308f14cfbafdc27bd12d40154d17 xyz/subrepo2
-% hg status shall NOT report .hgsub and .hgsubstate as untracked - either ignored or unmodified
-
-% Check gitmodules are preserved during hg push to git
-From git://localhost/gitsubrepo
-   56f0304..aabf7cd  master     -> origin/master
-Updating 56f0304..aabf7cd
-Fast-forward
- gamma | 1 +
- 1 file changed, 1 insertion(+)
- create mode 100644 gamma
-pushing to git://localhost/gitrepo1
-exporting hg objects to git
-creating and sending data
-    default::refs/heads/master => GIT:4663c492
-% there shall be two gitlink entries, with values matching that in .hgsubstate
-160000 commit 56f0304c5250308f14cfbafdc27bd12d40154d17	subrepo1
-160000 commit aabf7cd015089aff0b84596e69aa37b24a3d090a	xyz/subrepo2
-HEAD is now at 4663c49 Update subrepo2 from hg
-
-Check .hgsub and .hgsubstate from git repository are merged, not overwritten
-pulling from git://localhost/gitrepo1
-importing git objects into hg
-(run 'hg update' to get a working copy)
-cloning subrepo hgsub from TEMPLOCATION/hgsub
-2 files updated, 0 files merged, 0 files removed, 0 files unresolved
-% pull shall bring .hgsub entry which was added to the git repo
-hgsub = TEMPLOCATION/hgsub
-subrepo1 = [git]../gitsubrepo
-xyz/subrepo2 = [git]../gitsubrepo
-% .hgsubstate shall list revision of the subrepo added through git repo
-481ec30d580f333ae3a77f94c973ce37b69d5bda hgsub
-56f0304c5250308f14cfbafdc27bd12d40154d17 subrepo1
-aabf7cd015089aff0b84596e69aa37b24a3d090a xyz/subrepo2
old mode 100755
new mode 100644
rename from tests/test-subrepos
rename to tests/test-subrepos.t
--- a/tests/test-subrepos
+++ b/tests/test-subrepos.t
@@ -1,135 +1,180 @@
-#!/bin/sh
+# Fails for some reason, need to investigate
+#   $ "$TESTDIR/hghave" git || exit 80
 
-# Fails for some reason, need to investigate
-# "$TESTDIR/hghave" git || exit 80
-
-# bail if the user does not have dulwich
+bail if the user does not have dulwich
 python -c 'import dulwich, dulwich.repo' || exit 80
 
-# bail early if the user is already running git-daemon
-echo hi | nc localhost 9418 2>/dev/null && exit 80
+bail early if the user is already running git-daemon
+  $ ! (echo hi | nc localhost 9418 2>/dev/null) || exit 80
 
-echo "[extensions]" >> $HGRCPATH
-echo "hggit=$(echo $(dirname $(dirname $0)))/hggit" >> $HGRCPATH
-echo 'hgext.bookmarks =' >> $HGRCPATH
+  $ echo "[extensions]" >> $HGRCPATH
+  $ echo "hggit=$(echo $(dirname $TESTDIR))/hggit" >> $HGRCPATH
+  $ echo 'hgext.bookmarks =' >> $HGRCPATH
 
 
-GIT_AUTHOR_NAME='test'; export GIT_AUTHOR_NAME
-GIT_AUTHOR_EMAIL='test@example.org'; export GIT_AUTHOR_EMAIL
-GIT_AUTHOR_DATE="2007-01-01 00:00:00 +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_AUTHOR_NAME='test'; export GIT_AUTHOR_NAME
+  $ GIT_AUTHOR_EMAIL='test@example.org'; export GIT_AUTHOR_EMAIL
+  $ GIT_AUTHOR_DATE="2007-01-01 00:00:00 +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
 
-count=10
-gitcommit()
-{
-    GIT_AUTHOR_DATE="2007-01-01 00:00:$count +0000"
-    GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"
-    git commit "$@" >/dev/null 2>/dev/null || echo "git commit error"
-    count=`expr $count + 1`
-}
-hgcommit()
-{
-    HGDATE="2007-01-01 00:00:$count +0000"
-    hg commit -d "$HGDATE" "$@" >/dev/null 2>/dev/null || echo "hg commit error"
-    count=`expr $count + 1`
-}
+  $ count=10
+  $ gitcommit()
+  > {
+  >     GIT_AUTHOR_DATE="2007-01-01 00:00:$count +0000"
+  >     GIT_COMMITTER_DATE="$GIT_AUTHOR_DATE"
+  >     git commit "$@" >/dev/null 2>/dev/null || echo "git commit error"
+  >     count=`expr $count + 1`
+  > }
+  $ hgcommit()
+  > {
+  >     HGDATE="2007-01-01 00:00:$count +0000"
+  >     hg commit -d "$HGDATE" "$@" >/dev/null 2>/dev/null || echo "hg commit error"
+  >     count=`expr $count + 1`
+  > }
 
 
-mkdir gitsubrepo
-cd gitsubrepo
-git init | python -c "import sys; print sys.stdin.read().replace('$(dirname $(pwd))/', '')"
-echo beta > beta
-git add beta
-gitcommit -m 'add beta'
-cd ..
+  $ mkdir gitsubrepo
+  $ cd gitsubrepo
+  $ git init | python -c "import sys; print sys.stdin.read().replace('$(dirname $(pwd))/', '')"
+  Initialized empty Git repository in gitsubrepo/.git/
+  
+  $ echo beta > beta
+  $ git add beta
+  $ gitcommit -m 'add beta'
+  $ cd ..
+
+  $ mkdir gitrepo1
+  $ cd gitrepo1
+  $ git init | python -c "import sys; print sys.stdin.read().replace('$(dirname $(pwd))/', '')"
+  Initialized empty Git repository in gitrepo1/.git/
+  
+  $ echo alpha > alpha
+  $ git add alpha
+  $ gitcommit -m 'add alpha'
+  $ git submodule add ../gitsubrepo subrepo1
+  Cloning into 'subrepo1'...
+  done.
+  $ gitcommit -m 'add subrepo1'
+  $ git submodule add ../gitsubrepo xyz/subrepo2
+  Cloning into 'xyz/subrepo2'...
+  done.
+  $ gitcommit -m 'add subrepo2'
+we are going to push to this repo from our hg clone,
+allow commits despite working copy presense
+  $ git config receive.denyCurrentBranch ignore
+  $ cd ..
+  $ echo
+  
 
-mkdir gitrepo1
-cd gitrepo1
-git init | python -c "import sys; print sys.stdin.read().replace('$(dirname $(pwd))/', '')"
-echo alpha > alpha
-git add alpha
-gitcommit -m 'add alpha'
-git submodule add ../gitsubrepo subrepo1
-gitcommit -m 'add subrepo1'
-git submodule add ../gitsubrepo xyz/subrepo2
-gitcommit -m 'add subrepo2'
-# we are going to push to this repo from our hg clone,
-# allow commits despite working copy presense
-git config receive.denyCurrentBranch ignore
-cd ..
-echo
+  $ git daemon --base-path="$(pwd)"\
+  >  --listen=localhost\
+  >  --export-all\
+  >  --pid-file="$DAEMON_PIDS" \
+  >  --detach --reuseaddr \
+  >  --enable=receive-pack
 
-git daemon --base-path="$(pwd)"\
- --listen=localhost\
- --export-all\
- --pid-file="$DAEMON_PIDS" \
- --detach --reuseaddr \
- --enable=receive-pack
-
-echo % Ensure gitlinks are transformed to .hgsubstate on hg pull from git
-hg clone git://localhost/gitrepo1 hgrepo
-cd hgrepo
-hg bookmarks -f -r default master
-# 1. Ensure gitlinks are transformed to .hgsubstate on hg <- git pull
-#    Synopsis: clone, check .hgsub and .hgsubstate are in place
-echo % .hgsub shall list two [git] subrepos
-cat .hgsub
-echo % .hgsubstate shall list two idenitcal revisions
-cat .hgsubstate
-echo % hg status shall NOT report .hgsub and .hgsubstate as untracked - either ignored or unmodified
-hg status --unknown .hgsub .hgsubstate
-hg status --modified .hgsub .hgsubstate
-cd ..
-echo
+  $ echo % Ensure gitlinks are transformed to .hgsubstate on hg pull from git
+  % Ensure gitlinks are transformed to .hgsubstate on hg pull from git
+  $ hg clone git://localhost/gitrepo1 hgrepo
+  importing git objects into hg
+  updating to branch default
+  cloning subrepo subrepo1 from git://localhost/gitsubrepo
+  cloning subrepo xyz/subrepo2 from git://localhost/gitsubrepo
+  4 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ cd hgrepo
+  $ hg bookmarks -f -r default master
+1. Ensure gitlinks are transformed to .hgsubstate on hg <- git pull
+  $ echo % .hgsub shall list two [git] subrepos
+  % .hgsub shall list two [git] subrepos
+  $ cat .hgsub
+  subrepo1 = [git]../gitsubrepo
+  xyz/subrepo2 = [git]../gitsubrepo
+  $ echo % .hgsubstate shall list two idenitcal revisions
+  % .hgsubstate shall list two idenitcal revisions
+  $ cat .hgsubstate
+  56f0304c5250308f14cfbafdc27bd12d40154d17 subrepo1
+  56f0304c5250308f14cfbafdc27bd12d40154d17 xyz/subrepo2
+  $ echo % hg status shall NOT report .hgsub and .hgsubstate as untracked - either ignored or unmodified
+  % hg status shall NOT report .hgsub and .hgsubstate as untracked - either ignored or unmodified
+  $ hg status --unknown .hgsub .hgsubstate
+  $ hg status --modified .hgsub .hgsubstate
+  $ cd ..
+  $ echo
+  
 
-# 2. Check gitmodules are preserved during hg -> git push
-#    Synopsis: modify git sumodule, update hg subrepo to this new revision,
-#    hg commit, push to git, see gitlinks are correct (preserved for subrepo1,
-#    and updated for subrepo2
-echo % Check gitmodules are preserved during hg push to git
-cd gitsubrepo
-echo gamma > gamma
-git add gamma
-gitcommit -m 'add gamma'
-cd ..
-cd hgrepo
-cd xyz/subrepo2
-git pull | sed 's/files/file/;s/insertions/insertion/;s/, 0 deletions.*//' | sed 's/|  */| /'
-cd ../..
-echo xxx >> alpha
-hg commit -m 'Update subrepo2 from hg' | grep -v "committing subrepository"
-hg push
-cd ..
-cd gitrepo1
-echo % there shall be two gitlink entries, with values matching that in .hgsubstate
-git ls-tree -r HEAD^{tree} | grep 'commit'
-# bring working copy to HEAD state (it's not bare repo)
-git reset --hard
-cd ..
-echo
+2. Check gitmodules are preserved during hg -> git push
+  $ echo % Check gitmodules are preserved during hg push to git
+  % Check gitmodules are preserved during hg push to git
+  $ cd gitsubrepo
+  $ echo gamma > gamma
+  $ git add gamma
+  $ gitcommit -m 'add gamma'
+  $ cd ..
+  $ cd hgrepo
+  $ cd xyz/subrepo2
+  $ git pull | sed 's/files/file/;s/insertions/insertion/;s/, 0 deletions.*//' | sed 's/|  */| /'
+  From git://localhost/gitsubrepo
+     56f0304..aabf7cd  master     -> origin/master
+  Updating 56f0304..aabf7cd
+  Fast-forward
+   gamma | 1 +
+   1 file changed, 1 insertion(+)
+   create mode 100644 gamma
+  $ cd ../..
+  $ echo xxx >> alpha
+  $ hg commit -m 'Update subrepo2 from hg' | grep -v "committing subrepository" || true
+  $ hg push
+  pushing to git://localhost/gitrepo1
+  exporting hg objects to git
+  creating and sending data
+      default::refs/heads/master => GIT:4663c492
+  $ cd ..
+  $ cd gitrepo1
+  $ echo % there shall be two gitlink entries, with values matching that in .hgsubstate
+  % there shall be two gitlink entries, with values matching that in .hgsubstate
+  $ git ls-tree -r HEAD^{tree} | grep 'commit'
+  160000 commit 56f0304c5250308f14cfbafdc27bd12d40154d17	subrepo1
+  160000 commit aabf7cd015089aff0b84596e69aa37b24a3d090a	xyz/subrepo2
+bring working copy to HEAD state (it's not bare repo)
+  $ git reset --hard
+  HEAD is now at 4663c49 Update subrepo2 from hg
+  $ cd ..
+  $ echo
+  
 
-# 3. Check .hgsub and .hgsubstate from git repository are merged, not overwritten
-#    Synopsis: add hg repo to become a subrepo for existing repo.
-#    Commit .hgsub and .hgsubstate in gitrepo, that point to newly added hg repo
-#    pull changes to exising hgrepo, see preserved values
-echo Check .hgsub and .hgsubstate from git repository are merged, not overwritten
-hg init hgsub
-cd hgsub
-echo delta > delta
-hg add delta
-hgcommit -m "add delta"
-echo "`hg tip --template '{node}'` hgsub" > ../gitrepo1/.hgsubstate
-echo "hgsub = $(pwd)" > ../gitrepo1/.hgsub
-cd ../gitrepo1
-git add .hgsubstate .hgsub
-gitcommit -m "Test3. Prepare .hgsub and .hgsubstate sources"
-cd ../hgrepo
-hg pull
-hg checkout -C  | sed "s_$(dirname $(pwd))_TEMPLOCATION_"
-cd ..
-echo % pull shall bring .hgsub entry which was added to the git repo
-cat hgrepo/.hgsub | sed "s_$(pwd)_TEMPLOCATION_"
-echo % .hgsubstate shall list revision of the subrepo added through git repo
-cat hgrepo/.hgsubstate | sed "s_$(pwd)_TEMPLOCATION_"
+3. Check .hgsub and .hgsubstate from git repository are merged, not overwritten
+  $ echo Check .hgsub and .hgsubstate from git repository are merged, not overwritten
+  Check .hgsub and .hgsubstate from git repository are merged, not overwritten
+  $ hg init hgsub
+  $ cd hgsub
+  $ echo delta > delta
+  $ hg add delta
+  $ hgcommit -m "add delta"
+  $ echo "`hg tip --template '{node}'` hgsub" > ../gitrepo1/.hgsubstate
+  $ echo "hgsub = $(pwd)" > ../gitrepo1/.hgsub
+  $ cd ../gitrepo1
+  $ git add .hgsubstate .hgsub
+  $ gitcommit -m "Test3. Prepare .hgsub and .hgsubstate sources"
+  $ cd ../hgrepo
+  $ hg pull
+  pulling from git://localhost/gitrepo1
+  importing git objects into hg
+  (run 'hg update' to get a working copy)
+  $ hg checkout -C  | sed "s_$(dirname $(pwd))_TEMPLOCATION_"
+  cloning subrepo hgsub from TEMPLOCATION/hgsub
+  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  $ cd ..
+  $ echo % pull shall bring .hgsub entry which was added to the git repo
+  % pull shall bring .hgsub entry which was added to the git repo
+  $ cat hgrepo/.hgsub | sed "s_$(pwd)_TEMPLOCATION_"
+  hgsub = TEMPLOCATION/hgsub
+  subrepo1 = [git]../gitsubrepo
+  xyz/subrepo2 = [git]../gitsubrepo
+  $ echo % .hgsubstate shall list revision of the subrepo added through git repo
+  % .hgsubstate shall list revision of the subrepo added through git repo
+  $ cat hgrepo/.hgsubstate | sed "s_$(pwd)_TEMPLOCATION_"
+  481ec30d580f333ae3a77f94c973ce37b69d5bda hgsub
+  56f0304c5250308f14cfbafdc27bd12d40154d17 subrepo1
+  aabf7cd015089aff0b84596e69aa37b24a3d090a xyz/subrepo2