Repository navigation
Commit f8775f9
committed
fix(cmd): prevent deadlock on clone/fetch/pull
We keep stdout closed, which seems to have the side-effect of
stdout being connected to your TTY, in case you run a terminal.
However, this shold also prevent deadlocks, as only stderr is used.
The alternative would have been to try to fetch lines concurrently,
and we have been there.
For clone(), `communicate()` is used, and with some luck this will
just do the right thing. Even though last time I checked, it
didn't ... ? Lets see.
Stab at #721 parent 9b10d5e commit f8775f9
3 files changed
Lines changed: 7 additions & 12 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -279,8 +279,10 @@ def __del__(self): | |||
| 279 | 279 | self.proc = None | |
| 280 | 280 | if proc.stdin: | |
| 281 | 281 | proc.stdin.close() | |
| 282 | - proc.stdout.close() | ||
| 283 | - proc.stderr.close() | ||
| 282 | + if proc.stdout: | ||
| 283 | + proc.stdout.close() | ||
| 284 | + if proc.stderr: | ||
| 285 | + proc.stderr.close() | ||
| 284 | 286 | ||
| 285 | 287 | # did the process finish already so we have a return code ? | |
| 286 | 288 | if proc.poll() is not None: | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -160,14 +160,7 @@ class GitConfigParser(with_metaclass(MetaParserBuilder, cp.RawConfigParser, obje | |||
| 160 | 160 | ||
| 161 | 161 | OPTVALUEONLY = re.compile(optvalueonly_source) | |
| 162 | 162 | ||
| 163 | - OPTCRE = re.compile( | ||
| 164 | - optvalueonly_source # very permissive, incuding leading whitespace | ||
| 165 | - + r'\s*(?P<vi>[:=])\s*' # any number of space/tab, | ||
| 166 | - # followed by separator | ||
| 167 | - # (either : or =), followed | ||
| 168 | - # by any # space/tab | ||
| 169 | - + r'(?P<value>.*)$' # everything up to eol | ||
| 170 | - ) | ||
| 163 | + OPTCRE = re.compile(optvalueonly_source + r'\s*(?P<vi>[:=])\s*' + r'(?P<value>.*)$') | ||
| 171 | 164 | ||
| 172 | 165 | del optvalueonly_source | |
| 173 | 166 | ||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -650,7 +650,7 @@ def fetch(self, refspec=None, progress=None, **kwargs): | |||
| 650 | 650 | else: | |
| 651 | 651 | args = [refspec] | |
| 652 | 652 | ||
| 653 | - proc = self.repo.git.fetch(self, *args, with_extended_output=True, as_process=True, with_stdout=False, v=True, | ||
| 653 | + proc = self.repo.git.fetch(self, *args, as_process=True, with_stdout=False, v=True, | ||
| 654 | 654 | **kwargs) | |
| 655 | 655 | res = self._get_fetch_info_from_stderr(proc, progress or RemoteProgress()) | |
| 656 | 656 | if hasattr(self.repo.odb, 'update_cache'): | |
@@ -667,7 +667,7 @@ def pull(self, refspec=None, progress=None, **kwargs): | |||
| 667 | 667 | :return: Please see 'fetch' method """ | |
| 668 | 668 | self._assert_refspec() | |
| 669 | 669 | kwargs = add_progress(kwargs, self.repo.git, progress) | |
| 670 | - proc = self.repo.git.pull(self, refspec, with_extended_output=True, as_process=True, v=True, **kwargs) | ||
| 670 | + proc = self.repo.git.pull(self, refspec, with_stdout=False, as_process=True, v=True, **kwargs) | ||
| 671 | 671 | res = self._get_fetch_info_from_stderr(proc, progress or RemoteProgress()) | |
| 672 | 672 | if hasattr(self.repo.odb, 'update_cache'): | |
| 673 | 673 | self.repo.odb.update_cache() | |
0 commit comments