comparison mercurial/ui.py @ 31093:15d6488554b9

ui: extract low level part of 'write_err' in its own method Same as for 'write' and '_write' we needs it available for some of the color logic.
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Fri, 24 Feb 2017 19:53:41 +0100
parents cb759f7f940d
children 0c003943134f
comparison
equal deleted inserted replaced
31092:cb759f7f940d 31093:15d6488554b9
822 822
823 def write_err(self, *args, **opts): 823 def write_err(self, *args, **opts):
824 self._progclear() 824 self._progclear()
825 if self._bufferstates and self._bufferstates[-1][0]: 825 if self._bufferstates and self._bufferstates[-1][0]:
826 return self.write(*args, **opts) 826 return self.write(*args, **opts)
827 self._write_err(*args, **opts)
828
829 def _write_err(self, *msgs, **opts):
827 try: 830 try:
828 with self.timeblockedsection('stdio'): 831 with self.timeblockedsection('stdio'):
829 if not getattr(self.fout, 'closed', False): 832 if not getattr(self.fout, 'closed', False):
830 self.fout.flush() 833 self.fout.flush()
831 for a in args: 834 for a in msgs:
832 self.ferr.write(a) 835 self.ferr.write(a)
833 # stderr may be buffered under win32 when redirected to files, 836 # stderr may be buffered under win32 when redirected to files,
834 # including stdout. 837 # including stdout.
835 if not getattr(self.ferr, 'closed', False): 838 if not getattr(self.ferr, 'closed', False):
836 self.ferr.flush() 839 self.ferr.flush()