From ff0a3c8f80339960623acf76ec2bb6c1ad61c352 Mon Sep 17 00:00:00 2001 From: Conley Owens Date: Thu, 30 Jan 2014 14:46:03 -0800 Subject: Share git version parsing code with wrapper module 'repo' and 'git_command.py' had their own git version parsing code. This change shares that code between the modules. DRY is good. Change-Id: Ic896d2dc08353644bd4ced57e15a91284d97d54a --- git_command.py | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'git_command.py') diff --git a/git_command.py b/git_command.py index 89b681e1..354fc715 100644 --- a/git_command.py +++ b/git_command.py @@ -21,6 +21,7 @@ import tempfile from signal import SIGTERM from error import GitError from trace import REPO_TRACE, IsTrace, Trace +from wrapper import Wrapper GIT = 'git' MIN_GIT_VERSION = (1, 5, 4) @@ -84,19 +85,10 @@ class _GitCall(object): def version_tuple(self): global _git_version - if _git_version is None: ver_str = git.version().decode('utf-8') - if ver_str.startswith('git version '): - num_ver_str = ver_str[len('git version '):].strip().split('-')[0] - to_tuple = [] - for num_str in num_ver_str.split('.')[:3]: - if num_str.isdigit(): - to_tuple.append(int(num_str)) - else: - to_tuple.append(0) - _git_version = tuple(to_tuple) - else: + _git_version = Wrapper().ParseGitVersion(ver_str) + if _git_version is None: print('fatal: "%s" unsupported' % ver_str, file=sys.stderr) sys.exit(1) return _git_version -- cgit v1.2.3-54-g00ecf