Mercurial > hg > hg-git

changeset 393:15d362677859

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: update expectations after message cleanups
author Augie Fackler <durin42@gmail.com>
date Wed, 18 May 2011 08:10:00 -0500
parents 8bb058d6a9ee
children 721165a45385
files tests/test-empty-working-tree.out tests/test-encoding.out tests/test-file-removal.out tests/test-git-clone.out tests/test-git-submodules.out tests/test-git-tags.out tests/test-git-workflow.out tests/test-hg-author.out tests/test-hg-branch.out tests/test-hg-tags.out tests/test-merge.out tests/test-octopus.out tests/test-outgoing.out tests/test-pull-after-strip.out tests/test-pull.out tests/test-push.out tests/test-sane-without-bookmarks.out tests/test-tree-decomposition.out
diffstat 18 files changed, 42 insertions(+), 78 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-empty-working-tree.out
+++ b/tests/test-empty-working-tree.out
@@ -2,15 +2,14 @@
 
 Initialized empty Git repository in gitrepo2/
 
-importing Hg objects into Git
 Counting objects: 2, done.
 Total 2 (delta 0), reused 0 (delta 0)
-importing Git objects into Hg
+importing git objects into hg
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 files: 
 clearing out the git cache data
 pushing to git://localhost/gitrepo2
-importing Hg objects into Git
+exporting hg objects to git
 creating and sending data
 commit 678256865a8c85ae925bf834369264193c88f8de
 Author: test <test@example.org>
--- a/tests/test-encoding.out
+++ b/tests/test-encoding.out
@@ -8,11 +8,10 @@
 variable i18n.commitencoding to the encoding your project uses.
 Initialized empty Git repository in gitrepo2/
 
-importing Hg objects into Git
 Counting objects: 12, done.
 Compressing objects:  14% (1/7)   
Compressing objects:  28% (2/7)   
Compressing objects:  42% (3/7)   
Compressing objects:  57% (4/7)   
Compressing objects:  71% (5/7)   
Compressing objects:  85% (6/7)   
Compressing objects: 100% (7/7)   
Compressing objects: 100% (7/7), done.
 Total 12 (delta 1), reused 0 (delta 0)
-importing Git objects into Hg
+importing git objects into hg
 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
 @  changeset:   3:8549ee7fe0801b2dafc06047ca6f66d36da709f5
 |  tag:         default/master
@@ -75,7 +74,7 @@
 
 clearing out the git cache data
 pushing to git://localhost/gitrepo2
-importing Hg objects into Git
+exporting hg objects to git
 creating and sending data
 commit da0edb01d4f3d1abf08b1be298379b0b2960e680
 Author: tést èncödîng <test@example.org>
--- a/tests/test-file-removal.out
+++ b/tests/test-file-removal.out
@@ -6,11 +6,10 @@
 beta
 Initialized empty Git repository in gitrepo2/
 
-importing Hg objects into Git
 Counting objects: 14, done.
 Compressing objects:  12% (1/8)   
Compressing objects:  25% (2/8)   
Compressing objects:  37% (3/8)   
Compressing objects:  50% (4/8)   
Compressing objects:  62% (5/8)   
Compressing objects:  75% (6/8)   
Compressing objects:  87% (7/8)   
Compressing objects: 100% (8/8)   
Compressing objects: 100% (8/8), done.
 Total 14 (delta 1), reused 0 (delta 0)
-importing Git objects into Hg
+importing git objects into hg
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 @  changeset:   4:ea41a3f0ed10
 |  tag:         default/master
@@ -48,7 +47,7 @@
 beta
 clearing out the git cache data
 pushing to git://localhost/gitrepo2
-importing Hg objects into Git
+exporting hg objects to git
 creating and sending data
 commit b991de8952c482a7cd51162674ffff8474862218
 Author: test <test@example.org>
--- a/tests/test-git-clone.out
+++ b/tests/test-git-clone.out
@@ -1,10 +1,9 @@
 Initialized empty Git repository in gitrepo/.git/
 
-importing Hg objects into Git
 Counting objects: 6, done.
 Compressing objects:  33% (1/3)   
