Mercurial > public > mercurial-scm > hg

comparison mercurial/subrepo.py @ 14505:90ef40bf97e3 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
subrepo: svn abort now depends on exit code (issue2833)
author Regis Desgroppes <regis.desgroppes@nokia.com>
date Tue, 31 May 2011 16:22:04 -0500
parents 2fdea636f254
children 733af5d9f6b2
comparison
equal deleted inserted replaced
14504:c59968e8b579 14505:90ef40bf97e3
538 env = dict(os.environ) 538 env = dict(os.environ)
539 # Avoid localized output, preserve current locale for everything else. 539 # Avoid localized output, preserve current locale for everything else.
540 env['LC_MESSAGES'] = 'C' 540 env['LC_MESSAGES'] = 'C'
541 p = subprocess.Popen(cmd, bufsize=-1, close_fds=util.closefds, 541 p = subprocess.Popen(cmd, bufsize=-1, close_fds=util.closefds,
542 stdout=subprocess.PIPE, stderr=subprocess.PIPE, 542 stdout=subprocess.PIPE, stderr=subprocess.PIPE,
543 universal_newlines=True, env=env) 543 universal_newlines=True, env=env)
544 stdout, stderr = p.communicate() 544 stdout, stderr = p.communicate()
545 stderr = stderr.strip() 545 stderr = stderr.strip()
546 if p.returncode:
547 raise util.Abort(stderr or 'exited with code %d' % p.returncode)
546 if stderr: 548 if stderr:
547 raise util.Abort(stderr) 549 self._ui.warn(stderr + '\n')
548 return stdout 550 return stdout
549 551
550 @propertycache 552 @propertycache
551 def _svnversion(self): 553 def _svnversion(self):
552 output = self._svncommand(['--version'], filename=None) 554 output = self._svncommand(['--version'], filename=None)