remote-hg: use remote 'default' not local one

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg
index 5ad5c1e1a379d93842b2f5529017fcd9fa1a36d4..a1b22f7c6c7e6145a8b0df126fbba5283a29f659 100755 (executable)
--- a/contrib/remote-helpers/git-remote-hg
+++ b/contrib/remote-helpers/git-remote-hg
@@ -580,11 +580,11 @@ def get_branch_tip(repo, branch):
 def list_head(repo, cur):
     global g_head, bmarks, fake_bmark
 
 def list_head(repo, cur):
     global g_head, bmarks, fake_bmark
 

-    if 'default' not in repo:
+    if 'default' not in branches:

         # empty repo
         return
 
         # empty repo
         return
 

-    node = repo['default']
+    node = repo[branch_tip('default')]

     head = 'master' if not 'master' in bmarks else 'default'
     fake_bmark = head
     bmarks[head] = node
     head = 'master' if not 'master' in bmarks else 'default'
     fake_bmark = head
     bmarks[head] = node


@@ -601,18 +601,17 @@ def do_list(parser):
         bmarks[bmark] = repo[node]
 
     cur = repo.dirstate.branch()
         bmarks[bmark] = repo[node]
 
     cur = repo.dirstate.branch()

+    orig = peer if peer else repo
+
+    for branch, heads in orig.branchmap().iteritems():
+        # only open heads
+        heads = [h for h in heads if 'close' not in repo.changelog.read(h)[5]]
+        if heads:
+            branches[branch] = heads

 
     list_head(repo, cur)
 
     if track_branches:
 
     list_head(repo, cur)
 
     if track_branches:

-        orig = peer if peer else repo
-
-        for branch, heads in orig.branchmap().iteritems():
-            # only open heads
-            heads = [h for h in heads if 'close' not in repo.changelog.read(h)[5]]
-            if heads:
-                branches[branch] = heads
-

         for branch in branches:
             print "? refs/heads/branches/%s" % gitref(branch)
 
         for branch in branches:
             print "? refs/heads/branches/%s" % gitref(branch)
 

diff --git a/contrib/remote-helpers/test-hg.sh b/contrib/remote-helpers/test-hg.sh
index 20f5b3212356fa2b1426c9a22f674e3ee1adc7ca..b887233658de28a838b2be7bf375b38a261033af 100755 (executable)
--- a/contrib/remote-helpers/test-hg.sh
+++ b/contrib/remote-helpers/test-hg.sh
@@ -486,7 +486,7 @@ test_expect_success 'remote big push' '
        check_bookmark hgrepo new_bmark ''
 '
 
        check_bookmark hgrepo new_bmark ''
 '
 

-test_expect_failure 'remote double failed push' '
+test_expect_success 'remote double failed push' '

        test_when_finished "rm -rf hgrepo gitrepo*" &&
 
        (
        test_when_finished "rm -rf hgrepo gitrepo*" &&
 
        (