Skip to content

Commit

Permalink
git-p4: add optional type specifier to gitConfig reader
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Lars Schneider authored and Junio C Hamano committed Oct 3, 2015
1 parent 689efb7 commit 692e179
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions git-p4.py
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand All @@ -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):
Expand Down

0 comments on commit 692e179

Please sign in to comment.