Compressing objects:  66% (2/3)   
Compressing objects: 100% (3/3)   
Compressing objects: 100% (3/3), done.
 Total 6 (delta 0), reused 0 (delta 0)
-importing Git objects into Hg
+importing git objects into hg
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 @  changeset:   1:7bcd915dc873
 |  tag:         default/master
--- a/tests/test-git-submodules.out
+++ b/tests/test-git-submodules.out
@@ -16,11 +16,10 @@
  2 files changed, 0 insertions(+), 4 deletions(-)
  delete mode 100644 .gitmodules
  delete mode 160000 subrepo
-importing Hg objects into Git
 Counting objects: 7, done.
 Compressing objects:  20% (1/5)   
Compressing objects:  40% (2/5)   
Compressing objects:  60% (3/5)   
Compressing objects:  80% (4/5)   
Compressing objects: 100% (5/5)   
Compressing objects: 100% (5/5), done.
 Total 7 (delta 1), reused 0 (delta 0)
-importing Git objects into Hg
+importing git objects into hg
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 @  changeset:   2:954cdf1c8c82
 |  tag:         default/master
--- a/tests/test-git-tags.out
+++ b/tests/test-git-tags.out
@@ -1,10 +1,9 @@
 Initialized empty Git repository in gitrepo/.git/
 
-importing Hg objects into Git
 Counting objects: 7, done.
 Compressing objects:  25% (1/4)   
Compressing objects:  50% (2/4)   
Compressing objects:  75% (3/4)   
Compressing objects: 100% (4/4)   
Compressing objects: 100% (4/4), done.
 Total 7 (delta 0), reused 0 (delta 0)
-importing Git objects into Hg
+importing git objects into hg
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 @  changeset:   1:99dcc15b7b07
 |  tag:         beta
@@ -21,7 +20,7 @@
    summary:     add alpha
 
 pushing to git://localhost/gitrepo
-importing Hg objects into Git
+exporting hg objects to git
 creating and sending data
     default::refs/tags/beta => GIT:e6f255c6
     default::refs/tags/alpha => GIT:7eeab2ea
--- a/tests/test-git-workflow.out
+++ b/tests/test-git-workflow.out
@@ -15,11 +15,11 @@
 updating to branch default
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-importing Hg objects into Git
+exporting hg objects to git
 % do some work
 Already on "master"
 % get things back to hg
-importing Git objects into Hg
+importing git objects into hg
 o  changeset:   1:7108ae7bd184226a29b8203619a8253d314643bf
 |  tag:         tip
 |  parent:      0:0221c246a56712c6aa64e5ee382244d8a471b1e2
--- a/tests/test-hg-author.out
+++ b/tests/test-hg-author.out
@@ -1,19 +1,18 @@
 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
+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
+exporting hg objects to 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
+exporting hg objects to git
 creating and sending data
     default::refs/heads/not-master => GIT:7eeab2ea
     default::refs/heads/master => GIT:2b9ec6a4
@@ -35,11 +34,10 @@
    date:        Mon Jan 01 00:00:10 2007 +0000
    summary:     add alpha
 
-importing Hg objects into Git
 Counting objects: 9, done.
 Compressing objects:  20% (1/5)   
Compressing objects:  40% (2/5)   
Compressing objects:  60% (3/5)   
Compressing objects:  80% (4/5)   
Compressing objects: 100% (5/5)   
Compressing objects: 100% (5/5), done.
 Total 9 (delta 0), reused 0 (delta 0)
-importing Git objects into Hg
+importing git objects into hg
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 @  changeset:   2:92d33c0dd6e1
 |  tag:         default/master
--- a/tests/test-hg-branch.out
+++ b/tests/test-hg-branch.out
@@ -1,20 +1,19 @@
 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
+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
+exporting hg objects to 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
+exporting hg objects to git
 creating and sending data
     default::refs/heads/not-master => GIT:7eeab2ea
     default::refs/heads/master => GIT:296802ef
@@ -37,11 +36,10 @@
    date:        Mon Jan 01 00:00:10 2007 +0000
    summary:     add alpha
 
-importing Hg objects into Git
 Counting objects: 6, done.
 Compressing objects:  33% (1/3)   
