Mercurial > hg > hg-git

changeset 390:3f0f0c64f81c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: cope with output format changes in hg 1.8 These test changes should make it easier to see what's still broken in 1.8 and 1.9. Ideally, we'll drop pre-1.8 versions soon and rip most of this out, but I'm not sure how realistic that is in the short term.
author Augie Fackler <durin42@gmail.com>
date Sun, 15 May 2011 17:04:05 -0500
parents 5fdff9b8e742
children 9b6597b70839
files tests/test-encoding tests/test-encoding.out tests/test-file-removal tests/test-file-removal.out tests/test-git-clone tests/test-git-clone.out tests/test-git-submodules tests/test-git-submodules.out tests/test-git-tags tests/test-git-tags.out tests/test-git-workflow tests/test-git-workflow.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-octopus tests/test-octopus.out tests/test-pull tests/test-pull-after-strip tests/test-pull-after-strip.out tests/test-pull.out tests/test-push tests/test-push.out tests/test-sane-without-bookmarks
diffstat 27 files changed, 56 insertions(+), 94 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-encoding
+++ b/tests/test-encoding
@@ -60,7 +60,7 @@
 hg clone git://localhost/gitrepo hgrepo | grep -v '^updating'
 cd hgrepo
 
-HGENCODING=utf-8 hg log --graph --debug
+HGENCODING=utf-8 hg log --graph --debug | grep -v ': *master'
 
 hg gclear
 hg push git://localhost/gitrepo2
--- a/tests/test-encoding.out
+++ b/tests/test-encoding.out
@@ -16,7 +16,6 @@
 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
 @  changeset:   3:8549ee7fe0801b2dafc06047ca6f66d36da709f5
 |  tag:         default/master
-|  tag:         master
 |  tag:         tip
 |  parent:      2:0422fbb4ec39fb69e87b94a3874ac890333de11a
 |  parent:      -1:0000000000000000000000000000000000000000
--- a/tests/test-file-removal
+++ b/tests/test-file-removal
@@ -66,7 +66,7 @@
 
 hg clone git://localhost/gitrepo hgrepo | grep -v '^updating'
 cd hgrepo
-hg log --graph
+hg log --graph | grep -v ': *master'
 
 echo
 echo % make sure alpha is not in this manifest
--- a/tests/test-file-removal.out
+++ b/tests/test-file-removal.out
@@ -14,7 +14,6 @@
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 @  changeset:   4:ea41a3f0ed10
 |  tag:         default/master
-|  tag:         master
 |  tag:         tip
 |  user:        test <test@example.org>
 |  date:        Mon Jan 01 00:00:14 2007 +0000
--- a/tests/test-git-clone
+++ b/tests/test-git-clone
@@ -44,7 +44,7 @@
 
 hg clone gitrepo hgrepo | grep -v '^updating'
 cd hgrepo
-hg log --graph
+hg log --graph  | grep -v ': *master'
 
 echo % we should have some bookmarks
 hg book
--- a/tests/test-git-clone.out
+++ b/tests/test-git-clone.out
@@ -8,7 +8,6 @@
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 @  changeset:   1:7bcd915dc873
 |  tag:         default/master
-|  tag:         master
 |  tag:         tip
 |  user:        test <test@example.org>
 |  date:        Mon Jan 01 00:00:11 2007 +0000
--- a/tests/test-git-submodules
+++ b/tests/test-git-submodules
@@ -66,7 +66,7 @@
 
 hg clone gitrepo2 hgrepo | grep -v '^updating'
 cd hgrepo
-hg log --graph
+hg log --graph  | grep -v ': *master'
 
 echo % we should have some bookmarks
 hg book
--- a/tests/test-git-submodules.out
+++ b/tests/test-git-submodules.out
@@ -24,7 +24,6 @@
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 @  changeset:   2:954cdf1c8c82
 |  tag:         default/master
-|  tag:         master
 |  tag:         tip
 |  user:        test <test@example.org>
 |  date:        Mon Jan 01 00:00:11 2007 +0000
