Mercurial > hg > hg-git

changeset 294:29e342590c11

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: many, many changes so we never push into a checked-out ref
author Augie Fackler <durin42@gmail.com>
date Thu, 25 Mar 2010 19:54:00 -0500
parents 8aaae306d46f
children 6fcd798efd69
files tests/test-empty-working-tree tests/test-empty-working-tree.out tests/test-encoding tests/test-encoding.out tests/test-file-removal tests/test-file-removal.out tests/test-hg-author tests/test-hg-author.out tests/test-hg-branch tests/test-hg-branch.out tests/test-hg-tags tests/test-hg-tags.out tests/test-merge tests/test-merge.out tests/test-octopus tests/test-octopus.out tests/test-push tests/test-push.out tests/test-tree-decomposition tests/test-tree-decomposition.out
diffstat 20 files changed, 87 insertions(+), 21 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-empty-working-tree
+++ b/tests/test-empty-working-tree
@@ -13,6 +13,12 @@
 echo "hggit=$(echo $(dirname $(dirname $0)))/hggit" >> $HGRCPATH
 echo 'hgext.bookmarks =' >> $HGRCPATH
 
+cat >> $HGRCPATH <<EOF
+
+[bookmarks]
+track.current = True
+EOF
+
 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
@@ -29,7 +35,7 @@
 cd ..
 mkdir gitrepo2
 cd gitrepo2
-git init | python -c "import sys; print sys.stdin.read().replace('$(dirname $(pwd))/', '')"
+git init --bare | python -c "import sys; print sys.stdin.read().replace('$(dirname $(pwd))/', '')"
 
 # dulwich does not presently support local git repos, workaround
 cd ..
--- a/tests/test-empty-working-tree.out
+++ b/tests/test-empty-working-tree.out
@@ -1,6 +1,6 @@
 Initialized empty Git repository in gitrepo/.git/
 
-Initialized empty Git repository in gitrepo2/.git/
+Initialized empty Git repository in gitrepo2/
 
 importing Hg objects into Git
 Counting objects: 2, done.
--- a/tests/test-encoding
+++ b/tests/test-encoding
@@ -46,7 +46,7 @@
 cd ..
 mkdir gitrepo2
 cd gitrepo2
-git init | python -c "import sys; print sys.stdin.read().replace('$(dirname $(pwd))/', '')"
+git init --bare | python -c "import sys; print sys.stdin.read().replace('$(dirname $(pwd))/', '')"
 
 # dulwich does not presently support local git repos, workaround
 cd ..
--- a/tests/test-encoding.out
+++ b/tests/test-encoding.out
@@ -6,7 +6,7 @@
 Warning: commit message does not conform to UTF-8.
 You may want to amend it after fixing the message, or set the config
 variable i18n.commitencoding to the encoding your project uses.
-Initialized empty Git repository in gitrepo2/.git/
+Initialized empty Git repository in gitrepo2/
 
 importing Hg objects into Git
 Counting objects: 12, done.
--- a/tests/test-file-removal
+++ b/tests/test-file-removal
@@ -53,7 +53,7 @@
 cd ..
 mkdir gitrepo2
 cd gitrepo2
-git init | python -c "import sys; print sys.stdin.read().replace('$(dirname $(pwd))/', '')"
+git init --bare | python -c "import sys; print sys.stdin.read().replace('$(dirname $(pwd))/', '')"
 
 # dulwich does not presently support local git repos, workaround
 cd ..
--- a/tests/test-file-removal.out
+++ b/tests/test-file-removal.out
@@ -4,7 +4,7 @@
 rm 'foo/bar'
 % final manifest in git is just beta
 beta
-Initialized empty Git repository in gitrepo2/.git/
+Initialized empty Git repository in gitrepo2/
 
 importing Hg objects into Git
 Counting objects: 14, done.
--- a/tests/test-hg-author
+++ b/tests/test-hg-author
@@ -14,6 +14,13 @@
 echo 'hgext.graphlog =' >> $HGRCPATH
 echo 'hgext.bookmarks =' >> $HGRCPATH
 
+cat >> $HGRCPATH <<EOF
+
+[bookmarks]
+track.current = True
+EOF
+
+
 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
@@ -43,6 +50,7 @@
 echo alpha > alpha
 git add alpha
 commit -m "add alpha"
+git checkout -b not-master
 
 # dulwich does not presently support local git repos, workaround
 cd ..