Compressing objects:  66% (2/3)   
Compressing objects: 100% (3/3)   
Compressing objects: 100% (3/3), done.
 Total 6 (delta 0), reused 0 (delta 0)
-importing Git objects into Hg
+importing git objects into hg
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 o  changeset:   2:05aed681ccb3
 |  branch:      gamma
--- a/tests/test-hg-tags.out
+++ b/tests/test-hg-tags.out
@@ -1,14 +1,13 @@
 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
+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
+exporting hg objects to git
 creating and sending data
     default::refs/heads/not-master => GIT:7eeab2ea
     default::refs/tags/alpha => GIT:7eeab2ea
@@ -29,11 +28,10 @@
 
 % git should have the tag alpha
 alpha
-importing Hg objects into Git
 Counting objects: 6, done.
 Compressing objects:  33% (1/3)   
Compressing objects:  66% (2/3)   
Compressing objects: 100% (3/3)   
Compressing objects: 100% (3/3), done.
 Total 6 (delta 0), reused 0 (delta 0)
-importing Git objects into Hg
+importing git objects into hg
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 @  changeset:   1:d529e9229f6d
 |  tag:         default/master
--- a/tests/test-merge.out
+++ b/tests/test-merge.out
@@ -8,16 +8,15 @@
  create mode 100644 beta
 Initialized empty Git repository in gitrepo2/
 
-importing Hg objects into Git
 Counting objects: 11, done.
 Compressing objects:  14% (1/7)   
Compressing objects:  28% (2/7)   
Compressing objects:  42% (3/7)   
Compressing objects:  57% (4/7)   
Compressing objects:  71% (5/7)   
Compressing objects:  85% (6/7)   
Compressing objects: 100% (7/7)   
Compressing objects: 100% (7/7), done.
 Total 11 (delta 3), reused 0 (delta 0)
-importing Git objects into Hg
+importing git objects into hg
 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % clear the cache to be sure it is regenerated correctly
 clearing out the git cache data
 pushing to git://localhost/gitrepo2
-importing Hg objects into Git
+exporting hg objects to git
 creating and sending data
 % git log in repo pushed from hg
 commit 5806851511aaf3bfe813ae3a86c5027165fa9b96
--- a/tests/test-octopus.out
+++ b/tests/test-octopus.out
@@ -13,11 +13,10 @@
  create mode 100644 gamma
 Initialized empty Git repository in gitrepo2/
 
-importing Hg objects into Git
 Counting objects: 14, done.
 Compressing objects:  11% (1/9)   
Compressing objects:  22% (2/9)   
Compressing objects:  33% (3/9)   
Compressing objects:  44% (4/9)   
Compressing objects:  55% (5/9)   
Compressing objects:  66% (6/9)   
Compressing objects:  77% (7/9)   
Compressing objects:  88% (8/9)   
Compressing objects: 100% (9/9)   
Compressing objects: 100% (9/9), done.
 Total 14 (delta 3), reused 0 (delta 0)
-importing Git objects into Hg
+importing git objects into hg
 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
 @    5:3,4   6523aa9f4775   2007-01-01 00:00 +0000   test
 |\     Merge branches 'branch1' and 'branch2'
@@ -39,7 +38,7 @@
 
 clearing out the git cache data
 pushing to git://localhost/gitrepo2
-importing Hg objects into Git
+exporting hg objects to git
 creating and sending data
 commit f0c7ec180419a130636d0c333fc34c1462cab4b5
 Merge: d8e22dd 9497a4e e5023f9
--- a/tests/test-outgoing.out
+++ b/tests/test-outgoing.out
@@ -1,12 +1,11 @@
 Initialized empty Git repository in gitrepo/.git/
 
-importing Hg objects into Git
 Counting objects: 3, done.
 Total 3 (delta 0), reused 0 (delta 0)
-importing Git objects into Hg
+importing git objects into hg
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 comparing with git://localhost/gitrepo
-importing Hg objects into Git
+exporting hg objects to git
 changeset:   1:0564f526fb0f
 tag:         beta
 user:        test
