comparison mercurial/commands.py @ 22477:3c8ae79eacb0

annotate: build format string separately from annotation data

This prepares for porting to generic templater API.

Note that we cannot use '%*s' to pad white spaces because it doesn't take
into account character widths, as described in 4f5a6df2af92.

22476:a0829ec34dbd

            ui.write(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
            continue

        lines = fctx.annotate(follow=follow, linenumber=linenumber,
                              diffopts=diffopts)
        pieces = []

        for f, sep in funcmap:
            l = [f(n) for n, dummy in lines]
            if l:
                sized = [(x, encoding.colwidth(x)) for x in l]
                ml = max([w for x, w in sized])
                pieces.append(["%s%s%s" % (sep, ' ' * (ml - w), x)
                               for x, w in sized])

        for p, l in zip(zip(*pieces), lines):
            ui.write("%s: %s" % ("".join(p), l[1]))

        if lines and not lines[-1][1].endswith('\n'):
            ui.write('\n')

@command('archive',

22477:3c8ae79eacb0

            ui.write(_("%s: binary file\n") % ((pats and m.rel(abs)) or abs))
            continue

        lines = fctx.annotate(follow=follow, linenumber=linenumber,
                              diffopts=diffopts)
        formats = []
        pieces = []

        for f, sep in funcmap:
            l = [f(n) for n, dummy in lines]
            if l:
                sized = [(x, encoding.colwidth(x)) for x in l]
                ml = max([w for x, w in sized])
                formats.append([sep + ' ' * (ml - w) + '%s'
                                for x, w in sized])
                pieces.append(l)

        for f, p, l in zip(zip(*formats), zip(*pieces), lines):
            ui.write("".join(f) % p)
            ui.write(": %s" % l[1])

        if lines and not lines[-1][1].endswith('\n'):
            ui.write('\n')

@command('archive',