comparison mercurial/ui.py @ 40519:3c4b9dace7de

ui: consolidate places where _progclear() is called

The progress bar has to be cleared when we start writing some data to the
output stream. Let's make it always triggered immediately before switching
by _colormode, so that we can easily factor out helper functions.

40518:d11e2c5b287e

                self._buffers[-1].extend(args)
        else:
            self._writenobuf(*args, **opts)

    def _writenobuf(self, *args, **opts):
        if self._colormode == 'win32':
            # windows color printing is its own can of crab, defer to
            # the color module and that is it.
            color.win32print(self, self._write, *args, **opts)
        else:

                label = opts.get(r'label', '')
                msgs = [self.label(a, label) for a in args]
            self._write(*msgs, **opts)

    def _write(self, *msgs, **opts):
        self._progclear()
        # opencode timeblockedsection because this is a critical path
        starttime = util.timer()
        try:
            self.fout.write(''.join(msgs))
        except IOError as err:

        finally:
            self._blockedtimes['stdio_blocked'] += \
                (util.timer() - starttime) * 1000

    def write_err(self, *args, **opts):
        self._progclear()
        if self._bufferstates and self._bufferstates[-1][0]:
            self.write(*args, **opts)
        elif self._colormode == 'win32':
            # windows color printing is its own can of crab, defer to
            # the color module and that is it.
            color.win32print(self, self._write_err, *args, **opts)
        else:
            msgs = args

40519:3c4b9dace7de

                self._buffers[-1].extend(args)
        else:
            self._writenobuf(*args, **opts)

    def _writenobuf(self, *args, **opts):
        self._progclear()
        if self._colormode == 'win32':
            # windows color printing is its own can of crab, defer to
            # the color module and that is it.
            color.win32print(self, self._write, *args, **opts)
        else:

                label = opts.get(r'label', '')
                msgs = [self.label(a, label) for a in args]
            self._write(*msgs, **opts)

    def _write(self, *msgs, **opts):
        # opencode timeblockedsection because this is a critical path
        starttime = util.timer()
        try:
            self.fout.write(''.join(msgs))
        except IOError as err:

        finally:
            self._blockedtimes['stdio_blocked'] += \
                (util.timer() - starttime) * 1000

    def write_err(self, *args, **opts):
        if self._bufferstates and self._bufferstates[-1][0]:
            self.write(*args, **opts)
            return
        self._progclear()
        if self._colormode == 'win32':
            # windows color printing is its own can of crab, defer to
            # the color module and that is it.
            color.win32print(self, self._write_err, *args, **opts)
        else:
            msgs = args