# HG changeset patch # User Patrick Mezard # Date 1247967873 18000 # Node ID 6bfaa9deb432d7008ddfbbbc945eaa55e94c685a # Parent 5567af673f83a8c4e5a54b6afc1de0523b098f9a svnexternals: display svn commands output with --verbose Really useful to debug svn connectivity or locking problems. diff --git a/hgsubversion/svnexternals.py b/hgsubversion/svnexternals.py --- a/hgsubversion/svnexternals.py +++ b/hgsubversion/svnexternals.py @@ -242,9 +242,13 @@ class externalsupdater: args = ['svn'] + args self.ui.debug(_('updating externals: %r, cwd=%s\n') % (args, cwd)) shell = os.name == 'nt' - r = subprocess.call(args, cwd=cwd, shell=shell, - stdout=subprocess.PIPE, stderr=subprocess.STDOUT) - if r != 0: raise hgutil.Abort("subprocess '%s' failed" % ' '.join(args)) + p = subprocess.Popen(args, cwd=cwd, shell=shell, + stdout=subprocess.PIPE, stderr=subprocess.STDOUT) + for line in p.stdout: + self.ui.note(line) + p.wait() + if p.returncode != 0: + raise hgutil.Abort("subprocess '%s' failed" % ' '.join(args)) def updateexternals(ui, args, repo, **opts): """update repository externals