diff options
author | Conley Owens <cco3@android.com> | 2014-01-30 14:46:03 -0800 |
---|---|---|
committer | Conley Owens <cco3@android.com> | 2014-01-30 15:18:56 -0800 |
commit | ff0a3c8f80339960623acf76ec2bb6c1ad61c352 (patch) | |
tree | da428ef023417f9716f6aa6ce980a7777ed1d78c /git_command.py | |
parent | 094cdbe090a18c35fdcfb463435d793cc0239e83 (diff) | |
download | git-repo-ff0a3c8f80339960623acf76ec2bb6c1ad61c352.tar.gz |
Share git version parsing code with wrapper modulev1.12.12
'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
Diffstat (limited to 'git_command.py')
-rw-r--r-- | git_command.py | 14 |
1 files changed, 3 insertions, 11 deletions
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 | |||
21 | from signal import SIGTERM | 21 | from signal import SIGTERM |
22 | from error import GitError | 22 | from error import GitError |
23 | from trace import REPO_TRACE, IsTrace, Trace | 23 | from trace import REPO_TRACE, IsTrace, Trace |
24 | from wrapper import Wrapper | ||
24 | 25 | ||
25 | GIT = 'git' | 26 | GIT = 'git' |
26 | MIN_GIT_VERSION = (1, 5, 4) | 27 | MIN_GIT_VERSION = (1, 5, 4) |
@@ -84,19 +85,10 @@ class _GitCall(object): | |||
84 | 85 | ||
85 | def version_tuple(self): | 86 | def version_tuple(self): |
86 | global _git_version | 87 | global _git_version |
87 | |||
88 | if _git_version is None: | 88 | if _git_version is None: |
89 | ver_str = git.version().decode('utf-8') | 89 | ver_str = git.version().decode('utf-8') |
90 | if ver_str.startswith('git version '): | 90 | _git_version = Wrapper().ParseGitVersion(ver_str) |
91 | num_ver_str = ver_str[len('git version '):].strip().split('-')[0] | 91 | if _git_version is None: |
92 | to_tuple = [] | ||
93 | for num_str in num_ver_str.split('.')[:3]: | ||
94 | if num_str.isdigit(): | ||
95 | to_tuple.append(int(num_str)) | ||
96 | else: | ||
97 | to_tuple.append(0) | ||
98 | _git_version = tuple(to_tuple) | ||
99 | else: | ||
100 | print('fatal: "%s" unsupported' % ver_str, file=sys.stderr) | 92 | print('fatal: "%s" unsupported' % ver_str, file=sys.stderr) |
101 | sys.exit(1) | 93 | sys.exit(1) |
102 | return _git_version | 94 | return _git_version |