--- a/tests/test-git-tags
+++ b/tests/test-git-tags
@@ -63,7 +63,7 @@
 hg clone git://localhost/gitrepo hgrepo | grep -v '^updating'
 
 cd hgrepo
-hg log --graph
+hg log --graph  | grep -v ': *master'
 echo beta-fix >> beta
 hg commit -m 'fix for beta'
 hg push
--- a/tests/test-git-tags.out
+++ b/tests/test-git-tags.out
@@ -9,7 +9,6 @@
 @  changeset:   1:99dcc15b7b07
 |  tag:         beta
 |  tag:         default/master
-|  tag:         master
 |  tag:         tip
 |  user:        test <test@example.org>
 |  date:        Mon Jan 01 00:00:12 2007 +0000
--- a/tests/test-git-workflow
+++ b/tests/test-git-workflow
@@ -43,7 +43,7 @@
 echo alpha > alpha
 hg add alpha
 hgcommit -m "add alpha"
-hg glog --debug
+hg log --graph --debug
 
 cd ..
 
@@ -65,4 +65,5 @@
 
 echo % get things back to hg
 hg gimport
-hg glog --debug
+hg log --graph --debug | grep -v ': *master'
+hg bookmarks
--- a/tests/test-git-workflow.out
+++ b/tests/test-git-workflow.out
@@ -21,7 +21,6 @@
 % get things back to hg
 importing Git objects into Hg
 o  changeset:   1:7108ae7bd184226a29b8203619a8253d314643bf
-|  tag:         master
 |  tag:         tip
 |  parent:      0:0221c246a56712c6aa64e5ee382244d8a471b1e2
 |  parent:      -1:0000000000000000000000000000000000000000
@@ -46,3 +45,4 @@
    add alpha
 
 
+   master                    1:7108ae7bd184
--- a/tests/test-hg-author
+++ b/tests/test-hg-author
@@ -74,11 +74,11 @@
 hgcommit -u "test <test@example.com> (comment)" -m 'modify beta'
 hg push
 
-hg log --graph
+hg log --graph | egrep -v ': *(not-master|master)'
 
 cd ..
 hg clone git://localhost/gitrepo hgrepo2 | grep -v '^updating'
 cd hgrepo2
-hg log --graph
+hg log --graph | egrep -v ': *(not-master|master)'
 
 cd ..
--- a/tests/test-hg-author.out
+++ b/tests/test-hg-author.out
@@ -19,7 +19,6 @@
     default::refs/heads/master => GIT:2b9ec6a4
 @  changeset:   2:92d33c0dd6e1
 |  tag:         default/master
-|  tag:         master
 |  tag:         tip
 |  user:        test <test@example.com> (comment)
 |  date:        Mon Jan 01 00:00:12 2007 +0000
@@ -32,7 +31,6 @@
 |
 o  changeset:   0:3442585be8a6
    tag:         default/not-master
-   tag:         not-master
    user:        test <test@example.org>
    date:        Mon Jan 01 00:00:10 2007 +0000
    summary:     add alpha
@@ -45,7 +43,6 @@
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 @  changeset:   2:92d33c0dd6e1
 |  tag:         default/master
-|  tag:         master
 |  tag:         tip
 |  user:        test <test@example.com> (comment)
 |  date:        Mon Jan 01 00:00:12 2007 +0000
@@ -58,7 +55,6 @@
 |
 o  changeset:   0:3442585be8a6
    tag:         default/not-master
-   tag:         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
@@ -28,6 +28,7 @@
 
 # TODO stop using this when we're 1.5 only
 filterhash="sed s/71414c4e3c6f/a31e374801c9/;s/698615204564/d93a72262a83/"
+filterhash="$filterhash;s/d93a72262a83/05aed681ccb3/"
 
 count=10
 commit()
@@ -74,11 +75,11 @@
 hgcommit -m 'started branch gamma'
 hg push
 
