InTheForest/chromium_depot_tools
1
0
Fork 0
mirror of https://chromium.googlesource.com/chromium/tools/depot_tools.git synced 2026-01-11 18:51:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

[git_cl] Make mode attribute public

Browse Source 
So it can be overridden if needed.

Bug: b/351024645
Change-Id: I6ff5388cefeae00b1ec21e822e127b0eec349428
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/5698628
Commit-Queue: Allen Li <ayatane@chromium.org>
Reviewed-by: Yiwei Zhang <yiwzhang@google.com>
This commit is contained in:
Allen Li
2024-07-16 22:06:31 +00:00
committed by LUCI CQ
parent 1feb63c434
commit e4d053ae47
1 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
git_cl.py
View File

@@ -3702,8 +3702,9 @@ class GitAuthConfigChanger(object):
set_config_func: Function used to set configuration. Used
for testing.
"""
self.mode: GitConfigMode = mode
self._shortname: str = host_shortname
self._mode: GitConfigMode = mode
parts: urllib.parse.SplitResult = urllib.parse.urlsplit(remote_url)
# Base URL looks like https://chromium.googlesource.com/
self._base_url: str = parts._replace(path='/', query='',
@@ -3747,43 +3748,43 @@ class GitAuthConfigChanger(object):
def _apply_cred_helper(self, cwd: str) -> None:
"""Apply config changes relating to credential helper."""
cred_key: str = f'credential.{self._base_url}.helper'
if self._mode == GitConfigMode.NEW_AUTH:
if self.mode == GitConfigMode.NEW_AUTH:
self._set_config(cwd, cred_key, '', modify_all=True)
self._set_config(cwd, cred_key, 'luci', append=True)
elif self._mode == GitConfigMode.NEW_AUTH_SSO:
elif self.mode == GitConfigMode.NEW_AUTH_SSO:
self._set_config(cwd, cred_key, None, modify_all=True)
elif self._mode == GitConfigMode.OLD_AUTH:
elif self.mode == GitConfigMode.OLD_AUTH:
self._set_config(cwd, cred_key, None, modify_all=True)
else:
raise TypeError(f'Invalid mode {self._mode!r}')
raise TypeError(f'Invalid mode {self.mode!r}')
def _apply_sso(self, cwd: str) -> None:
"""Apply config changes relating to SSO."""
sso_key: str = f'url.sso://{self._shortname}/.insteadOf'
if self._mode == GitConfigMode.NEW_AUTH:
if self.mode == GitConfigMode.NEW_AUTH:
self._set_config(cwd, 'protocol.sso.allow', None)
self._set_config(cwd, sso_key, None, modify_all=True)
elif self._mode == GitConfigMode.NEW_AUTH_SSO:
elif self.mode == GitConfigMode.NEW_AUTH_SSO:
self._set_config(cwd, 'protocol.sso.allow', 'always')
self._set_config(cwd, sso_key, self._base_url, modify_all=True)
elif self._mode == GitConfigMode.OLD_AUTH:
elif self.mode == GitConfigMode.OLD_AUTH:
self._set_config(cwd, 'protocol.sso.allow', None)
self._set_config(cwd, sso_key, None, modify_all=True)
else:
raise TypeError(f'Invalid mode {self._mode!r}')
raise TypeError(f'Invalid mode {self.mode!r}')
def _apply_gitcookies(self, cwd: str) -> None:
"""Apply config changes relating to gitcookies."""
if self._mode == GitConfigMode.NEW_AUTH:
if self.mode == GitConfigMode.NEW_AUTH:
# Override potential global gitcookie config
self._set_config(cwd, 'http.gitcookies', '', modify_all=True)
elif self._mode == GitConfigMode.NEW_AUTH_SSO:
elif self.mode == GitConfigMode.NEW_AUTH_SSO:
# Override potential global gitcookie config
self._set_config(cwd, 'http.gitcookies', '', modify_all=True)
elif self._mode == GitConfigMode.OLD_AUTH:
elif self.mode == GitConfigMode.OLD_AUTH:
self._set_config(cwd, 'http.gitcookies', None, modify_all=True)
else:
raise TypeError(f'Invalid mode {self._mode!r}')
raise TypeError(f'Invalid mode {self.mode!r}')
def _set_config(self, *args, **kwargs) -> None:
self._set_config_func(*args, **kwargs)