gclient_scm.py - Issue 2241843002: gclient: kill git fetch operation that hangs.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: gclient_scm.py

Issue 2241843002: gclient: kill git fetch operation that hangs. (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/depot_tools.git@master

Patch Set: Final. Created 4 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: gclient_scm.py

diff --git a/gclient_scm.py b/gclient_scm.py

index 29079c582ffc849d56edf721002e49b68877d536..14bea413eba3211ee08cad4d2eeb4ebfa1bfa21c 100644

--- a/gclient_scm.py

+++ b/gclient_scm.py

@@ -1199,6 +1199,7 @@ class GitWrapper(SCMWrapper):

return self._Capture(checkout_args)

def _Fetch(self, options, remote=None, prune=False, quiet=False):

+ kill_timeout = float(os.getenv('GCLIENT_KILL_GIT_FETCH_AFTER', 0))

tandrii(chromium) 2016/08/24 15:06:10 fyi: i intend to remove this once I actually deplo

cfg = gclient_utils.DefaultIndexPackConfig(self.url)

fetch_cmd = cfg + [

'fetch',

@@ -1211,7 +1212,8 @@ class GitWrapper(SCMWrapper):

fetch_cmd.append('--verbose')

elif quiet:

fetch_cmd.append('--quiet')

- self._Run(fetch_cmd, options, show_header=options.verbose, retry=True)

+ self._Run(fetch_cmd, options, show_header=options.verbose, retry=True,

+ kill_timeout=kill_timeout)

# Return the revision that was fetched; this will be stored in 'FETCH_HEAD'

return self._Capture(['rev-parse', '--verify', 'FETCH_HEAD'])

« no previous file with comments | « no previous file | gclient_utils.py » ('j') | no next file with comments »