-hg log --graph | $filterhash
+hg log --graph | $filterhash | egrep -v ': *(not-master|master)'
 
 cd ..
 hg clone git://localhost/gitrepo hgrepo2 | grep -v '^updating'
 cd hgrepo2
-hg log --graph | $filterhash
+hg log --graph | $filterhash | egrep -v ': *(not-master|master)'
 
 cd ..
--- a/tests/test-hg-branch.out
+++ b/tests/test-hg-branch.out
@@ -18,10 +18,9 @@
 creating and sending data
     default::refs/heads/not-master => GIT:7eeab2ea
     default::refs/heads/master => GIT:296802ef
-@  changeset:   2:d93a72262a83
+@  changeset:   2:05aed681ccb3
 |  branch:      gamma
 |  tag:         default/master
-|  tag:         master
 |  tag:         tip
 |  user:        test
 |  date:        Mon Jan 01 00:00:12 2007 +0000
@@ -34,7 +33,6 @@
 |
 o  changeset:   0:3442585be8a6
    tag:         default/not-master
-   tag:         not-master
    user:        test <test@example.org>
    date:        Mon Jan 01 00:00:10 2007 +0000
    summary:     add alpha
@@ -45,10 +43,9 @@
 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:d93a72262a83
+o  changeset:   2:05aed681ccb3
 |  branch:      gamma
 |  tag:         default/master
-|  tag:         master
 |  tag:         tip
 |  user:        test
 |  date:        Mon Jan 01 00:00:12 2007 +0000
@@ -61,7 +58,6 @@
 |
 o  changeset:   0:3442585be8a6
    tag:         default/not-master
-   tag:         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
@@ -67,7 +67,7 @@
 hgtag alpha
 hg push
 
-hg log --graph
+hg log --graph | egrep -v ': *(not-master|master)'
 
 cd ..
 cd gitrepo
@@ -77,7 +77,7 @@
 cd ..
 hg clone git://localhost/gitrepo hgrepo2 | grep -v '^updating'
 cd hgrepo2
-hg log --graph
+hg log --graph | egrep -v ': *(not-master|master)'
 
 echo % the tag should be in .hgtags
 cat .hgtags
--- a/tests/test-hg-tags.out
+++ b/tests/test-hg-tags.out
@@ -15,7 +15,6 @@
     default::refs/heads/master => GIT:9a2616b9
 @  changeset:   1:d529e9229f6d
 |  tag:         default/master
-|  tag:         master
 |  tag:         tip
 |  user:        test
 |  date:        Mon Jan 01 00:00:11 2007 +0000
@@ -24,7 +23,6 @@
 o  changeset:   0:3442585be8a6
    tag:         alpha
    tag:         default/not-master
-   tag:         not-master
    user:        test <test@example.org>
    date:        Mon Jan 01 00:00:10 2007 +0000
    summary:     add alpha
@@ -39,7 +37,6 @@
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 @  changeset:   1:d529e9229f6d
 |  tag:         default/master
-|  tag:         master
 |  tag:         tip
 |  user:        test
 |  date:        Mon Jan 01 00:00:11 2007 +0000
@@ -48,7 +45,6 @@
 o  changeset:   0:3442585be8a6
    tag:         alpha
    tag:         default/not-master
-   tag:         not-master
    user:        test <test@example.org>
    date:        Mon Jan 01 00:00:10 2007 +0000
    summary:     add alpha
--- a/tests/test-octopus
+++ b/tests/test-octopus
@@ -71,7 +71,7 @@
 
 hg clone git://localhost/gitrepo hgrepo | grep -v '^updating'
 cd hgrepo
-hg log --graph
+hg log --graph --style compact | sed 's/\[.*\]//g'
 
 hg gclear
 hg push git://localhost/gitrepo2
--- a/tests/test-octopus.out
+++ b/tests/test-octopus.out
@@ -19,48 +19,23 @@
 Total 14 (delta 3), reused 0 (delta 0)
 importing Git objects into Hg
 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
