comparison mercurial/hgweb/webcommands.py @ 29538:df7d8ea90695

hgweb: enumerate lines in loop header, not before

Doing this will allow access to the lines in arbitrary order (because the
result of enumerate() is an iterator), and that will help calculating rowspan
for annotate blocks.

29537:5f8b36d5a6ec

    def annotate(**map):
        if util.binary(fctx.data()):
            mt = (mimetypes.guess_type(fctx.path())[0]
                  or 'application/octet-stream')
            lines = enumerate([((fctx.filectx(fctx.filerev()), 1),
                                '(binary:%s)' % mt)])
        else:
            lines = enumerate(fctx.annotate(follow=True, linenumber=True,
                                            diffopts=diffopts))
        previousrev = None
        for lineno, ((f, targetline), l) in lines:
            rev = f.rev()
            blockhead = rev != previousrev or None
            previousrev = rev
            yield {"parity": next(parity),
                   "node": f.hex(),

29538:df7d8ea90695

    def annotate(**map):
        if util.binary(fctx.data()):
            mt = (mimetypes.guess_type(fctx.path())[0]
                  or 'application/octet-stream')
            lines = [((fctx.filectx(fctx.filerev()), 1), '(binary:%s)' % mt)]
        else:
            lines = fctx.annotate(follow=True, linenumber=True,
                                  diffopts=diffopts)
        previousrev = None
        for lineno, ((f, targetline), l) in enumerate(lines):
            rev = f.rev()
            blockhead = rev != previousrev or None
            previousrev = rev
            yield {"parity": next(parity),
                   "node": f.hex(),