@@ -56,6 +64,7 @@
 hg clone git://localhost/gitrepo hgrepo | grep -v '^updating'
 
 cd hgrepo
+hg co master
 echo beta > beta
 hg add beta
 hgcommit -u "test" -m 'add beta'
--- a/tests/test-hg-author.out
+++ b/tests/test-hg-author.out
@@ -1,17 +1,21 @@
 Initialized empty Git repository in gitrepo/.git/
 
+Switched to a new branch 'not-master'
 importing Hg objects into Git
 Counting objects: 3, done.
 Total 3 (delta 0), reused 0 (delta 0)
 importing Git objects into Hg
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 pushing to git://localhost/gitrepo
 importing Hg objects into Git
 creating and sending data
+    default::refs/heads/not-master => GIT:7eeab2ea
     default::refs/heads/master => GIT:cffa0e8d
 pushing to git://localhost/gitrepo
 importing Hg objects into Git
 creating and sending data
+    default::refs/heads/not-master => GIT:7eeab2ea
     default::refs/heads/master => GIT:2b9ec6a4
 @  changeset:   2:92d33c0dd6e1
 |  tag:         master
@@ -27,6 +31,8 @@
 |  summary:     add beta
 |
 o  changeset:   0:3442585be8a6
+   tag:         not-master
+   tag:         default/not-master
    user:        test <test@example.org>
    date:        Mon Jan 01 00:00:10 2007 +0000
    summary:     add alpha
@@ -51,6 +57,8 @@
 |  summary:     add beta
 |
 o  changeset:   0:3442585be8a6
+   tag:         not-master
+   tag:         default/not-master
    user:        test <test@example.org>
    date:        Mon Jan 01 00:00:10 2007 +0000
    summary:     add alpha
--- a/tests/test-hg-branch
+++ b/tests/test-hg-branch
@@ -13,6 +13,11 @@
 echo "hggit=$(echo $(dirname $(dirname $0)))/hggit" >> $HGRCPATH
 echo 'hgext.graphlog =' >> $HGRCPATH
 echo 'hgext.bookmarks =' >> $HGRCPATH
+cat >> $HGRCPATH <<EOF
+
+[bookmarks]
+track.current = True
+EOF
 
 GIT_AUTHOR_NAME='test'; export GIT_AUTHOR_NAME
 GIT_AUTHOR_EMAIL='test@example.org'; export GIT_AUTHOR_EMAIL
@@ -43,6 +48,7 @@
 echo alpha > alpha
 git add alpha
 commit -m "add alpha"
+git checkout -b not-master
 
 # dulwich does not presently support local git repos, workaround
 cd ..
@@ -56,6 +62,7 @@
 hg clone git://localhost/gitrepo hgrepo | grep -v '^updating'
 
 cd hgrepo
+hg co master
 hg mv alpha beta
 hgcommit -m 'rename alpha to beta'
 hg push
--- a/tests/test-hg-branch.out
+++ b/tests/test-hg-branch.out
@@ -1,20 +1,24 @@
 Initialized empty Git repository in gitrepo/.git/
 
+Switched to a new branch 'not-master'
 importing Hg objects into Git
 Counting objects: 3, done.
 Total 3 (delta 0), reused 0 (delta 0)
 importing Git objects into Hg
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 pushing to git://localhost/gitrepo
 importing Hg objects into Git
 creating and sending data
+    default::refs/heads/not-master => GIT:7eeab2ea
     default::refs/heads/master => GIT:05c2bcbe
 marked working directory as branch gamma
 pushing to git://localhost/gitrepo
 importing Hg objects into Git
 creating and sending data
+    default::refs/heads/not-master => GIT:7eeab2ea
     default::refs/heads/master => GIT:296802ef
-@  changeset:   2:698615204564
+@  changeset:   2:d93a72262a83
 |  branch:      gamma
 |  tag:         master
 |  tag:         default/master
@@ -23,12 +27,14 @@
 |  date:        Mon Jan 01 00:00:12 2007 +0000
 |  summary:     started branch gamma
 |
-o  changeset:   1:71414c4e3c6f
+o  changeset:   1:a31e374801c9
 |  user:        test
 |  date:        Mon Jan 01 00:00:11 2007 +0000
 |  summary:     rename alpha to beta
 |
 o  changeset:   0:3442585be8a6
