1016 if usetuples: |
1016 if usetuples: |
1017 data.append((node, vtx, edges, desc, user, age, branch, |
1017 data.append((node, vtx, edges, desc, user, age, branch, |
1018 [cgi.escape(x) for x in ctx.tags()], |
1018 [cgi.escape(x) for x in ctx.tags()], |
1019 [cgi.escape(x) for x in ctx.bookmarks()])) |
1019 [cgi.escape(x) for x in ctx.bookmarks()])) |
1020 else: |
1020 else: |
1021 edgedata = [dict(col=edge[0], nextcol=edge[1], |
1021 edgedata = [{'col': edge[0], 'nextcol': edge[1], |
1022 color=(edge[2] - 1) % 6 + 1, |
1022 'color': (edge[2] - 1) % 6 + 1, |
1023 width=edge[3], bcolor=edge[4]) |
1023 'width': edge[3], 'bcolor': edge[4]} |
1024 for edge in edges] |
1024 for edge in edges] |
1025 |
1025 |
1026 data.append( |
1026 data.append( |
1027 dict(node=node, |
1027 {'node': node, |
1028 col=vtx[0], |
1028 'col': vtx[0], |
1029 color=(vtx[1] - 1) % 6 + 1, |
1029 'color': (vtx[1] - 1) % 6 + 1, |
1030 edges=edgedata, |
1030 'edges': edgedata, |
1031 row=row, |
1031 'row': row, |
1032 nextrow=row + 1, |
1032 'nextrow': row + 1, |
1033 desc=desc, |
1033 'desc': desc, |
1034 user=user, |
1034 'user': user, |
1035 age=age, |
1035 'age': age, |
1036 bookmarks=webutil.nodebookmarksdict( |
1036 'bookmarks': webutil.nodebookmarksdict( |
1037 web.repo, ctx.node()), |
1037 web.repo, ctx.node()), |
1038 branches=webutil.nodebranchdict(web.repo, ctx), |
1038 'branches': webutil.nodebranchdict(web.repo, ctx), |
1039 inbranch=webutil.nodeinbranch(web.repo, ctx), |
1039 'inbranch': webutil.nodeinbranch(web.repo, ctx), |
1040 tags=webutil.nodetagsdict(web.repo, ctx.node()))) |
1040 'tags': webutil.nodetagsdict(web.repo, ctx.node())}) |
1041 |
1041 |
1042 row += 1 |
1042 row += 1 |
1043 |
1043 |
1044 return data |
1044 return data |
1045 |
1045 |