comparison mercurial/util.py @ 9508:e2fd9b62349b

Merge with -stable

9494:bdd8a41ea6f6

        # adjust for weird terminal size
        width = max(78, hangindent + 1)
    padding = '\n' + ' ' * hangindent
    # To avoid corrupting multi-byte characters in line, we must wrap
    # a Unicode string instead of a bytestring.
    u = line.decode(encoding.encoding)
    w = padding.join(textwrap.wrap(u, width=width - hangindent))
    return w.encode(encoding.encoding)

def iterlines(iterator):
    for chunk in iterator:
        for line in chunk.splitlines():
            yield line

9508:e2fd9b62349b

        # adjust for weird terminal size
        width = max(78, hangindent + 1)
    padding = '\n' + ' ' * hangindent
    # To avoid corrupting multi-byte characters in line, we must wrap
    # a Unicode string instead of a bytestring.
    try:
        u = line.decode(encoding.encoding)
        w = padding.join(textwrap.wrap(u, width=width - hangindent))
        return w.encode(encoding.encoding)
    except UnicodeDecodeError:
        return padding.join(textwrap.wrap(line, width=width - hangindent))

def iterlines(iterator):
    for chunk in iterator:
        for line in chunk.splitlines():
            yield line