+   tag:         not-master
+   tag:         default/not-master
    user:        test <test@example.org>
    date:        Mon Jan 01 00:00:10 2007 +0000
    summary:     add alpha
@@ -39,7 +45,7 @@
 Total 6 (delta 0), reused 0 (delta 0)
 importing Git objects into Hg
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-o  changeset:   2:698615204564
+o  changeset:   2:d93a72262a83
 |  branch:      gamma
 |  tag:         master
 |  tag:         default/master
@@ -48,12 +54,14 @@
 |  date:        Mon Jan 01 00:00:12 2007 +0000
 |  summary:     started branch gamma
 |
-@  changeset:   1:71414c4e3c6f
+@  changeset:   1:a31e374801c9
 |  user:        test
 |  date:        Mon Jan 01 00:00:11 2007 +0000
 |  summary:     rename alpha to beta
 |
 o  changeset:   0:3442585be8a6
+   tag:         not-master
+   tag:         default/not-master
    user:        test <test@example.org>
    date:        Mon Jan 01 00:00:10 2007 +0000
    summary:     add alpha
--- a/tests/test-hg-tags
+++ b/tests/test-hg-tags
@@ -14,6 +14,12 @@
 echo 'hgext.graphlog =' >> $HGRCPATH
 echo 'hgext.bookmarks =' >> $HGRCPATH
 
+cat >> $HGRCPATH <<EOF
+
+[bookmarks]
+track.current = True
+EOF
+
 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
@@ -43,6 +49,7 @@
 echo alpha > alpha
 git add alpha
 commit -m "add alpha"
+git checkout -b not-master
 
 # dulwich does not presently support local git repos, workaround
 cd ..
@@ -56,6 +63,7 @@
 hg clone git://localhost/gitrepo hgrepo | grep -v '^updating'
 
 cd hgrepo
+hg co master
 hgtag alpha
 hg push
 
--- a/tests/test-hg-tags.out
+++ b/tests/test-hg-tags.out
@@ -1,25 +1,30 @@
 Initialized empty Git repository in gitrepo/.git/
 
+Switched to a new branch 'not-master'
 importing Hg objects into Git
 Counting objects: 3, done.
 Total 3 (delta 0), reused 0 (delta 0)
 importing Git objects into Hg
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 pushing to git://localhost/gitrepo
 importing Hg objects into Git
 creating and sending data
+    default::refs/heads/not-master => GIT:7eeab2ea
     default::refs/tags/alpha => GIT:7eeab2ea
     default::refs/heads/master => GIT:9a2616b9
 @  changeset:   1:d529e9229f6d
+|  tag:         master
 |  tag:         default/master
 |  tag:         tip
-|  tag:         master
 |  user:        test
 |  date:        Mon Jan 01 00:00:11 2007 +0000
 |  summary:     Added tag alpha for changeset 3442585be8a6
 |
 o  changeset:   0:3442585be8a6
+   tag:         not-master
    tag:         alpha
+   tag:         default/not-master
    user:        test <test@example.org>
    date:        Mon Jan 01 00:00:10 2007 +0000
    summary:     add alpha
@@ -33,15 +38,17 @@
 importing Git objects into Hg
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 @  changeset:   1:d529e9229f6d
+|  tag:         master
 |  tag:         default/master
 |  tag:         tip
-|  tag:         master
 |  user:        test
 |  date:        Mon Jan 01 00:00:11 2007 +0000
 |  summary:     Added tag alpha for changeset 3442585be8a6
 |
 o  changeset:   0:3442585be8a6
+   tag:         not-master
    tag:         alpha
+   tag:         default/not-master
    user:        test <test@example.org>
    date:        Mon Jan 01 00:00:10 2007 +0000
    summary:     add alpha
--- a/tests/test-merge
+++ b/tests/test-merge
@@ -53,7 +53,7 @@
 cd ..
 mkdir gitrepo2
 cd gitrepo2
-git init | python -c "import sys; print sys.stdin.read().replace('$(dirname $(pwd))/', '')"
+git init --bare | python -c "import sys; print sys.stdin.read().replace('$(dirname $(pwd))/', '')"
 
 # dulwich does not presently support local git repos, workaround
 cd ..
--- a/tests/test-merge.out
+++ b/tests/test-merge.out
@@ -6,7 +6,7 @@
  beta |    1 +
  1 files changed, 1 insertions(+), 0 deletions(-)
  create mode 100644 beta
