Show More
@@ -6,7 +6,7 b'' | |||
|
6 | 6 | # GNU General Public License version 2 or any later version. |
|
7 | 7 | |
|
8 | 8 | import errno, os, re, xml.dom.minidom, shutil, urlparse, posixpath |
|
9 | import stat | |
|
9 | import stat, subprocess | |
|
10 | 10 | from i18n import _ |
|
11 | 11 | import config, util, node, error, cmdutil |
|
12 | 12 | hg = None |
@@ -481,12 +481,15 b' class svnsubrepo(abstractsubrepo):' | |||
|
481 | 481 | env = dict(os.environ) |
|
482 | 482 | # Avoid localized output, preserve current locale for everything else. |
|
483 | 483 | env['LC_MESSAGES'] = 'C' |
|
484 | write, read, err = util.popen3(cmd, env=env, newlines=True) | |
|
485 | retdata = read.read() | |
|
486 | err = err.read().strip() | |
|
487 | if err: | |
|
488 | raise util.Abort(err) | |
|
489 | return retdata | |
|
484 | p = subprocess.Popen(cmd, shell=True, bufsize=-1, | |
|
485 | close_fds=util.closefds, | |
|
486 | stdout=subprocess.PIPE, stderr=subprocess.PIPE, | |
|
487 | universal_newlines=True, env=env) | |
|
488 | stdout, stderr = p.communicate() | |
|
489 | stderr = stderr.strip() | |
|
490 | if stderr: | |
|
491 | raise util.Abort(stderr) | |
|
492 | return stdout | |
|
490 | 493 | |
|
491 | 494 | def _wcrev(self): |
|
492 | 495 | output = self._svncommand(['info', '--xml']) |
General Comments 0
You need to be logged in to leave comments.
Login now