comparison mercurial/hgweb/webcommands.py @ 35408:a48af4993aa0

hgweb: split graphdata() into jsdata() and nodes()

nodes keyword passed to the template can be any iterator, but jsdata needs to
be a list because it gets JSONified.

35407:27ab3150cd50

        dag = graphmod.dagwalker(web.repo, smartset.baseset(revs))
        # As we said one line above... not lazy.
        tree = list(item for item in graphmod.colored(dag, web.repo)
                    if item[1] == graphmod.CHANGESET)

    def graphdata(usetuples):
        data = []

        row = 0
        for (id, type, ctx, vtx, edges) in tree:
            if usetuples:
                node = pycompat.bytestr(ctx)
                data.append({'node': node, 'vertex': vtx, 'edges': edges})
            else:
                entry = webutil.commonentry(web.repo, ctx)
                edgedata = [{'col': edge[0], 'nextcol': edge[1],
                             'color': (edge[2] - 1) % 6 + 1,
                             'width': edge[3], 'bcolor': edge[4]}
                            for edge in edges]

                entry.update(
                    {'col': vtx[0],
                     'color': (vtx[1] - 1) % 6 + 1,
                     'edges': edgedata,
                     'row': row,
                     'nextrow': row + 1})

                data.append(entry)

            row += 1

        return data

    rows = len(tree)

    return tmpl('graph', rev=rev, symrev=symrev, revcount=revcount,
                uprev=uprev,
                lessvars=lessvars, morevars=morevars, downrev=downrev,
                rows=rows,
                bg_height=bg_height,
                changesets=count,
                jsdata=lambda **x: graphdata(True),
                nodes=lambda **x: graphdata(False),
                node=ctx.hex(), changenav=changenav)

def _getdoc(e):
    doc = e[0].__doc__
    if doc:

35408:a48af4993aa0

        dag = graphmod.dagwalker(web.repo, smartset.baseset(revs))
        # As we said one line above... not lazy.
        tree = list(item for item in graphmod.colored(dag, web.repo)
                    if item[1] == graphmod.CHANGESET)

    def jsdata():
        return [{'node': pycompat.bytestr(ctx),
                 'vertex': vtx,
                 'edges': edges}
                for (id, type, ctx, vtx, edges) in tree]

    def nodes():
        for row, (id, type, ctx, vtx, edges) in enumerate(tree):
            entry = webutil.commonentry(web.repo, ctx)
            edgedata = [{'col': edge[0],
                         'nextcol': edge[1],
                         'color': (edge[2] - 1) % 6 + 1,
                         'width': edge[3],
                         'bcolor': edge[4]}
                        for edge in edges]

            entry.update({'col': vtx[0],
                          'color': (vtx[1] - 1) % 6 + 1,
                          'edges': edgedata,
                          'row': row,
                          'nextrow': row + 1})

            yield entry

    rows = len(tree)

    return tmpl('graph', rev=rev, symrev=symrev, revcount=revcount,
                uprev=uprev,
                lessvars=lessvars, morevars=morevars, downrev=downrev,
                rows=rows,
                bg_height=bg_height,
                changesets=count,
                jsdata=lambda **x: jsdata(),
                nodes=lambda **x: nodes(),
                node=ctx.hex(), changenav=changenav)

def _getdoc(e):
    doc = e[0].__doc__
    if doc: