comparison mercurial/hgweb/webcommands.py @ 35406:76dcdc4e707b

hgweb: filter graphmod.colored() output before iterating over it

Consumers in this function use output of graphmod.colored(), but only want
items with type == CHANGESET, so let's filter it early.

This is primarily just a refactoring, but it also fixes a potential small bug
with `rows = len(tree)` (this variable is used for "Rows shown" line in
raw-graph) if there are items of other types.

35405:e66d6e938d2d

        # We have to feed a baseset to dagwalker as it is expecting smartset
        # object. This does not have a big impact on hgweb performance itself
        # since hgweb graphing code is not itself lazy yet.
        dag = graphmod.dagwalker(web.repo, smartset.baseset(revs))
        # As we said one line above... not lazy.
        tree = list(graphmod.colored(dag, web.repo))

    def getcolumns(tree):
        cols = 0
        for (id, type, ctx, vtx, edges) in tree:
            if type != graphmod.CHANGESET:
                continue
            cols = max(cols, max([edge[0] for edge in edges] or [0]),
                             max([edge[1] for edge in edges] or [0]))
        return cols

    def graphdata(usetuples):
        data = []

        row = 0
        for (id, type, ctx, vtx, edges) in tree:
            if type != graphmod.CHANGESET:
                continue

            if usetuples:
                node = pycompat.bytestr(ctx)
                data.append({'node': node, 'vertex': vtx, 'edges': edges})
            else:
                entry = webutil.commonentry(web.repo, ctx)

35406:76dcdc4e707b

        # We have to feed a baseset to dagwalker as it is expecting smartset
        # object. This does not have a big impact on hgweb performance itself
        # since hgweb graphing code is not itself lazy yet.
        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 getcolumns(tree):
        cols = 0
        for (id, type, ctx, vtx, edges) in tree:
            cols = max(cols, max([edge[0] for edge in edges] or [0]),
                             max([edge[1] for edge in edges] or [0]))
        return cols

    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)