opendev/git-review
Code Issues Proposed changes

Merge "Fix wrong and misleading "using default: None" in --verbose mode"

Browse Source
This commit is contained in:
Zuul 2018-12-27 11:25:24 +00:00 committed by Gerrit Code Review
commit afa54af210
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
git_review/cmd.py
View File

@ -261,12 +261,15 @@ def git_config_get_value(section, option, default=None, as_bool=False):
try: try:
result = run_command_exc(GitConfigException, *cmd).strip() result = run_command_exc(GitConfigException, *cmd).strip()
if VERBOSE: if VERBOSE:
print(datetime.datetime.now(), "result:", result) print(datetime.datetime.now(), "... %s.%s = %s"
% (section, option, result))
return result return result
except GitConfigException as exc: except GitConfigException as exc:
if exc.rc == 1: if exc.rc == 1:
if VERBOSE: if VERBOSE and default is not None:
print(datetime.datetime.now(), "using default:", default) print(datetime.datetime.now(),
"... nothing in git config, returning func parameter:",
default)
return default return default
raise raise
@ -289,9 +292,16 @@ class Config(object):
self.config.update(load_config_file(filename)) self.config.update(load_config_file(filename))
def __getitem__(self, key): def __getitem__(self, key):
"""Let 'git config --get' override every Config['key'] access"""
value = git_config_get_value('gitreview', key) value = git_config_get_value('gitreview', key)
if value is None: if value is None:
value = self.config[key] value = self.config[key]
# "--verbose" doesn't trace *early* invocations; for that you
# must change the value at the top of this file (*and* pass
# --verbose)
if VERBOSE:
print(datetime.datetime.now(),
"Config['%s'] = %s " % (key, value))
return value return value