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

Revert of Specify GIT_DIR when running git-config in a mirror. (patchset #4 id:60001 of https://codereview.chromium.org/1167193002/)

Browse Source 
Reason for revert:
Potentially broke the NaCl toolchain builders:
crbug.com/498942

Speculative revert.

Original issue's description:
> Specify GIT_DIR when running git-config in a mirror.
> 
> BUG=497894
> R=hinoka@chromium.org,agable@chromium.org
> 
> Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=295587

TBR=agable@chromium.org,szager@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=497894

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@295607 0039d316-1c4b-4281-b951-d872f2087c98
This commit is contained in:
hinoka@chromium.org
2015-06-10 19:19:07 +00:00
parent a6de1f438c
commit 8e095af012
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
git_cache.py
View File

@@ -219,26 +219,23 @@ class Mirror(object):
def config(self, cwd=None):
if cwd is None:
cwd = self.mirror_path
env = os.environ.copy()
env['GIT_DIR'] = cwd
# Don't run git-gc in a daemon. Bad things can happen if it gets killed.
self.RunGit(['config', 'gc.autodetach', '0'], cwd=cwd, env=env)
self.RunGit(['config', 'gc.autodetach', '0'], cwd=cwd)
# Don't combine pack files into one big pack file. It's really slow for
# repositories, and there's no way to track progress and make sure it's
# not stuck.
self.RunGit(['config', 'gc.autopacklimit', '0'], cwd=cwd, env=env)
self.RunGit(['config', 'gc.autopacklimit', '0'], cwd=cwd)
# Allocate more RAM for cache-ing delta chains, for better performance
# of "Resolving deltas".
self.RunGit(['config', 'core.deltaBaseCacheLimit',
gclient_utils.DefaultDeltaBaseCacheLimit()], cwd=cwd, env=env)
gclient_utils.DefaultDeltaBaseCacheLimit()], cwd=cwd)
self.RunGit(['config', 'remote.origin.url', self.url], cwd=cwd, env=env)
self.RunGit(['config', 'remote.origin.url', self.url], cwd=cwd)
self.RunGit(['config', '--replace-all', 'remote.origin.fetch',
'+refs/heads/*:refs/heads/*', r'\+refs/heads/\*:.*'],
cwd=cwd, env=env)
'+refs/heads/*:refs/heads/*', r'\+refs/heads/\*:.*'], cwd=cwd)
for ref in self.refs:
ref = ref.lstrip('+').rstrip('/')
if ref.startswith('refs/'):
@@ -249,7 +246,7 @@ class Mirror(object):
regex = r'\+refs/heads/%s:.*' % ref.replace('*', r'\*')
self.RunGit(
['config', '--replace-all', 'remote.origin.fetch', refspec, regex],
cwd=cwd, env=env)
cwd=cwd)
def bootstrap_repo(self, directory):
"""Bootstrap the repo from Google Stroage if possible.