Mercurial > hg > hg-git

changeset 413:b8eeabb61c7b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test fixes for progress cleanup
author Augie Fackler <durin42@gmail.com>
date Fri, 17 Jun 2011 15:01:31 -0500
parents 5932586e6d43
children 6867b01d1379
files hggit/git_handler.py tests/test-conflict-1.out tests/test-conflict-2.out tests/test-convergedmerge.out 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-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 21 files changed, 2 insertions(+), 78 deletions(-) [+]
line wrap: on
line diff
--- a/hggit/git_handler.py
+++ b/hggit/git_handler.py
@@ -51,13 +51,13 @@
                 self.lasttopic = topic
 
                 pos, total = map(int, m.group(1, 2))
-                self.ui.progress(topic, pos, total=total)
+                util.progress(self.ui, topic, pos, total=total)
             else:
                 self.flush(msg)
 
     def flush(self, msg=None):
         if self.lasttopic:
-            self.ui.progress(self.lasttopic, None)
+            util.progress(self.ui, self.lasttopic, None)
         self.lasttopic = None
         if msg:
             self.ui.note(msg + '\n')
--- a/tests/test-conflict-1.out
+++ b/tests/test-conflict-1.out
@@ -21,9 +21,6 @@
 pushing to git://localhost/gitrepo
 exporting hg objects to git
 creating and sending data
-Counting objects: 10, 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 10 (delta 0), reused 0 (delta 0)
 importing git objects into hg
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % expect the same revision ids as above
--- a/tests/test-conflict-2.out
+++ b/tests/test-conflict-2.out
@@ -21,9 +21,6 @@
 pushing to git://localhost/gitrepo
 exporting hg objects to git
 creating and sending data
-Counting objects: 10, 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 10 (delta 0), reused 0 (delta 0)
 importing git objects into hg
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % expect the same revision ids as above
--- a/tests/test-convergedmerge.out
+++ b/tests/test-convergedmerge.out
@@ -22,9 +22,6 @@
 pushing to git://localhost/gitrepo
 exporting hg objects to git
 creating and sending data
-Counting objects: 11, 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 11 (delta 0), reused 0 (delta 0)
 importing git objects into hg
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % expect the same revision ids as above
--- a/tests/test-empty-working-tree.out
+++ b/tests/test-empty-working-tree.out
@@ -2,8 +2,6 @@
 
 Initialized empty Git repository in gitrepo2/
 
-Counting objects: 2, done.
-Total 2 (delta 0), reused 0 (delta 0)
 importing git objects into hg
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 files: 
--- a/tests/test-encoding.out
+++ b/tests/test-encoding.out
@@ -8,9 +8,6 @@
 variable i18n.commitencoding to the encoding your project uses.
 Initialized empty Git repository in gitrepo2/
 
-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
 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
 @  changeset:   3:8549ee7fe0801b2dafc06047ca6f66d36da709f5
--- a/tests/test-file-removal.out
+++ b/tests/test-file-removal.out
@@ -6,9 +6,6 @@
 beta
 Initialized empty Git repository in gitrepo2/
 
-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
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 @  changeset:   4:ea41a3f0ed10
--- a/tests/test-git-clone.out
+++ b/tests/test-git-clone.out
@@ -1,8 +1,5 @@
 Initialized empty Git repository in gitrepo/.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
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 @  changeset:   1:7bcd915dc873
--- a/tests/test-git-submodules.out
+++ b/tests/test-git-submodules.out
@@ -16,9 +16,6 @@
  2 files changed, 0 insertions(+), 4 deletions(-)
  delete mode 100644 .gitmodules
  delete mode 160000 subrepo
-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
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 @  changeset:   2:954cdf1c8c82
--- a/tests/test-git-tags.out
+++ b/tests/test-git-tags.out
@@ -1,8 +1,5 @@
 Initialized empty Git repository in gitrepo/.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
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 @  changeset:   1:99dcc15b7b07
--- a/tests/test-hg-author.out
+++ b/tests/test-hg-author.out
@@ -1,8 +1,6 @@
 Initialized empty Git repository in gitrepo/.git/
 
 Switched to a new branch 'not-master'
