comparison hgext/progress.py @ 11458:ec21d91c79b3 stable

progress: check stderr.isatty() before each print

This prevents writing progress information to a non-tty stderr if one is
swapped in after startup, which happens in `hg serve`.

11457:2ec346160783

from mercurial import extensions
from mercurial import util

def spacejoin(*args):
    return ' '.join(s for s in args if s)

class progbar(object):
    def __init__(self, ui):
        self.ui = ui
        self.resetstate()

        self.order = self.ui.configlist(
            'progress', 'format',
            default=['topic', 'bar', 'number'])

    def show(self, topic, pos, item, unit, total):
        termwidth = self.width()
        self.printed = True
        head = ''
        needprogress = False
        tail = ''

            out = spacejoin(head, tail)
        sys.stderr.write('\r' + out[:termwidth])
        sys.stderr.flush()

    def clear(self):
        sys.stderr.write('\r%s\r' % (' ' * self.width()))

    def complete(self):
        if self.ui.configbool('progress', 'clear-complete', default=True):
            self.clear()
        else:
            sys.stderr.write('\n')
        sys.stderr.flush()

def uisetup(ui):
    # Apps that derive a class from ui.ui() can use
    # setconfig('progress', 'disable', 'True') to disable this extension
    if ui.configbool('progress', 'disable'):
        return
    if ((sys.stderr.isatty() or ui.configbool('progress', 'assume-tty'))
        and not ui.debugflag and not ui.quiet):
        # we instantiate one globally shared progress bar to avoid
        # competing progress bars when multiple UI objects get created
        global sharedprog
        if not sharedprog:
            sharedprog = progbar(ui)

11458:ec21d91c79b3

from mercurial import extensions
from mercurial import util

def spacejoin(*args):
    return ' '.join(s for s in args if s)

def shouldprint(ui):
    return sys.stderr.isatty() or ui.configbool('progress', 'assume-tty')

class progbar(object):
    def __init__(self, ui):
        self.ui = ui
        self.resetstate()

        self.order = self.ui.configlist(
            'progress', 'format',
            default=['topic', 'bar', 'number'])

    def show(self, topic, pos, item, unit, total):
        if not shouldprint(self.ui):
            return
        termwidth = self.width()
        self.printed = True
        head = ''
        needprogress = False
        tail = ''

            out = spacejoin(head, tail)
        sys.stderr.write('\r' + out[:termwidth])
        sys.stderr.flush()

    def clear(self):
        if not shouldprint(self.ui):
            return
        sys.stderr.write('\r%s\r' % (' ' * self.width()))

    def complete(self):
        if not shouldprint(self.ui):
            return
        if self.ui.configbool('progress', 'clear-complete', default=True):
            self.clear()
        else:
            sys.stderr.write('\n')
        sys.stderr.flush()

def uisetup(ui):
    # Apps that derive a class from ui.ui() can use
    # setconfig('progress', 'disable', 'True') to disable this extension
    if ui.configbool('progress', 'disable'):
        return
    if shouldprint(ui) and not ui.debugflag and not ui.quiet:
        # we instantiate one globally shared progress bar to avoid
        # competing progress bars when multiple UI objects get created
        global sharedprog
        if not sharedprog:
            sharedprog = progbar(ui)