From: Felipe Contreras Date: Mon, 13 May 2013 23:11:54 GMT Subject: [PATCH v3 04/10] remote-hg: add new get_config_bool() helper Message-ID: <1368486720-2716-5-git-send-email-felipe.contreras@gmail.com> In-Reply-To: <1368486720-2716-1-git-send-email-felipe.contreras@gmail.com> No functional changes. Signed-off-by: Felipe Contreras --- contrib/remote-helpers/git-remote-hg | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/contrib/remote-helpers/git-remote-hg b/contrib/remote-helpers/git-remote-hg index de3a96e..4a5c72f 100755 --- a/contrib/remote-helpers/git-remote-hg +++ b/contrib/remote-helpers/git-remote-hg @@ -87,6 +87,15 @@ def get_config(config): output, _ = process.communicate() return output +def get_config_bool(config, default=False): + value = get_config(config).rstrip('\n') + if value == "true": + return True + elif value == "false": + return False + else: + return default + class Marks: def __init__(self, path): @@ -327,7 +336,7 @@ def get_repo(url, alias): myui.setconfig('ui', 'interactive', 'off') myui.fout = sys.stderr - if get_config('remote-hg.insecure') == 'true\n': + if get_config_bool('remote-hg.insecure'): myui.setconfig('web', 'cacerts', '') try: @@ -903,16 +912,9 @@ def main(args): url = args[2] peer = None - hg_git_compat = False - track_branches = True - force_push = True - - if get_config('remote-hg.hg-git-compat') == 'true\n': - hg_git_compat = True - if get_config('remote-hg.track-branches') == 'false\n': - track_branches = False - if get_config('remote-hg.force-push') == 'false\n': - force_push = False + hg_git_compat = get_config_bool('remote-hg.hg-git-compat') + track_branches = get_config_bool('remote-hg.track-branches', True) + force_push = get_config_bool('remote-hg.force-push', True) if hg_git_compat: mode = 'hg' -- 1.8.3.rc1.579.g184e698