-@    changeset:   5:6523aa9f4775
-|\   tag:         default/master
-| |  tag:         master
-| |  tag:         tip
-| |  parent:      3:1436150b86c2
-| |  parent:      4:7f6c791a169f
-| |  user:        test <test@example.org>
-| |  date:        Mon Jan 01 00:00:13 2007 +0000
-| |  summary:     Merge branches 'branch1' and 'branch2'
+@    5:3,4   6523aa9f4775   2007-01-01 00:00 +0000   test
+|\     Merge branches 'branch1' and 'branch2'
 | |
-| o    changeset:   4:7f6c791a169f
-| |\   parent:      1:7bcd915dc873
-| | |  parent:      2:37c124f2d0a0
-| | |  user:        test <test@example.org>
-| | |  date:        Mon Jan 01 00:00:13 2007 +0000
-| | |  summary:     Merge branches 'branch1' and 'branch2'
+| o    4:1,2   7f6c791a169f   2007-01-01 00:00 +0000   test
+| |\     Merge branches 'branch1' and 'branch2'
+| | |
+o | |  3:0   1436150b86c2   2007-01-01 00:00 +0000   test
+| | |    add delta
 | | |
-o | |  changeset:   3:1436150b86c2
-| | |  parent:      0:3442585be8a6
-| | |  user:        test <test@example.org>
-| | |  date:        Mon Jan 01 00:00:13 2007 +0000
-| | |  summary:     add delta
-| | |
-+---o  changeset:   2:37c124f2d0a0
-| |    tag:         branch2
-| |    tag:         default/branch2
-| |    parent:      0:3442585be8a6
-| |    user:        test <test@example.org>
-| |    date:        Mon Jan 01 00:00:12 2007 +0000
-| |    summary:     add gamma
++---o  2:0   37c124f2d0a0   2007-01-01 00:00 +0000   test
+| |      add gamma
 | |
-| o  changeset:   1:7bcd915dc873
-|/   tag:         branch1
-|    tag:         default/branch1
-|    user:        test <test@example.org>
-|    date:        Mon Jan 01 00:00:11 2007 +0000
-|    summary:     add beta
+| o  1   7bcd915dc873   2007-01-01 00:00 +0000   test
+|/     add beta
 |
-o  changeset:   0:3442585be8a6
-   user:        test <test@example.org>
-   date:        Mon Jan 01 00:00:10 2007 +0000
-   summary:     add alpha
+o  0   3442585be8a6   2007-01-01 00:00 +0000   test
+     add alpha
 
 clearing out the git cache data
 pushing to git://localhost/gitrepo2
--- a/tests/test-pull
+++ b/tests/test-pull
@@ -55,13 +55,13 @@
 echo % clone a tag
 hg clone -r alpha git://localhost/gitrepo hgrepo-a | grep -v '^updating'
 cd hgrepo-a
-hg log --graph
+hg log --graph | egrep -v ': *(beta|master)'
 
 cd ..
 echo % clone a branch
 hg clone -r beta git://localhost/gitrepo hgrepo-b | grep -v '^updating'
 cd hgrepo-b
-hg log --graph
+hg log --graph | egrep -v ': *(beta|master)'
 
 
 cd ..
--- a/tests/test-pull-after-strip
+++ b/tests/test-pull-after-strip
@@ -70,13 +70,13 @@
 echo % clone a tag
 hg clone -r alpha git://localhost/gitrepo hgrepo-a | grep -v '^updating'
 cd hgrepo-a
-hg log --graph
+hg log --graph | egrep -v ': *(beta|master)'
 
 cd ..
 echo % clone a branch
 hg clone -r beta git://localhost/gitrepo hgrepo-b | grep -v '^updating'
 cd hgrepo-b
-hg log --graph
+hg log --graph | egrep -v ': *(beta|master)'
 cd ..
 
 cd gitrepo
@@ -91,6 +91,6 @@
 hg git-cleanup
 echo % pull works after \'hg git-cleanup\'
 hg pull -r beta
-hg log --graph
+hg log --graph | egrep -v ': *(beta|master)'
 
 cd ..
