undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remote-hg: add option to not track branches

Browse Source 
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>
This commit is contained in:
Felipe Contreras 2012-11-04 03:13:37 +01:00 committed by Jeff King
parent aefc605ada
commit e30473c185
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
contrib/remote-helpers/git-remote-hg
View File

@ -449,14 +449,9 @@ def list_head(repo, cur):
g_head = (head, node) g_head = (head, node)
def do_list(parser): def do_list(parser):
global branches, bmarks, mode global branches, bmarks, mode, track_branches
repo = parser.repo 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(): for bmark, node in bookmarks.listbookmarks(repo).iteritems():
bmarks[bmark] = repo[node] bmarks[bmark] = repo[node]
@ -464,7 +459,12 @@ def do_list(parser):
list_head(repo, cur) 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: for branch in branches:
print "? refs/heads/branches/%s" % branch print "? refs/heads/branches/%s" % branch
@ -713,16 +713,22 @@ def main(args):
global prefix, dirname, branches, bmarks global prefix, dirname, branches, bmarks
global marks, blob_marks, parsed_refs global marks, blob_marks, parsed_refs
global peer, mode, bad_mail, bad_name global peer, mode, bad_mail, bad_name
global track_branches
alias = args[1] alias = args[1]
url = args[2] url = args[2]
peer = None peer = None
cmd = ['git', 'config', '--get', 'remote-hg.hg-git-compat']
hg_git_compat = False hg_git_compat = False
track_branches = True
try: try:
cmd = ['git', 'config', '--get', 'remote-hg.hg-git-compat']
if subprocess.check_output(cmd) == 'true\n': if subprocess.check_output(cmd) == 'true\n':
hg_git_compat = True 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: except subprocess.CalledProcessError:
pass pass