comparison mercurial/patch.py @ 7860:162fd31bbd93

diffstat: use width 80 by default and avoid division by zero

7857:6af7c0e5908c

        elif line.startswith('-') and not line.startswith('---'):
            removes += 1
    if filename:
        yield (filename, adds, removes)

def diffstat(lines):
    output = []
    stats = list(diffstatdata(lines))
    width = util.termwidth() - 2

    maxtotal, maxname = 0, 0
    totaladds, totalremoves = 0, 0
    for filename, adds, removes in stats:
        totaladds += adds

    countwidth = len(str(maxtotal))
    graphwidth = width - countwidth - maxname
    if graphwidth < 10:
        graphwidth = 10

    factor = int(math.ceil(float(maxtotal) / graphwidth))

    for filename, adds, removes in stats:
        # If diffstat runs out of room it doesn't print anything, which
        # isn't very useful, so always print at least one + or - if there
        # were at least some changes

        minuses = '-' * max(removes/factor, int(bool(removes)))
        output.append(' %-*s |  %*.d %s%s\n' % (maxname, filename, countwidth,
                                                adds+removes, pluses, minuses))

    if stats:
        output.append(' %d files changed, %d insertions(+), %d deletions(-)\n' %
                      (len(stats), totaladds, totalremoves))

    return ''.join(output)

7860:162fd31bbd93

        elif line.startswith('-') and not line.startswith('---'):
            removes += 1
    if filename:
        yield (filename, adds, removes)

def diffstat(lines, width=80):
    output = []
    stats = list(diffstatdata(lines))

    maxtotal, maxname = 0, 0
    totaladds, totalremoves = 0, 0
    for filename, adds, removes in stats:
        totaladds += adds

    countwidth = len(str(maxtotal))
    graphwidth = width - countwidth - maxname
    if graphwidth < 10:
        graphwidth = 10

    factor = max(int(math.ceil(float(maxtotal) / graphwidth)), 1)

    for filename, adds, removes in stats:
        # If diffstat runs out of room it doesn't print anything, which
        # isn't very useful, so always print at least one + or - if there
        # were at least some changes

        minuses = '-' * max(removes/factor, int(bool(removes)))
        output.append(' %-*s |  %*.d %s%s\n' % (maxname, filename, countwidth,
                                                adds+removes, pluses, minuses))

    if stats:
        output.append(' %d files changed, %d insertions(+), %d deletions(-)\n'
                      % (len(stats), totaladds, totalremoves))

    return ''.join(output)