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

remote-hg: fix for older versions of python

Browse Source 
As Amit Bakshi reported, older versions of python (< 2.7) don't have
subprocess.check_output, so let's use subprocess.Popen directly as
suggested.

Suggested-by: Amit Bakshi <ambakshi@gmail.com>
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Felipe Contreras 2012-11-28 02:01:33 +01:00 committed by Junio C Hamano
parent 418673c4bc
commit 1e310551e7
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -56,6 +56,12 @@ def hgmode(mode):
m = { '0100755': 'x', '0120000': 'l' }
return m.get(mode, '')
def get_config(config):
cmd = ['git', 'config', '--get', config]
process = subprocess.Popen(cmd, stdout=subprocess.PIPE)
output, _ = process.communicate()
return output
class Marks:
def __init__(self, path):
@ -727,12 +733,10 @@ def main(args):
hg_git_compat = False
track_branches = True
try:
cmd = ['git', 'config', '--get', 'remote-hg.hg-git-compat']
if subprocess.check_output(cmd) == 'true\n':
if get_config('remote-hg.hg-git-compat') == 'true\n':
hg_git_compat = True
track_branches = False
cmd = ['git', 'config', '--get', 'remote-hg.track-branches']
if subprocess.check_output(cmd) == 'false\n':
if get_config('remote-hg.track-branches') == 'false\n':
track_branches = False
except subprocess.CalledProcessError:
pass