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

Remove git_filter=True from git cache_dir commands.

Browse Source 
This helps prevent timeout when checking out large repositories (like blink)
using the git cache_dir.

R=iannucci@chromium.org, maruel@chromium.org
BUG=295119

Review URL: https://codereview.chromium.org/43273005

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@231111 0039d316-1c4b-4281-b951-d872f2087c98
This commit is contained in:
agable@chromium.org
2013-10-25 20:54:34 +00:00
parent d6ddc1cb9a
commit fd5b638293
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gclient_scm.py
View File

@@ -801,8 +801,7 @@ class GitWrapper(SCMWrapper):
cmd += ['--reference', os.path.abspath(self.checkout_path)]
self._Run(cmd + [url, folder],
options, git_filter=True, filter_fn=filter_fn,
cwd=self.cache_dir, retry=True)
options, filter_fn=filter_fn, cwd=self.cache_dir, retry=True)
else:
# For now, assert that host/path/to/repo.git is identical. We may want
# to relax this restriction in the future to allow for smarter cache
@@ -819,8 +818,7 @@ class GitWrapper(SCMWrapper):
# Would normally use `git remote update`, but it doesn't support
# --progress, so use fetch instead.
self._Run(['fetch'] + v + ['--multiple', '--progress', '--all'],
options, git_filter=True, filter_fn=filter_fn, cwd=folder,
retry=True)
options, filter_fn=filter_fn, cwd=folder, retry=True)
# If the clone has an object dependency on the existing repo, break it
# with repack and remove the linkage.
@@ -859,8 +857,7 @@ class GitWrapper(SCMWrapper):
dir=parent_dir)
try:
clone_cmd.append(tmp_dir)
self._Run(clone_cmd, options, cwd=self._root_dir, git_filter=True,
retry=True)
self._Run(clone_cmd, options, cwd=self._root_dir, retry=True)
gclient_utils.safe_makedirs(self.checkout_path)
gclient_utils.safe_rename(os.path.join(tmp_dir, '.git'),
os.path.join(self.checkout_path, '.git'))
@@ -1037,8 +1034,9 @@ class GitWrapper(SCMWrapper):
fetch_cmd.append('--verbose')
self._Run(fetch_cmd, options, retry=True)
def _Run(self, args, _options, git_filter=False, **kwargs):
def _Run(self, args, options, **kwargs):
kwargs.setdefault('cwd', self.checkout_path)
git_filter = not options.verbose
if git_filter:
kwargs['filter_fn'] = GitFilter(kwargs.get('filter_fn'))
kwargs.setdefault('print_stdout', False)