comparison mercurial/hgweb/webcommands.py @ 37066:b33b91ca2ec2

annotate: pack line content into annotateline object (API)

Just for code readability. We can do that since the annotateline type is
no longer used while computing the history.

37065:b235bde38a83

    def annotate(**map):
        if fctx.isbinary():
            mt = (mimetypes.guess_type(fctx.path())[0]
                  or 'application/octet-stream')
            lines = [((fctx.filectx(fctx.filerev()), 1), '(binary:%s)' % mt)]
        else:
            lines = webutil.annotate(web.req, fctx, web.repo.ui)

        previousrev = None
        blockparitygen = paritygen(1)
        for lineno, (aline, l) in enumerate(lines):
            f = aline.fctx
            rev = f.rev()
            if rev != previousrev:
                blockhead = True
                blockparity = next(blockparitygen)

                   "extra": f.extra(),
                   "file": f.path(),
                   "blockhead": blockhead,
                   "blockparity": blockparity,
                   "targetline": aline.lineno,
                   "line": l,
                   "lineno": lineno + 1,
                   "lineid": "l%d" % (lineno + 1),
                   "linenumber": "% 6d" % (lineno + 1),
                   "revdate": f.date()}

37066:b33b91ca2ec2

    def annotate(**map):
        if fctx.isbinary():
            mt = (mimetypes.guess_type(fctx.path())[0]
                  or 'application/octet-stream')
            lines = [dagop.annotateline(fctx=fctx.filectx(fctx.filerev()),
                                        lineno=1, text='(binary:%s)' % mt)]
        else:
            lines = webutil.annotate(web.req, fctx, web.repo.ui)

        previousrev = None
        blockparitygen = paritygen(1)
        for lineno, aline in enumerate(lines):
            f = aline.fctx
            rev = f.rev()
            if rev != previousrev:
                blockhead = True
                blockparity = next(blockparitygen)

                   "extra": f.extra(),
                   "file": f.path(),
                   "blockhead": blockhead,
                   "blockparity": blockparity,
                   "targetline": aline.lineno,
                   "line": aline.text,
                   "lineno": lineno + 1,
                   "lineid": "l%d" % (lineno + 1),
                   "linenumber": "% 6d" % (lineno + 1),
                   "revdate": f.date()}