@@ -21,7 +20,6 @@
 summary:     add gamma
 
 comparing with git://localhost/gitrepo
-importing Hg objects into Git
 changeset:   1:0564f526fb0f
 tag:         beta
 user:        test
@@ -29,7 +27,6 @@
 summary:     add beta
 
 comparing with git://localhost/gitrepo
-importing Hg objects into Git
 changeset:   1:0564f526fb0f
 tag:         beta
 user:        test
@@ -47,18 +44,15 @@
 Already on "master"
 % this will fail
 comparing with git://localhost/gitrepo
-importing Hg objects into Git
 abort: refs/heads/master changed on the server, please pull and merge before pushing
 % let's pull and try again
 pulling from git://localhost/gitrepo
-importing Hg objects into Git
 Counting objects: 3, done.
 Compressing objects:  50% (1/2)   
Compressing objects: 100% (2/2)   
Compressing objects: 100% (2/2), done.
 Total 3 (delta 0), reused 0 (delta 0)
-importing Git objects into Hg
+importing git objects into hg
 (run 'hg update' to get a working copy)
 comparing with git://localhost/gitrepo
-importing Hg objects into Git
 changeset:   1:0564f526fb0f
 tag:         beta
 user:        test
@@ -72,7 +66,6 @@
 summary:     add gamma
 
 comparing with git://localhost/gitrepo
-importing Hg objects into Git
 changeset:   1:0564f526fb0f
 tag:         beta
 user:        test
@@ -80,7 +73,6 @@
 summary:     add beta
 
 comparing with git://localhost/gitrepo
-importing Hg objects into Git
 changeset:   1:0564f526fb0f
 tag:         beta
 user:        test
--- a/tests/test-pull-after-strip.out
+++ b/tests/test-pull-after-strip.out
@@ -2,10 +2,9 @@
 
 Switched to a new branch "beta"
 % clone a tag
-importing Hg objects into Git
 Counting objects: 3, done.
 Total 3 (delta 0), reused 0 (delta 0)
-importing Git objects into Hg
+importing git objects into hg
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 @  changeset:   0:3442585be8a6
    tag:         alpha
@@ -16,11 +15,10 @@
    summary:     add alpha
 
 % clone a branch
-importing Hg objects into Git
 Counting objects: 6, done.
 Compressing objects:  33% (1/3)   
Compressing objects:  66% (2/3)   
Compressing objects: 100% (3/3)   
Compressing objects: 100% (3/3), done.
 Total 6 (delta 0), reused 0 (delta 0)
-importing Git objects into Hg
+importing git objects into hg
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 @  changeset:   1:7bcd915dc873
 |  tag:         default/beta
@@ -38,20 +36,18 @@
 
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 pulling from git://localhost/gitrepo
-importing Hg objects into Git
 Counting objects: 6, done.
 Compressing objects:  25% (1/4)   
Compressing objects:  50% (2/4)   
Compressing objects:  75% (3/4)   
Compressing objects: 100% (4/4)   
Compressing objects: 100% (4/4), done.
 Total 6 (delta 0), reused 0 (delta 0)
-importing Git objects into Hg
+importing git objects into hg
 abort: you appear to have run strip - please run hg git-cleanup
 git commit map cleaned
 % pull works after 'hg git-cleanup'
 pulling from git://localhost/gitrepo
-importing Hg objects into Git
 Counting objects: 6, done.
 Compressing objects:  25% (1/4)   
Compressing objects:  50% (2/4)   
Compressing objects:  75% (3/4)   
Compressing objects: 100% (4/4)   
Compressing objects: 100% (4/4), done.
 Total 6 (delta 0), reused 0 (delta 0)
-importing Git objects into Hg
+importing git objects into hg
 (run 'hg update' to get a working copy)
 o  changeset:   2:611948b1ec6a
 |  tag:         default/beta
--- a/tests/test-pull.out
+++ b/tests/test-pull.out
@@ -2,10 +2,9 @@
 
 Switched to a new branch "beta"
 % clone a tag
-importing Hg objects into Git
 Counting objects: 3, done.
 Total 3 (delta 0), reused 0 (delta 0)
