Skip to content

Commit

Permalink
remote-hg: add option to not track branches
Browse files Browse the repository at this point in the history
Some people prefer it this way.

 % git config --global remote-hg.track-branches false

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Jeff King <peff@peff.net>
  • Loading branch information
Felipe Contreras authored and Jeff King committed Nov 4, 2012
1 parent aefc605 commit e30473c
Showing 1 changed file with 14 additions and 8 deletions.
22 changes: 14 additions & 8 deletions contrib/remote-helpers/git-remote-hg
Original file line number Diff line number Diff line change
Expand Up @@ -449,22 +449,22 @@ def list_head(repo, cur):
g_head = (head, node)

def do_list(parser):
global branches, bmarks, mode
global branches, bmarks, mode, track_branches

repo = parser.repo
for branch in repo.branchmap():
heads = repo.branchheads(branch)
if len(heads):
branches[branch] = heads

for bmark, node in bookmarks.listbookmarks(repo).iteritems():
bmarks[bmark] = repo[node]

cur = repo.dirstate.branch()

list_head(repo, cur)

if mode != 'hg':
if track_branches:
for branch in repo.branchmap():
heads = repo.branchheads(branch)
if len(heads):
branches[branch] = heads

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

Expand Down Expand Up @@ -713,16 +713,22 @@ def main(args):
global prefix, dirname, branches, bmarks
global marks, blob_marks, parsed_refs
global peer, mode, bad_mail, bad_name
global track_branches

alias = args[1]
url = args[2]
peer = None

cmd = ['git', 'config', '--get', 'remote-hg.hg-git-compat']
hg_git_compat = False
track_branches = True
try:
cmd = ['git', 'config', '--get', 'remote-hg.hg-git-compat']
if subprocess.check_output(cmd) == 'true\n':
hg_git_compat = True
track_branches = False
cmd = ['git', 'config', '--get', 'remote-hg.track-branches']
if subprocess.check_output(cmd) == 'false\n':
track_branches = False
except subprocess.CalledProcessError:
pass

Expand Down

0 comments on commit e30473c

Please sign in to comment.