From c8f23e26bee90ce6b02211c9489d4e4e947af02a Mon Sep 17 00:00:00 2001 From: Joanna Wang Date: Thu, 19 Jan 2023 21:18:10 +0000 Subject: [PATCH] Revert "Remove rietveld.cc to test removing all reitveld config sttuff." This reverts commit 8c5174b5276efa6375b3ff2f97ce2dab66ee335f. Reason for revert: Need to replace this before removing. Original change's description: > Remove rietveld.cc to test removing all reitveld config sttuff. > > Bug:b/266001713 > Change-Id: Ib5342e7519d7f7eaccf0a0a6f4a39c13677406bb > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/4178919 > Reviewed-by: Aravind Vasudevan > Commit-Queue: Joanna Wang Bug: b/266001713 Change-Id: Ief110063e7146f045df669ec138c4f01eccc44d0 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/4182421 Commit-Queue: Rubber Stamper Reviewed-by: Aravind Vasudevan Commit-Queue: Aravind Vasudevan Bot-Commit: Rubber Stamper Auto-Submit: Joanna Wang --- git_cl.py | 10 ++++++++-- tests/git_cl_test.py | 1 + 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/git_cl.py b/git_cl.py index 47c52df73..a1bbbeb39 100755 --- a/git_cl.py +++ b/git_cl.py @@ -807,6 +807,9 @@ class Settings(object): 'rietveld.run-post-upload-hook') return run_post_upload_hook == "True" + def GetDefaultCCList(self): + return self._GetConfig('rietveld.cc') + def GetUsePython3(self): return self._GetConfig('rietveld.use-python3') @@ -1063,7 +1066,9 @@ class Changelist(object): flag. """ if self.cc is None: - self.cc = ','.join(filter(None, self.more_cc)) or '' + base_cc = settings.GetDefaultCCList() + more_cc = ','.join(self.more_cc) + self.cc = ','.join(filter(None, (base_cc, more_cc))) or '' return self.cc def ExtendCC(self, more_cc): @@ -2533,7 +2538,7 @@ class Changelist(object): reviewers = sorted(change_desc.get_reviewers()) cc = [] - # Add CCs from WATCHLISTS and git config unless this is + # Add CCs from WATCHLISTS and rietveld.cc git config unless this is # the initial upload, the CL is private, or auto-CCing has ben disabled. if not (self.GetIssue() or options.private or options.no_autocc): cc = self.GetCCList().split(',') @@ -3197,6 +3202,7 @@ def LoadCodereviewSettingsFromFile(fileobj): 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) SetProperty('tree-status-url', 'STATUS', unset_error_ok=True) SetProperty('viewvc-url', 'VIEW_VC', unset_error_ok=True) SetProperty('bug-prefix', 'BUG_PREFIX', unset_error_ok=True) diff --git a/tests/git_cl_test.py b/tests/git_cl_test.py index c1bf7940a..102e2451e 100755 --- a/tests/git_cl_test.py +++ b/tests/git_cl_test.py @@ -713,6 +713,7 @@ class TestGitCl(unittest.TestCase): def test_LoadCodereviewSettingsFromFile_gerrit(self): codereview_file = StringIO('GERRIT_HOST: true') self.calls = [ + ((['git', 'config', '--unset-all', 'rietveld.cc'],), 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),