git-p4: add optional type specifier to gitConfig reader
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". Signed-off-by: Lars Schneider <larsxschneider@gmail.com> Acked-by: Luke Diamand <luke@diamand.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
689efb737a
commit
692e17964d
12
git-p4.py
12
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):
|
||||
|
Loading…
Reference in New Issue
Block a user