diff --git a/hggit/git_handler.py b/hggit/git_handler.py index f16d5105971dcbd716c5f044042c1536dc1bc049_aGdnaXQvZ2l0X2hhbmRsZXIucHk=..ed22a0150599fc1cf861e73620497f8443e6a9db_aGdnaXQvZ2l0X2hhbmRsZXIucHk= 100644 --- a/hggit/git_handler.py +++ b/hggit/git_handler.py @@ -406,9 +406,10 @@ def push(self, remote, revs, force): old_refs, new_refs = self.upload_pack(remote, revs, force) remote_name = self.remote_name(remote, True) + remote_desc = remote_name or remote if not isinstance(new_refs, dict): # dulwich 0.20.6 changed the API and deprectated treating # the result as a dictionary new_refs = new_refs.refs @@ -409,22 +410,13 @@ if not isinstance(new_refs, dict): # dulwich 0.20.6 changed the API and deprectated treating # the result as a dictionary new_refs = new_refs.refs - if remote_name and new_refs: - for ref, new_sha in sorted(new_refs.items()): - old_sha = old_refs.get(ref) - if old_sha is None: - if self.ui.verbose: - self.ui.note(b"adding reference %s::%s => GIT:%s\n" % - (remote_name, ref, new_sha[0:8])) - else: - self.ui.status(b"adding reference %s\n" % ref) - elif new_sha != old_sha: - if self.ui.verbose: - self.ui.note(b"updating reference %s::%s => GIT:%s\n" % - (remote_name, ref, new_sha[0:8])) - else: - self.ui.status(b"updating reference %s\n" % ref) + for ref, new_sha in sorted(new_refs.items()): + old_sha = old_refs.get(ref) + if old_sha is None: + if self.ui.verbose: + self.ui.note(b"adding reference %s::%s => GIT:%s\n" % + (remote_desc, ref, new_sha[0:8])) else: @@ -430,4 +422,12 @@ else: - self.ui.debug(b"unchanged reference %s::%s => GIT:%s\n" % - (remote_name, ref, new_sha[0:8])) + self.ui.status(b"adding reference %s\n" % ref) + elif new_sha != old_sha: + if self.ui.verbose: + self.ui.note(b"updating reference %s::%s => GIT:%s\n" % + (remote_desc, ref, new_sha[0:8])) + else: + self.ui.status(b"updating reference %s\n" % ref) + else: + self.ui.debug(b"unchanged reference %s::%s => GIT:%s\n" % + (remote_desc, ref, new_sha[0:8])) @@ -433,4 +433,5 @@ + if new_refs and remote_name: # make sure that we know the remote head, for possible # publishing new_refs_with_head = new_refs.copy() diff --git a/tests/test-branch-bookmark-suffix.t b/tests/test-branch-bookmark-suffix.t index f16d5105971dcbd716c5f044042c1536dc1bc049_dGVzdHMvdGVzdC1icmFuY2gtYm9va21hcmstc3VmZml4LnQ=..ed22a0150599fc1cf861e73620497f8443e6a9db_dGVzdHMvdGVzdC1icmFuY2gtYm9va21hcmstc3VmZml4LnQ= 100644 --- a/tests/test-branch-bookmark-suffix.t +++ b/tests/test-branch-bookmark-suffix.t @@ -50,6 +50,8 @@ searching for changes adding objects added 2 commits with 2 trees and 2 blobs + adding reference refs/heads/branch1 + adding reference refs/heads/branch2 $ cd .. diff --git a/tests/test-conflict-1.t b/tests/test-conflict-1.t index f16d5105971dcbd716c5f044042c1536dc1bc049_dGVzdHMvdGVzdC1jb25mbGljdC0xLnQ=..ed22a0150599fc1cf861e73620497f8443e6a9db_dGVzdHMvdGVzdC1jb25mbGljdC0xLnQ= 100644 --- a/tests/test-conflict-1.t +++ b/tests/test-conflict-1.t @@ -51,6 +51,7 @@ searching for changes adding objects added 4 commits with 3 trees and 3 blobs + adding reference refs/heads/master $ cd .. $ hg clone gitrepo hgrepo2 diff --git a/tests/test-conflict-2.t b/tests/test-conflict-2.t index f16d5105971dcbd716c5f044042c1536dc1bc049_dGVzdHMvdGVzdC1jb25mbGljdC0yLnQ=..ed22a0150599fc1cf861e73620497f8443e6a9db_dGVzdHMvdGVzdC1jb25mbGljdC0yLnQ= 100644 --- a/tests/test-conflict-2.t +++ b/tests/test-conflict-2.t @@ -51,6 +51,7 @@ searching for changes adding objects added 4 commits with 3 trees and 3 blobs + adding reference refs/heads/master $ cd .. $ hg clone gitrepo hgrepo2 diff --git a/tests/test-convergedmerge.t b/tests/test-convergedmerge.t index f16d5105971dcbd716c5f044042c1536dc1bc049_dGVzdHMvdGVzdC1jb252ZXJnZWRtZXJnZS50..ed22a0150599fc1cf861e73620497f8443e6a9db_dGVzdHMvdGVzdC1jb252ZXJnZWRtZXJnZS50 100644 --- a/tests/test-convergedmerge.t +++ b/tests/test-convergedmerge.t @@ -53,6 +53,7 @@ searching for changes adding objects added 5 commits with 3 trees and 3 blobs + adding reference refs/heads/master $ cd .. $ hg clone gitrepo hgrepo2 diff --git a/tests/test-empty-working-tree.t b/tests/test-empty-working-tree.t index f16d5105971dcbd716c5f044042c1536dc1bc049_dGVzdHMvdGVzdC1lbXB0eS13b3JraW5nLXRyZWUudA==..ed22a0150599fc1cf861e73620497f8443e6a9db_dGVzdHMvdGVzdC1lbXB0eS13b3JraW5nLXRyZWUudA== 100644 --- a/tests/test-empty-working-tree.t +++ b/tests/test-empty-working-tree.t @@ -28,6 +28,7 @@ searching for changes adding objects added 1 commits with 1 trees and 0 blobs + adding reference refs/heads/master $ cd .. $ git --git-dir=gitrepo2 log --pretty=medium commit 678256865a8c85ae925bf834369264193c88f8de diff --git a/tests/test-encoding.t b/tests/test-encoding.t index f16d5105971dcbd716c5f044042c1536dc1bc049_dGVzdHMvdGVzdC1lbmNvZGluZy50..ed22a0150599fc1cf861e73620497f8443e6a9db_dGVzdHMvdGVzdC1lbmNvZGluZy50 100644 --- a/tests/test-encoding.t +++ b/tests/test-encoding.t @@ -117,6 +117,7 @@ searching for changes adding objects added 4 commits with 4 trees and 4 blobs + adding reference refs/heads/master $ cd .. $ git --git-dir=gitrepo2 log --pretty=medium diff --git a/tests/test-file-removal.t b/tests/test-file-removal.t index f16d5105971dcbd716c5f044042c1536dc1bc049_dGVzdHMvdGVzdC1maWxlLXJlbW92YWwudA==..ed22a0150599fc1cf861e73620497f8443e6a9db_dGVzdHMvdGVzdC1maWxlLXJlbW92YWwudA== 100644 --- a/tests/test-file-removal.t +++ b/tests/test-file-removal.t @@ -172,6 +172,7 @@ searching for changes adding objects added 9 commits with 8 trees and 5 blobs + adding reference refs/heads/master $ cd .. $ git --git-dir=gitrepo2 log --pretty=medium diff --git a/tests/test-git-gpg.t b/tests/test-git-gpg.t index f16d5105971dcbd716c5f044042c1536dc1bc049_dGVzdHMvdGVzdC1naXQtZ3BnLnQ=..ed22a0150599fc1cf861e73620497f8443e6a9db_dGVzdHMvdGVzdC1naXQtZ3BnLnQ= 100644 --- a/tests/test-git-gpg.t +++ b/tests/test-git-gpg.t @@ -66,6 +66,7 @@ searching for changes adding objects added 1 commits with 1 trees and 0 blobs + adding reference refs/heads/signed $ cd .. Verify the commit diff --git a/tests/test-merge.t b/tests/test-merge.t index f16d5105971dcbd716c5f044042c1536dc1bc049_dGVzdHMvdGVzdC1tZXJnZS50..ed22a0150599fc1cf861e73620497f8443e6a9db_dGVzdHMvdGVzdC1tZXJnZS50 100644 --- a/tests/test-merge.t +++ b/tests/test-merge.t @@ -46,6 +46,8 @@ searching for changes adding objects added 4 commits with 4 trees and 3 blobs + adding reference refs/heads/beta + adding reference refs/heads/master $ cd .. git log in repo pushed from hg diff --git a/tests/test-octopus.t b/tests/test-octopus.t index f16d5105971dcbd716c5f044042c1536dc1bc049_dGVzdHMvdGVzdC1vY3RvcHVzLnQ=..ed22a0150599fc1cf861e73620497f8443e6a9db_dGVzdHMvdGVzdC1vY3RvcHVzLnQ= 100644 --- a/tests/test-octopus.t +++ b/tests/test-octopus.t @@ -113,6 +113,11 @@ searching for changes adding objects added 8 commits with 8 trees and 6 blobs + adding reference refs/heads/branch1 + adding reference refs/heads/branch2 + adding reference refs/heads/branch3 + adding reference refs/heads/branch4 + adding reference refs/heads/master $ cd .. $ git --git-dir=gitrepo2 log --pretty=medium | sed s/\\.\\.\\.//g diff --git a/tests/test-push.t b/tests/test-push.t index f16d5105971dcbd716c5f044042c1536dc1bc049_dGVzdHMvdGVzdC1wdXNoLnQ=..ed22a0150599fc1cf861e73620497f8443e6a9db_dGVzdHMvdGVzdC1wdXNoLnQ= 100644 --- a/tests/test-push.t +++ b/tests/test-push.t @@ -211,6 +211,7 @@ searching for changes adding objects added 1 commits with 1 trees and 1 blobs + adding reference refs/heads/master $ hg summary parent: -1:000000000000 (no revision checked out) branch: default diff --git a/tests/test-tree-decomposition.t b/tests/test-tree-decomposition.t index f16d5105971dcbd716c5f044042c1536dc1bc049_dGVzdHMvdGVzdC10cmVlLWRlY29tcG9zaXRpb24udA==..ed22a0150599fc1cf861e73620497f8443e6a9db_dGVzdHMvdGVzdC10cmVlLWRlY29tcG9zaXRpb24udA== 100644 --- a/tests/test-tree-decomposition.t +++ b/tests/test-tree-decomposition.t @@ -45,6 +45,7 @@ searching for changes adding objects added 3 commits with 6 trees and 3 blobs + adding reference refs/heads/master $ cd .. $ git --git-dir=gitrepo2 log --pretty=medium