Show More
@@ -1099,6 +1099,10 b' class svnsubrepo(abstractsubrepo):' | |||||
1099 | # --non-interactive. |
|
1099 | # --non-interactive. | |
1100 | if commands[0] in (b'update', b'checkout', b'commit'): |
|
1100 | if commands[0] in (b'update', b'checkout', b'commit'): | |
1101 | cmd.append(b'--non-interactive') |
|
1101 | cmd.append(b'--non-interactive') | |
|
1102 | if util.safehasattr(subprocess, 'CREATE_NO_WINDOW'): | |||
|
1103 | # On Windows, prevent command prompts windows from popping up when | |||
|
1104 | # running in pythonw. | |||
|
1105 | extrakw['creationflags'] = getattr(subprocess, 'CREATE_NO_WINDOW') | |||
1102 | cmd.extend(commands) |
|
1106 | cmd.extend(commands) | |
1103 | if filename is not None: |
|
1107 | if filename is not None: | |
1104 | path = self.wvfs.reljoin( |
|
1108 | path = self.wvfs.reljoin( | |
@@ -1469,6 +1473,11 b' class gitsubrepo(abstractsubrepo):' | |||||
1469 | # insert the argument in the front, |
|
1473 | # insert the argument in the front, | |
1470 | # the end of git diff arguments is used for paths |
|
1474 | # the end of git diff arguments is used for paths | |
1471 | commands.insert(1, b'--color') |
|
1475 | commands.insert(1, b'--color') | |
|
1476 | extrakw = {} | |||
|
1477 | if util.safehasattr(subprocess, 'CREATE_NO_WINDOW'): | |||
|
1478 | # On Windows, prevent command prompts windows from popping up when | |||
|
1479 | # running in pythonw. | |||
|
1480 | extrakw['creationflags'] = getattr(subprocess, 'CREATE_NO_WINDOW') | |||
1472 | p = subprocess.Popen( |
|
1481 | p = subprocess.Popen( | |
1473 | pycompat.rapply( |
|
1482 | pycompat.rapply( | |
1474 | procutil.tonativestr, [self._gitexecutable] + commands |
|
1483 | procutil.tonativestr, [self._gitexecutable] + commands | |
@@ -1479,6 +1488,7 b' class gitsubrepo(abstractsubrepo):' | |||||
1479 | close_fds=procutil.closefds, |
|
1488 | close_fds=procutil.closefds, | |
1480 | stdout=subprocess.PIPE, |
|
1489 | stdout=subprocess.PIPE, | |
1481 | stderr=errpipe, |
|
1490 | stderr=errpipe, | |
|
1491 | **extrakw | |||
1482 | ) |
|
1492 | ) | |
1483 | if stream: |
|
1493 | if stream: | |
1484 | return p.stdout, None |
|
1494 | return p.stdout, None |
General Comments 0
You need to be logged in to leave comments.
Login now