Show More
@@ -484,13 +484,10 b' class svnsubrepo(abstractsubrepo):' | |||||
484 | def _svncommand(self, commands, filename=''): |
|
484 | def _svncommand(self, commands, filename=''): | |
485 | path = os.path.join(self._ctx._repo.origroot, self._path, filename) |
|
485 | path = os.path.join(self._ctx._repo.origroot, self._path, filename) | |
486 | cmd = ['svn'] + commands + [path] |
|
486 | cmd = ['svn'] + commands + [path] | |
487 | cmd = [util.shellquote(arg) for arg in cmd] |
|
|||
488 | cmd = util.quotecommand(' '.join(cmd)) |
|
|||
489 | env = dict(os.environ) |
|
487 | env = dict(os.environ) | |
490 | # Avoid localized output, preserve current locale for everything else. |
|
488 | # Avoid localized output, preserve current locale for everything else. | |
491 | env['LC_MESSAGES'] = 'C' |
|
489 | env['LC_MESSAGES'] = 'C' | |
492 |
p = subprocess.Popen(cmd, |
|
490 | p = subprocess.Popen(cmd, bufsize=-1, close_fds=util.closefds, | |
493 | close_fds=util.closefds, |
|
|||
494 | stdout=subprocess.PIPE, stderr=subprocess.PIPE, |
|
491 | stdout=subprocess.PIPE, stderr=subprocess.PIPE, | |
495 | universal_newlines=True, env=env) |
|
492 | universal_newlines=True, env=env) | |
496 | stdout, stderr = p.communicate() |
|
493 | stdout, stderr = p.communicate() | |
@@ -626,12 +623,8 b' class gitsubrepo(abstractsubrepo):' | |||||
626 | The methods tries to call the git command. versions previor to 1.6.0 |
|
623 | The methods tries to call the git command. versions previor to 1.6.0 | |
627 | are not supported and very probably fail. |
|
624 | are not supported and very probably fail. | |
628 | """ |
|
625 | """ | |
629 | cmd = ['git'] + commands |
|
|||
630 | cmd = [util.shellquote(arg) for arg in cmd] |
|
|||
631 | cmd = util.quotecommand(' '.join(cmd)) |
|
|||
632 |
|
||||
633 | # print git's stderr, which is mostly progress and useful info |
|
626 | # print git's stderr, which is mostly progress and useful info | |
634 |
p = subprocess.Popen( |
|
627 | p = subprocess.Popen(['git'] + commands, bufsize=-1, cwd=cwd, env=env, | |
635 | close_fds=util.closefds, |
|
628 | close_fds=util.closefds, | |
636 | stdout=subprocess.PIPE) |
|
629 | stdout=subprocess.PIPE) | |
637 | if stream: |
|
630 | if stream: |
General Comments 0
You need to be logged in to leave comments.
Login now