-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
@@ -34,9 +32,6 @@
    date:        Mon Jan 01 00:00:10 2007 +0000
    summary:     add alpha
 
-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
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 @  changeset:   2:92d33c0dd6e1
--- a/tests/test-hg-branch.out
+++ b/tests/test-hg-branch.out
@@ -1,8 +1,6 @@
 Initialized empty Git repository in gitrepo/.git/
 
 Switched to a new branch 'not-master'
-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
@@ -36,9 +34,6 @@
    date:        Mon Jan 01 00:00:10 2007 +0000
    summary:     add alpha
 
-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
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 o  changeset:   2:05aed681ccb3
--- a/tests/test-hg-tags.out
+++ b/tests/test-hg-tags.out
@@ -1,8 +1,6 @@
 Initialized empty Git repository in gitrepo/.git/
 
 Switched to a new branch 'not-master'
-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
@@ -28,9 +26,6 @@
 
 % git should have the tag alpha
 alpha
-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
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 @  changeset:   1:d529e9229f6d
--- a/tests/test-merge.out
+++ b/tests/test-merge.out
@@ -8,9 +8,6 @@
  create mode 100644 beta
 Initialized empty Git repository in gitrepo2/
 
-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
 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
 % clear the cache to be sure it is regenerated correctly
--- a/tests/test-octopus.out
+++ b/tests/test-octopus.out
@@ -13,9 +13,6 @@
  create mode 100644 gamma
 Initialized empty Git repository in gitrepo2/
 
-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
 4 files updated, 0 files merged, 0 files removed, 0 files unresolved
 @    5:3,4   6523aa9f4775   2007-01-01 00:00 +0000   test
--- a/tests/test-outgoing.out
+++ b/tests/test-outgoing.out
@@ -1,7 +1,5 @@
 Initialized empty Git repository in gitrepo/.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
 comparing with git://localhost/gitrepo
@@ -47,9 +45,6 @@
 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
-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
 (run 'hg update' to get a working copy)
 comparing with git://localhost/gitrepo
--- a/tests/test-pull-after-strip.out
+++ b/tests/test-pull-after-strip.out
@@ -2,8 +2,6 @@
 
 Switched to a new branch "beta"
 % clone a tag
-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
 @  changeset:   0:3442585be8a6
@@ -15,9 +13,6 @@
    summary:     add alpha
 
 % clone a branch
-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
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 @  changeset:   1:7bcd915dc873
@@ -36,9 +31,6 @@
 
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 pulling from git://localhost/gitrepo
-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
 abort: you appear to have run strip - please run hg git-cleanup
 git commit map cleaned
--- a/tests/test-pull.out
+++ b/tests/test-pull.out
@@ -2,8 +2,6 @@
 
 Switched to a new branch "beta"
 % clone a tag
-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
 @  changeset:   0:3442585be8a6
@@ -15,9 +13,6 @@
    summary:     add alpha
 
 % clone a branch
-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
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 @  changeset:   1:7bcd915dc873
--- a/tests/test-push.out
+++ b/tests/test-push.out
@@ -1,8 +1,6 @@
 Initialized empty Git repository in gitrepo/.git/
 
 Switched to a new branch "not-master"
-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
 pushing to git://localhost/gitrepo
@@ -27,9 +25,6 @@
 creating and sending data
 abort: refs/heads/master changed on the server, please pull and merge before pushing
 pulling from git://localhost/gitrepo
-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
 (run 'hg update' to get a working copy)
 % master and default/master should be diferent
--- a/tests/test-sane-without-bookmarks.out
+++ b/tests/test-sane-without-bookmarks.out
@@ -1,9 +1,6 @@
 Initialized empty Git repository in gitrepo/.git/
 
 creating bookmarks failed, do you have bookmarks enabled?
-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
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 @  changeset:   1:7bcd915dc873
--- a/tests/test-tree-decomposition.out
+++ b/tests/test-tree-decomposition.out
@@ -2,9 +2,6 @@
 
 Initialized empty Git repository in gitrepo2/
 
-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
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 adds: d1