Augie Fackler avatar Augie Fackler committed b8eeabb

test fixes for progress cleanup

Comments (0)

Files changed (21)

hggit/git_handler.py

                 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')

tests/test-conflict-1.out

 pushing to git://localhost/gitrepo
 exporting hg objects to git
 creating and sending data
-Counting objects: 10, done.
-Compressing objects:  25% (1/4)   
-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

tests/test-conflict-2.out

 pushing to git://localhost/gitrepo
 exporting hg objects to git
 creating and sending data
-Counting objects: 10, done.
-Compressing objects:  25% (1/4)   
-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

tests/test-convergedmerge.out

 pushing to git://localhost/gitrepo
 exporting hg objects to git
 creating and sending data
-Counting objects: 11, done.
-Compressing objects:  20% (1/5)   
-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

tests/test-empty-working-tree.out

 
 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: 

tests/test-encoding.out

 variable i18n.commitencoding to the encoding your project uses.
 Initialized empty Git repository in gitrepo2/
 
-Counting objects: 12, done.
-Compressing objects:  14% (1/7)   
-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

tests/test-file-removal.out

 beta
 Initialized empty Git repository in gitrepo2/
 
-Counting objects: 14, done.
-Compressing objects:  12% (1/8)   
-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

tests/test-git-clone.out

 Initialized empty Git repository in gitrepo/.git/
 
-Counting objects: 6, done.
-Compressing objects:  33% (1/3)   
-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

tests/test-git-submodules.out

  2 files changed, 0 insertions(+), 4 deletions(-)
  delete mode 100644 .gitmodules
  delete mode 160000 subrepo
-Counting objects: 7, done.
-Compressing objects:  20% (1/5)   
-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

tests/test-git-tags.out

 Initialized empty Git repository in gitrepo/.git/
 
-Counting objects: 7, done.
-Compressing objects:  25% (1/4)   
-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

tests/test-hg-author.out

 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
    date:        Mon Jan 01 00:00:10 2007 +0000
    summary:     add alpha
 
-Counting objects: 9, done.
-Compressing objects:  20% (1/5)   
-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

tests/test-hg-branch.out

 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
    date:        Mon Jan 01 00:00:10 2007 +0000
    summary:     add alpha
 
-Counting objects: 6, done.
-Compressing objects:  33% (1/3)   
-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

tests/test-hg-tags.out

 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
 
 % git should have the tag alpha
 alpha
-Counting objects: 6, done.
-Compressing objects:  33% (1/3)   
-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

tests/test-merge.out

  create mode 100644 beta
 Initialized empty Git repository in gitrepo2/
 
-Counting objects: 11, done.
-Compressing objects:  14% (1/7)   
-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

tests/test-octopus.out

  create mode 100644 gamma
 Initialized empty Git repository in gitrepo2/
 
-Counting objects: 14, done.
-Compressing objects:  11% (1/9)   
-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

tests/test-outgoing.out

 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
 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)   
-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

tests/test-pull-after-strip.out

 
 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
    summary:     add alpha
 
 % clone a branch
-Counting objects: 6, done.
-Compressing objects:  33% (1/3)   
-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
 
 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)   
-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

tests/test-pull.out

 
 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
    summary:     add alpha
 
 % clone a branch
-Counting objects: 6, done.
-Compressing objects:  33% (1/3)   
-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

tests/test-push.out

 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
 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)   
-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

tests/test-sane-without-bookmarks.out

 Initialized empty Git repository in gitrepo/.git/
 
 creating bookmarks failed, do you have bookmarks enabled?
-Counting objects: 6, done.
-Compressing objects:  33% (1/3)   
-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

tests/test-tree-decomposition.out

 
 Initialized empty Git repository in gitrepo2/
 
-Counting objects: 12, done.
-Compressing objects:  16% (1/6)   
-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
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.