Revert of gclient: kill git fetch operation that hangs. (patchset #12 id:220001 of https://codereview.chromium.org/2241843002/ )
Reason for revert:
Didn't help.
Original issue's description:
> gclient: kill git fetch operation that hangs.
>
> This provides env variable GCLIENT_KILL_GIT_FETCH_AFTER
> that kills git fetch if it produces no output for that
> many seconds.
>
> Note that this is not final patch, but an experiment.
> See http://crbug.com/635641#c24 for the deployment plan.
>
> BUG=635641
> R=hinoka@chromium.org
>
> Committed: https://chromium.googlesource.com/chromium/tools/depot_tools/+/f8757b7e02226594655230ccbeae3543c7dc49c6
TBR=hinoka@chromium.org,hinoka@google.com
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=635641
Review-Url: https://codereview.chromium.org/2410853002
diff --git a/gclient_scm.py b/gclient_scm.py
index db4d122..dd871c1 100644
--- a/gclient_scm.py
+++ b/gclient_scm.py
@@ -1199,7 +1199,6 @@
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))
cfg = gclient_utils.DefaultIndexPackConfig(self.url)
fetch_cmd = cfg + [
'fetch',
@@ -1212,8 +1211,7 @@
fetch_cmd.append('--verbose')
elif quiet:
fetch_cmd.append('--quiet')
- self._Run(fetch_cmd, options, show_header=options.verbose, retry=True,
- kill_timeout=kill_timeout)
+ self._Run(fetch_cmd, options, show_header=options.verbose, retry=True)
# Return the revision that was fetched; this will be stored in 'FETCH_HEAD'
return self._Capture(['rev-parse', '--verify', 'FETCH_HEAD'])