mirror of
https://chromium.googlesource.com/chromium/tools/depot_tools.git
synced 2026-01-11 18:51:29 +00:00
Revert "Update gclient to use git config caching"
This reverts commit 3edda8d185.
Reason for revert: Breaks rebase-update; crbug.com/324358728
Original change's description:
> Update gclient to use git config caching
>
> This change updates all the modules used by gclient to use `scm.GIT` for git config calls over directly invoking the subprocess.
>
> This change currently doesn't modify git_cache since the config reads and writes within it are done on bare repository. A follow-up CL will update git_cache.
>
> A follow-up CL will also update git_cl and git_map_branches since they have shown performance improvements too: https://crrev.com/c/4697786.
>
> Benchmarking
> ============
> With chromium/src as the baseline super project, this change reduces about 380 git config calls out of 507 total calls on cache hits during no-op. The below numbers are benchmarked with `update_depot_tools` turned off.
>
> Windows Benchmark
> =================
> Baseline (gpaste/6360045736951808): ~1min 12 sec.
> With Caching (gpaste/6480065209040896): ~1min 3sec.
> ~12.5% decrease in gclient sync noop runtime.
>
> Linux Benchmark
> ===============
> Baseline (gpaste/4730436763254784): ~3.739 sec.
> With Caching (gpaste/4849870978940928): ~3.534 sec.
> ~5.5% decrease in gclient sync noop runtime.
>
> Bug: 1501984
> Change-Id: Ib48df2d26a0c742a9b555a1e2ed6366221c7db17
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/5252498
> Commit-Queue: Aravind Vasudevan <aravindvasudev@google.com>
> Reviewed-by: Josip Sokcevic <sokcevic@chromium.org>
Bug: 1501984
Change-Id: I4a603238d9ed43edafc8e574493800670520a1d9
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/5279198
Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Commit-Queue: Aravind Vasudevan <aravindvasudev@google.com>
This commit is contained in:
Aravind Vasudevan
committed by
LUCI CQ
LUCI CQ
parent
e98e458a9f
commit
3569608028
@@ -134,8 +134,11 @@ class SCMWrapper(object):
|
||||
|
||||
@staticmethod
|
||||
def _get_first_remote_url(checkout_path):
|
||||
log = scm.GIT.YieldConfigRegexp(checkout_path, r'remote.*.url')
|
||||
return next(log)[1]
|
||||
log = scm.GIT.Capture(
|
||||
['config', '--local', '--get-regexp', r'remote.*.url'],
|
||||
cwd=checkout_path)
|
||||
# Get the second token of the first line of the log.
|
||||
return log.splitlines()[0].split(' ', 1)[1]
|
||||
|
||||
def GetCacheMirror(self):
|
||||
if getattr(self, 'cache_dir', None):
|
||||
@@ -589,35 +592,26 @@ class GitWrapper(SCMWrapper):
|
||||
def wrapper(*args):
|
||||
return_val = f(*args)
|
||||
if os.path.exists(os.path.join(args[0].checkout_path, '.git')):
|
||||
# The config updates to the project are stored in this list
|
||||
# and updated consecutively after the reads. The updates
|
||||
# are done this way because `scm.GIT.GetConfig` caches
|
||||
# the config file and `scm.GIT.SetConfig` evicts the cache.
|
||||
# This ensures we don't interleave reads and writes causing
|
||||
# the cache to set and unset consecutively.
|
||||
config_updates = []
|
||||
|
||||
if scm.GIT.GetConfig(args[0].checkout_path,
|
||||
'diff.ignoresubmodules') != 'dirty':
|
||||
# If diff.ignoreSubmodules is not already set, set it to `all`.
|
||||
config_updates.append(('diff.ignoreSubmodules', 'dirty'))
|
||||
|
||||
if scm.GIT.GetConfig(args[0].checkout_path,
|
||||
'fetch.recursesubmodules') != 'off':
|
||||
config_updates.append(('fetch.recurseSubmodules', 'off'))
|
||||
|
||||
if scm.GIT.GetConfig(args[0].checkout_path,
|
||||
'push.recursesubmodules') != 'off':
|
||||
# If diff.ignoreSubmodules is not already set, set it to `all`.
|
||||
config = subprocess2.capture(['git', 'config', '-l'],
|
||||
cwd=args[0].checkout_path).decode(
|
||||
'utf-8').strip().splitlines()
|
||||
if 'diff.ignoresubmodules=dirty' not in config:
|
||||
subprocess2.capture(
|
||||
['git', 'config', 'diff.ignoreSubmodules', 'dirty'],
|
||||
cwd=args[0].checkout_path)
|
||||
if 'fetch.recursesubmodules=off' not in config:
|
||||
subprocess2.capture(
|
||||
['git', 'config', 'fetch.recurseSubmodules', 'off'],
|
||||
cwd=args[0].checkout_path)
|
||||
if 'push.recursesubmodules=off' not in config:
|
||||
# The default is off, but if user sets submodules.recurse to
|
||||
# on, this becomes on too. We never want to push submodules
|
||||
# for gclient managed repositories. Push, even if a no-op,
|
||||
# will increase `git cl upload` latency.
|
||||
config_updates.append(('push.recurseSubmodules', 'off'))
|
||||
|
||||
for update in config_updates:
|
||||
scm.GIT.SetConfig(args[0].checkout_path, update[0],
|
||||
update[1])
|
||||
|
||||
subprocess2.capture(
|
||||
['git', 'config', 'push.recurseSubmodules', 'off'],
|
||||
cwd=args[0].checkout_path)
|
||||
return return_val
|
||||
|
||||
return wrapper
|
||||
@@ -745,8 +739,7 @@ class GitWrapper(SCMWrapper):
|
||||
|
||||
# See if the url has changed (the unittests use git://foo for the url,
|
||||
# let that through).
|
||||
current_url = scm.GIT.GetConfig(self.checkout_path,
|
||||
f'remote.{self.remote}.url')
|
||||
current_url = self._Capture(['config', 'remote.%s.url' % self.remote])
|
||||
return_early = False
|
||||
# TODO(maruel): Delete url != 'git://foo' since it's just to make the
|
||||
# unit test pass. (and update the comment above)
|
||||
@@ -757,9 +750,12 @@ class GitWrapper(SCMWrapper):
|
||||
strp_current_url = current_url[:-4] if current_url.endswith(
|
||||
'.git') else current_url
|
||||
if (strp_current_url.rstrip('/') != strp_url.rstrip('/')
|
||||
and url != 'git://foo' and scm.GIT.GetConfigBool(
|
||||
self.checkout_path,
|
||||
f'remote.{self.remote}.gclient-auto-fix-url')):
|
||||
and url != 'git://foo' and
|
||||
subprocess2.capture([
|
||||
'git', 'config',
|
||||
'remote.%s.gclient-auto-fix-url' % self.remote
|
||||
],
|
||||
cwd=self.checkout_path).strip() != 'False'):
|
||||
self.Print('_____ switching %s from %s to new upstream %s' %
|
||||
(self.relpath, current_url, url))
|
||||
if not (options.force or options.reset):
|
||||
@@ -1557,30 +1553,34 @@ class GitWrapper(SCMWrapper):
|
||||
if requested."""
|
||||
if options.force or options.reset:
|
||||
try:
|
||||
scm.GIT.SetConfig(self.checkout_path,
|
||||
f'remote.{self.remote}.fetch',
|
||||
modify_all=True)
|
||||
scm.GIT.SetConfig(
|
||||
self.checkout_path, f'remote.{self.remote}.fetch',
|
||||
f'+refs/heads/*:refs/remotes/{self.remote}/*')
|
||||
self._Run(
|
||||
['config', '--unset-all',
|
||||
'remote.%s.fetch' % self.remote], options)
|
||||
self._Run([
|
||||
'config',
|
||||
'remote.%s.fetch' % self.remote,
|
||||
'+refs/heads/*:refs/remotes/%s/*' % self.remote
|
||||
], options)
|
||||
except subprocess2.CalledProcessError as e:
|
||||
# If exit code was 5, it means we attempted to unset a config
|
||||
# that didn't exist. Ignore it.
|
||||
if e.returncode != 5:
|
||||
raise
|
||||
if hasattr(options, 'with_branch_heads') and options.with_branch_heads:
|
||||
scm.GIT.SetConfig(
|
||||
self.checkout_path,
|
||||
f'remote.{self.remote}.fetch',
|
||||
config_cmd = [
|
||||
'config',
|
||||
'remote.%s.fetch' % self.remote,
|
||||
'+refs/branch-heads/*:refs/remotes/branch-heads/*',
|
||||
value_pattern='^\\+refs/branch-heads/\\*:.*$',
|
||||
modify_all=True)
|
||||
'^\\+refs/branch-heads/\\*:.*$'
|
||||
]
|
||||
self._Run(config_cmd, options)
|
||||
if hasattr(options, 'with_tags') and options.with_tags:
|
||||
scm.GIT.SetConfig(self.checkout_path,
|
||||
f'remote.{self.remote}.fetch',
|
||||
'+refs/tags/*:refs/tags/*',
|
||||
value_pattern='^\\+refs/tags/\\*:.*$',
|
||||
modify_all=True)
|
||||
config_cmd = [
|
||||
'config',
|
||||
'remote.%s.fetch' % self.remote, '+refs/tags/*:refs/tags/*',
|
||||
'^\\+refs/tags/\\*:.*$'
|
||||
]
|
||||
self._Run(config_cmd, options)
|
||||
|
||||
def _AutoFetchRef(self, options, revision, depth=None):
|
||||
"""Attempts to fetch |revision| if not available in local repo.
|
||||
|
||||
Reference in New Issue
Block a user