mirror of
https://github.com/facebook/sapling.git
synced 2024-10-08 07:49:11 +03:00
subrepo: svn abort now depends on exit code (issue2833)
This commit is contained in:
parent
b7ce21cbd6
commit
2a89a4fdff
@ -540,11 +540,13 @@ class svnsubrepo(abstractsubrepo):
|
|||||||
env['LC_MESSAGES'] = 'C'
|
env['LC_MESSAGES'] = 'C'
|
||||||
p = subprocess.Popen(cmd, bufsize=-1, close_fds=util.closefds,
|
p = subprocess.Popen(cmd, bufsize=-1, close_fds=util.closefds,
|
||||||
stdout=subprocess.PIPE, stderr=subprocess.PIPE,
|
stdout=subprocess.PIPE, stderr=subprocess.PIPE,
|
||||||
universal_newlines=True, env=env)
|
universal_newlines=True, env=env)
|
||||||
stdout, stderr = p.communicate()
|
stdout, stderr = p.communicate()
|
||||||
stderr = stderr.strip()
|
stderr = stderr.strip()
|
||||||
|
if p.returncode:
|
||||||
|
raise util.Abort(stderr or 'exited with code %d' % p.returncode)
|
||||||
if stderr:
|
if stderr:
|
||||||
raise util.Abort(stderr)
|
self._ui.warn(stderr + '\n')
|
||||||
return stdout
|
return stdout
|
||||||
|
|
||||||
@propertycache
|
@propertycache
|
||||||
|
Loading…
Reference in New Issue
Block a user