# HG changeset patch # User Augie Fackler # Date 1386956501 18000 # Node ID 86a4abcd3355f24790a2c1300b42f8cc7d42a090 # Parent 949ec5b7d47fc4bfc735c4dbbe6c90a8c4e0b51c tests: dulwich is now smarter about sending fewer objects, update output diff --git a/tests/test-git-tags.t b/tests/test-git-tags.t --- a/tests/test-git-tags.t +++ b/tests/test-git-tags.t @@ -42,7 +42,7 @@ pushing to $TESTTMP/gitrepo searching for changes adding objects - added 1 commits with 1 trees and 2 blobs + added 1 commits with 1 trees and 1 blobs updating reference refs/heads/master $ cd .. diff --git a/tests/test-hg-author.t b/tests/test-hg-author.t --- a/tests/test-hg-author.t +++ b/tests/test-hg-author.t @@ -25,7 +25,7 @@ pushing to $TESTTMP/gitrepo searching for changes adding objects - added 1 commits with 1 trees and 2 blobs + added 1 commits with 1 trees and 1 blobs updating reference refs/heads/master $ echo gamma >> beta @@ -34,7 +34,7 @@ pushing to $TESTTMP/gitrepo searching for changes adding objects - added 1 commits with 1 trees and 2 blobs + added 1 commits with 1 trees and 1 blobs updating reference refs/heads/master $ echo gamma > gamma @@ -44,7 +44,7 @@ pushing to $TESTTMP/gitrepo searching for changes adding objects - added 1 commits with 1 trees and 3 blobs + added 1 commits with 1 trees and 1 blobs updating reference refs/heads/master $ echo delta > delta @@ -54,7 +54,7 @@ pushing to $TESTTMP/gitrepo searching for changes adding objects - added 1 commits with 1 trees and 4 blobs + added 1 commits with 1 trees and 1 blobs updating reference refs/heads/master $ echo epsilon > epsilon @@ -64,7 +64,7 @@ pushing to $TESTTMP/gitrepo searching for changes adding objects - added 1 commits with 1 trees and 5 blobs + added 1 commits with 1 trees and 1 blobs updating reference refs/heads/master $ echo zeta > zeta @@ -74,7 +74,7 @@ pushing to $TESTTMP/gitrepo searching for changes adding objects - added 1 commits with 1 trees and 6 blobs + added 1 commits with 1 trees and 1 blobs updating reference refs/heads/master $ echo eta > eta @@ -84,7 +84,7 @@ pushing to $TESTTMP/gitrepo searching for changes adding objects - added 1 commits with 1 trees and 7 blobs + added 1 commits with 1 trees and 1 blobs updating reference refs/heads/master $ echo theta > theta @@ -94,7 +94,7 @@ pushing to $TESTTMP/gitrepo searching for changes adding objects - added 1 commits with 1 trees and 8 blobs + added 1 commits with 1 trees and 1 blobs updating reference refs/heads/master $ hg log --graph | egrep -v ': *(not-master|master)' diff --git a/tests/test-hg-branch.t b/tests/test-hg-branch.t --- a/tests/test-hg-branch.t +++ b/tests/test-hg-branch.t @@ -24,7 +24,7 @@ pushing to $TESTTMP/gitrepo searching for changes adding objects - added 1 commits with 1 trees and 1 blobs + added 1 commits with 1 trees and 0 blobs updating reference refs/heads/master $ hg branch gamma | grep -v 'permanent and global' @@ -34,7 +34,7 @@ pushing to $TESTTMP/gitrepo searching for changes adding objects - added 1 commits with 1 trees and 1 blobs + added 1 commits with 1 trees and 0 blobs updating reference refs/heads/master $ hg log --graph | egrep -v ': *(not-master|master)' diff --git a/tests/test-hg-tags-invalid.t b/tests/test-hg-tags-invalid.t --- a/tests/test-hg-tags-invalid.t +++ b/tests/test-hg-tags-invalid.t @@ -25,9 +25,9 @@ Skipping export of tag bet*a because it has invalid name as a git refname. searching for changes adding objects - added 2 commits with 2 trees and 3 blobs + added 2 commits with 2 trees and 2 blobs + updating reference refs/heads/master adding reference refs/tags/alph#a - updating reference refs/heads/master $ hg log --graph | egrep -v ': *(not-master|master)' @ changeset: 2:e72bdd9ef5c0 diff --git a/tests/test-hg-tags.t b/tests/test-hg-tags.t --- a/tests/test-hg-tags.t +++ b/tests/test-hg-tags.t @@ -23,9 +23,9 @@ pushing to $TESTTMP/gitrepo searching for changes adding objects - added 1 commits with 1 trees and 2 blobs + added 1 commits with 1 trees and 1 blobs + updating reference refs/heads/master adding reference refs/tags/alpha - updating reference refs/heads/master $ hg log --graph | egrep -v ': *(not-master|master)' @ changeset: 1:d529e9229f6d diff --git a/tests/test-push.t b/tests/test-push.t --- a/tests/test-push.t +++ b/tests/test-push.t @@ -30,7 +30,7 @@ pushing to $TESTTMP/gitrepo searching for changes adding objects - added 1 commits with 1 trees and 2 blobs + added 1 commits with 1 trees and 1 blobs adding reference refs/heads/beta $ cd .. @@ -104,7 +104,7 @@ pushing to $TESTTMP/gitrepo searching for changes adding objects - added 1 commits with 1 trees and 3 blobs + added 1 commits with 1 trees and 1 blobs updating reference refs/heads/master this should fail, no changes to push diff --git a/tests/test-subrepos.t b/tests/test-subrepos.t --- a/tests/test-subrepos.t +++ b/tests/test-subrepos.t @@ -73,7 +73,7 @@ pushing to $TESTTMP/gitrepo1 searching for changes adding objects - added 1 commits with 2 trees and 2 blobs + added 1 commits with 2 trees and 1 blobs updating reference refs/heads/master $ cd .. $ cd gitrepo1