Re: [PATCH v2 1/4] git-p4: add optional type specifier to gitConfig reader
- From
Lars Schneider <larsxschneider@gmail.com>
- Date
- Sep 3, 2015, 20:14 UTC
- Message-ID
- <A76D6BC6-E0AD-48F4-AE33-80BD0803BFA3@gmail.com>
- In-Reply-To
- <55E8A5C2.9090500@diamand.org>
On 03 Sep 2015, at 21:55, Luke Diamand <luke@diamand.org> wrote:
Show 5 quoted lines
> On 03/09/15 17:35, larsxschneider@gmail.com wrote: >> From: Lars Schneider <larsxschneider@gmail.com> >> > > I think this commit may need some explanation!
The functions “gitConfig” and “gitConfigBool” are almost identical. Make “gitConfig” more generic by adding an optional type specifier. Use the type specifier “—bool” with “gitConfig” to implement “gitConfigBool. This prepares the implementation of other type specifiers such as “—int”.
OK?
Thank you, Lars
Show 39 quoted lines
>
>> Signed-off-by: Lars Schneider <larsxschneider@gmail.com>
>> ---
>> git-p4.py | 12 ++++++------
>> 1 file changed, 6 insertions(+), 6 deletions(-)
>>
>> diff --git a/git-p4.py b/git-p4.py
>> index 073f87b..c139cab 100755
>> --- a/git-p4.py
>> +++ b/git-p4.py
>> @@ -604,9 +604,12 @@ def gitBranchExists(branch):
>>
>> _gitConfig = {}
>>
>> -def gitConfig(key):
>> +def gitConfig(key, typeSpecifier=None):
>> if not _gitConfig.has_key(key):
>> - cmd = [ "git", "config", key ]
>> + cmd = [ "git", "config" ]
>> + if typeSpecifier:
>> + cmd += [ typeSpecifier ]
>> + cmd += [ key ]
>> s = read_pipe(cmd, ignore_error=True)
>> _gitConfig[key] = s.strip()
>> return _gitConfig[key]
>> @@ -617,10 +620,7 @@ def gitConfigBool(key):
>> in the config."""
>>
>> if not _gitConfig.has_key(key):
>> - cmd = [ "git", "config", "--bool", key ]
>> - s = read_pipe(cmd, ignore_error=True)
>> - v = s.strip()
>> - _gitConfig[key] = v == "true"
>> + _gitConfig[key] = gitConfig(key, '--bool') == "true"
>> return _gitConfig[key]
>>
>> def gitConfigList(key):
>>
>