-importing Git objects into Hg
+importing git objects into hg
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 @  changeset:   0:3442585be8a6
    tag:         alpha
@@ -16,11 +15,10 @@
    summary:     add alpha
 
 % clone a branch
-importing Hg objects into Git
 Counting objects: 6, done.
 Compressing objects:  33% (1/3)   
Compressing objects:  66% (2/3)   
Compressing objects: 100% (3/3)   
Compressing objects: 100% (3/3), done.
 Total 6 (delta 0), reused 0 (delta 0)
-importing Git objects into Hg
+importing git objects into hg
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 @  changeset:   1:7bcd915dc873
 |  tag:         default/beta
--- a/tests/test-push.out
+++ b/tests/test-push.out
@@ -1,13 +1,12 @@
 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
+importing git objects into hg
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 pushing to git://localhost/gitrepo
-importing Hg objects into Git
+exporting hg objects to git
 creating and sending data
     default::refs/heads/beta => GIT:cffa0e8d
     default::refs/heads/not-master => GIT:7eeab2ea
@@ -21,20 +20,17 @@
 Switched to branch "not-master"
 % this should fail
 pushing to git://localhost/gitrepo
-importing Hg objects into Git
 creating and sending data
 abort: refs/heads/master changed on the server, please pull and merge before pushing
 % ... even with -f
 pushing to git://localhost/gitrepo
-importing Hg objects into Git
 creating and sending data
 abort: refs/heads/master changed on the server, please pull and merge before pushing
 pulling from git://localhost/gitrepo
-importing Hg objects into Git
 Counting objects: 3, done.
 Compressing objects:  50% (1/2)   
Compressing objects: 100% (2/2)   
Compressing objects: 100% (2/2), done.
 Total 3 (delta 0), reused 0 (delta 0)
-importing Git objects into Hg
+importing git objects into hg
 (run 'hg update' to get a working copy)
 % master and default/master should be diferent
 changeset:   2:72f56395749d
@@ -52,12 +48,10 @@
 
 % this should also fail
 pushing to git://localhost/gitrepo
-importing Hg objects into Git
 creating and sending data
 abort: pushing refs/heads/master overwrites 72f56395749d
 % ... but succeed with -f
 pushing to git://localhost/gitrepo
-importing Hg objects into Git
 creating and sending data
     default::refs/heads/beta => GIT:cffa0e8d
     default::refs/heads/not-master => GIT:7eeab2ea
--- a/tests/test-sane-without-bookmarks.out
+++ b/tests/test-sane-without-bookmarks.out
@@ -1,11 +1,10 @@
 Initialized empty Git repository in gitrepo/.git/
 
 creating bookmarks failed, do you have bookmarks enabled?
-importing Hg objects into Git
 Counting objects: 6, done.
 Compressing objects:  33% (1/3)   
Compressing objects:  66% (2/3)   
Compressing objects: 100% (3/3)   
Compressing objects: 100% (3/3), done.
 Total 6 (delta 0), reused 0 (delta 0)
-importing Git objects into Hg
+importing git objects into hg
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 @  changeset:   1:7bcd915dc873
 |  tag:         default/master
--- a/tests/test-tree-decomposition.out
+++ b/tests/test-tree-decomposition.out
@@ -2,11 +2,10 @@
 
 Initialized empty Git repository in gitrepo2/
 
-importing Hg objects into Git
 Counting objects: 12, done.
 Compressing objects:  16% (1/6)   
Compressing objects:  33% (2/6)   
Compressing objects:  50% (3/6)   
Compressing objects:  66% (4/6)   
Compressing objects:  83% (5/6)   
Compressing objects: 100% (6/6)   
Compressing objects: 100% (6/6), done.
 Total 12 (delta 0), reused 0 (delta 0)
-importing Git objects into Hg
+importing git objects into hg
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 adds: d1
 dels: d1/f1
@@ -16,7 +15,7 @@
 dels: 
 clearing out the git cache data
 pushing to git://localhost/gitrepo2
-importing Hg objects into Git
+exporting hg objects to git
 creating and sending data
 commit 6e0dbd8cd92ed4823c69cb48d8a2b81f904e6e69
 Author: test <test@example.org>