From 48df58136dc1847cd158eaa330f5dd457265d654 Mon Sep 17 00:00:00 2001 From: tandrii Date: Mon, 17 Oct 2016 03:55:37 -0700 Subject: [PATCH] Gerrit git cl: make it work with minimal file. BUG=656555 R=emso@chromium.org,andybons@chromium.org Review-Url: https://codereview.chromium.org/2421253002 --- git_cl.py | 3 ++- tests/git_cl_test.py | 24 ++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/git_cl.py b/git_cl.py index a61bb91446..d8b90046c2 100755 --- a/git_cl.py +++ b/git_cl.py @@ -3064,7 +3064,8 @@ def LoadCodereviewSettingsFromFile(fileobj): else: RunGit(['config', '--unset-all', fullname], error_ok=unset_error_ok) - SetProperty('server', 'CODE_REVIEW_SERVER') + if not keyvals.get('GERRIT_HOST', False): + SetProperty('server', 'CODE_REVIEW_SERVER') # Only server setting is required. Other settings can be absent. # In that case, we ignore errors raised during option deletion attempt. SetProperty('cc', 'CC_LIST', unset_error_ok=True) diff --git a/tests/git_cl_test.py b/tests/git_cl_test.py index 90647a713a..8ef92d301b 100755 --- a/tests/git_cl_test.py +++ b/tests/git_cl_test.py @@ -328,6 +328,30 @@ class TestGitCl(TestCase): raise result return result + def test_LoadCodereviewSettingsFromFile_gerrit(self): + codereview_file = StringIO.StringIO('GERRIT_HOST: true') + self.calls = [ + ((['git', 'config', '--unset-all', 'rietveld.cc'],), CERR1), + ((['git', 'config', '--unset-all', 'rietveld.private'],), CERR1), + ((['git', 'config', '--unset-all', 'rietveld.tree-status-url'],), CERR1), + ((['git', 'config', '--unset-all', 'rietveld.viewvc-url'],), CERR1), + ((['git', 'config', '--unset-all', 'rietveld.bug-prefix'],), CERR1), + ((['git', 'config', '--unset-all', 'rietveld.cpplint-regex'],), CERR1), + ((['git', 'config', '--unset-all', 'rietveld.force-https-commit-url'],), + CERR1), + ((['git', 'config', '--unset-all', 'rietveld.cpplint-ignore-regex'],), + CERR1), + ((['git', 'config', '--unset-all', 'rietveld.project'],), CERR1), + ((['git', 'config', '--unset-all', 'rietveld.pending-ref-prefix'],), + CERR1), + ((['git', 'config', '--unset-all', 'rietveld.git-number-footer'],), + CERR1), + ((['git', 'config', '--unset-all', 'rietveld.run-post-upload-hook'],), + CERR1), + ((['git', 'config', 'gerrit.host', 'true'],), ''), + ] + self.assertIsNone(git_cl.LoadCodereviewSettingsFromFile(codereview_file)) + @classmethod def _is_gerrit_calls(cls, gerrit=False): return [((['git', 'config', 'rietveld.autoupdate'],), ''),