--- a/tests/test-pull-after-strip.out
+++ b/tests/test-pull-after-strip.out
@@ -10,7 +10,6 @@
 @  changeset:   0:3442585be8a6
    tag:         alpha
    tag:         default/master
-   tag:         master
    tag:         tip
    user:        test <test@example.org>
    date:        Mon Jan 01 00:00:10 2007 +0000
@@ -24,7 +23,6 @@
 importing Git objects into Hg
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 @  changeset:   1:7bcd915dc873
-|  tag:         beta
 |  tag:         default/beta
 |  tag:         tip
 |  user:        test <test@example.org>
@@ -34,7 +32,6 @@
 o  changeset:   0:3442585be8a6
    tag:         alpha
    tag:         default/master
-   tag:         master
    user:        test <test@example.org>
    date:        Mon Jan 01 00:00:10 2007 +0000
    summary:     add alpha
@@ -57,9 +54,7 @@
 importing Git objects into Hg
 (run 'hg update' to get a working copy)
 o  changeset:   2:611948b1ec6a
-|  tag:         beta
 |  tag:         default/beta
-|  tag:         master
 |  tag:         tip
 |  user:        test <test@example.org>
 |  date:        Mon Jan 01 00:00:12 2007 +0000
--- a/tests/test-pull.out
+++ b/tests/test-pull.out
@@ -10,7 +10,6 @@
 @  changeset:   0:3442585be8a6
    tag:         alpha
    tag:         default/master
-   tag:         master
    tag:         tip
    user:        test <test@example.org>
    date:        Mon Jan 01 00:00:10 2007 +0000
@@ -24,7 +23,6 @@
 importing Git objects into Hg
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 @  changeset:   1:7bcd915dc873
-|  tag:         beta
 |  tag:         default/beta
 |  tag:         tip
 |  user:        test <test@example.org>
@@ -34,7 +32,6 @@
 o  changeset:   0:3442585be8a6
    tag:         alpha
    tag:         default/master
-   tag:         master
    user:        test <test@example.org>
    date:        Mon Jan 01 00:00:10 2007 +0000
    summary:     add alpha
--- a/tests/test-push
+++ b/tests/test-push
@@ -97,7 +97,8 @@
 # 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
+hg log -r master | grep -v ': *master'
+hg log -r default/master
 
 echo % this should also fail
 hg push -r master
--- a/tests/test-push.out
+++ b/tests/test-push.out
@@ -37,13 +37,19 @@
 importing Git objects into Hg
 (run 'hg update' to get a working copy)
 % master and default/master should be diferent
-tip                                3:1436150b86c2
-default/master                     3:1436150b86c2
-master                             2:72f56395749d
-default/beta                       1:0564f526fb0f
-beta                               1:0564f526fb0f
-not-master                         0:3442585be8a6
-default/not-master                 0:3442585be8a6
+changeset:   2:72f56395749d
+user:        test
+date:        Mon Jan 01 00:00:12 2007 +0000
+summary:     add gamma
+
+changeset:   3:1436150b86c2
+tag:         default/master
+tag:         tip
+parent:      0:3442585be8a6
+user:        test <test@example.org>
+date:        Mon Jan 01 00:00:13 2007 +0000
+summary:     add delta
+
 % this should also fail
 pushing to git://localhost/gitrepo
 importing Hg objects into Git
--- a/tests/test-sane-without-bookmarks
+++ b/tests/test-sane-without-bookmarks
@@ -6,6 +6,9 @@
 # bail if the user does not have dulwich
 python -c 'import dulwich, dulwich.repo' || exit 80
 
+# bail if hgext.bookmarks does not exist, which means hg >= 1.8
+python -c 'import hgext.bookmarks' || exit 80
+
 # bail early if the user is already running git-daemon
 echo hi | nc localhost 9418 2>/dev/null && exit 80
 
@@ -49,6 +52,6 @@
 
 hg clone git://localhost/gitrepo hgrepo | grep -v '^updating'
 cd hgrepo
-hg log --graph
+hg log --graph | grep -v ': *master'
 
 cd ..