-Initialized empty Git repository in gitrepo2/.git/
+Initialized empty Git repository in gitrepo2/
 
 importing Hg objects into Git
 Counting objects: 11, done.
--- a/tests/test-octopus
+++ b/tests/test-octopus
@@ -58,7 +58,7 @@
 cd ..
 mkdir gitrepo2
 cd gitrepo2
-git init | python -c "import sys; print sys.stdin.read().replace('$(dirname $(pwd))/', '')"
+git init --bare | python -c "import sys; print sys.stdin.read().replace('$(dirname $(pwd))/', '')"
 
 # dulwich does not presently support local git repos, workaround
 cd ..
--- a/tests/test-octopus.out
+++ b/tests/test-octopus.out
@@ -11,7 +11,7 @@
  2 files changed, 2 insertions(+), 0 deletions(-)
  create mode 100644 beta
  create mode 100644 gamma
-Initialized empty Git repository in gitrepo2/.git/
+Initialized empty Git repository in gitrepo2/
 
 importing Hg objects into Git
 Counting objects: 14, done.
--- a/tests/test-push
+++ b/tests/test-push
@@ -14,6 +14,7 @@
 echo 'hgext.graphlog =' >> $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
@@ -43,6 +44,7 @@
 echo alpha > alpha
 git add alpha
 commit -m "add alpha"
+git checkout -b not-master 2>&1 | sed s/\'/\"/g
 
 # dulwich does not presently support local git repos, workaround
 cd ..
@@ -79,6 +81,7 @@
 echo delta > delta
 git add delta
 commit -m "add delta"
+git checkout not-master 2>&1 | sed s/\'/\"/g
 
 cd ..
 
@@ -90,6 +93,9 @@
 hg push -fr master
 
 hg pull
+# TODO shouldn't need to do this since we're (in theory) pushing master explicitly,
+# which should not implicitly also push the not-master ref.
+hg book not-master -r default/not-master --force
 echo % master and default/master should be diferent
 hg tags
 
--- a/tests/test-push.out
+++ b/tests/test-push.out
@@ -1,5 +1,6 @@
 Initialized empty Git repository in gitrepo/.git/
 
+Switched to a new branch "not-master"
 importing Hg objects into Git
 Counting objects: 3, done.
 Total 3 (delta 0), reused 0 (delta 0)
@@ -9,12 +10,15 @@
 importing Hg objects into Git
 creating and sending data
     default::refs/heads/beta => GIT:cffa0e8d
+    default::refs/heads/not-master => GIT:7eeab2ea
     default::refs/heads/master => GIT:7eeab2ea
 % should have two different branches
-  beta   cffa0e8 add beta
-* master 7eeab2e add alpha
+  beta       cffa0e8 add beta
+  master     7eeab2e add alpha
+* not-master 7eeab2e add alpha
 % some more work on master from git
-Already on "master"
+Switched to branch "master"
+Switched to branch "not-master"
 % this should fail
 pushing to git://localhost/gitrepo
 importing Hg objects into Git
@@ -38,6 +42,8 @@
 master                             2:72f56395749d
 default/beta                       1:0564f526fb0f
 beta                               1:0564f526fb0f
+not-master                         0:3442585be8a6
+default/not-master                 0:3442585be8a6
 % this should also fail
 pushing to git://localhost/gitrepo
 importing Hg objects into Git
@@ -48,4 +54,5 @@
 importing Hg objects into Git
 creating and sending data
     default::refs/heads/beta => GIT:cffa0e8d
+    default::refs/heads/not-master => GIT:7eeab2ea
     default::refs/heads/master => GIT:cc119202
--- a/tests/test-tree-decomposition
+++ b/tests/test-tree-decomposition
@@ -52,7 +52,7 @@
 cd ..
 mkdir gitrepo2
 cd gitrepo2
-git init | python -c "import sys; print sys.stdin.read().replace('$(dirname $(pwd))/', '')"
+git init --bare | python -c "import sys; print sys.stdin.read().replace('$(dirname $(pwd))/', '')"
 
 # dulwich does not presently support local git repos, workaround
 cd ..
--- a/tests/test-tree-decomposition.out
+++ b/tests/test-tree-decomposition.out
@@ -1,6 +1,6 @@
 Initialized empty Git repository in gitrepo/.git/
 
-Initialized empty Git repository in gitrepo2/.git/
+Initialized empty Git repository in gitrepo2/
 
 importing Hg objects into Git
 Counting objects: 12, done.