diff options
| author | Felipe Contreras <felipe.contreras@gmail.com> | 2012-11-28 02:01:33 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-11-27 18:04:00 -0800 |
| commit | 1e310551e7e3a2efe41cbe1bc0a6b919cd6f7d34 (patch) | |
| tree | 99dc107dda30f8557e6d0b4f8c85bf12a2ef4cef | |
| parent | 418673c4bc48c0b54856449739023b4f978ea235 (diff) | |
| download | git-1e310551e7e3a2efe41cbe1bc0a6b919cd6f7d34.tar.gz | |
remote-hg: fix for older versions of python
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>
| -rwxr-xr-x | contrib/remote-helpers/git-remote-hg | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg index 62c39db5b4..016cdadb4d 100755 --- a/contrib/remote-helpers/git-remote-hg +++ b/contrib/remote-helpers/git-remote-hg @@ -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 |