Show More
@@ -31,6 +31,7 b' from .. import (' | |||||
31 | encoding, |
|
31 | encoding, | |
32 | error, |
|
32 | error, | |
33 | graphmod, |
|
33 | graphmod, | |
|
34 | pycompat, | |||
34 | revset, |
|
35 | revset, | |
35 | revsetlang, |
|
36 | revsetlang, | |
36 | scmutil, |
|
37 | scmutil, | |
@@ -1247,7 +1248,7 b' def graph(web, req, tmpl):' | |||||
1247 | for (id, type, ctx, vtx, edges) in tree: |
|
1248 | for (id, type, ctx, vtx, edges) in tree: | |
1248 | if type != graphmod.CHANGESET: |
|
1249 | if type != graphmod.CHANGESET: | |
1249 | continue |
|
1250 | continue | |
1250 | node = str(ctx) |
|
1251 | node = pycompat.bytestr(ctx) | |
1251 | age = encodestr(templatefilters.age(ctx.date())) |
|
1252 | age = encodestr(templatefilters.age(ctx.date())) | |
1252 | desc = templatefilters.firstline(encodestr(ctx.description())) |
|
1253 | desc = templatefilters.firstline(encodestr(ctx.description())) | |
1253 | desc = url.escape(templatefilters.nonempty(desc)) |
|
1254 | desc = url.escape(templatefilters.nonempty(desc)) | |
@@ -1303,7 +1304,7 b' def graph(web, req, tmpl):' | |||||
1303 | canvasheight=canvasheight, bg_height=bg_height, |
|
1304 | canvasheight=canvasheight, bg_height=bg_height, | |
1304 | # {jsdata} will be passed to |json, so it must be in utf-8 |
|
1305 | # {jsdata} will be passed to |json, so it must be in utf-8 | |
1305 | jsdata=lambda **x: graphdata(True, encoding.fromlocal), |
|
1306 | jsdata=lambda **x: graphdata(True, encoding.fromlocal), | |
1306 | nodes=lambda **x: graphdata(False, str), |
|
1307 | nodes=lambda **x: graphdata(False, pycompat.bytestr), | |
1307 | node=ctx.hex(), changenav=changenav) |
|
1308 | node=ctx.hex(), changenav=changenav) | |
1308 |
|
1309 | |||
1309 | def _getdoc(e): |
|
1310 | def _getdoc(e): |
General Comments 0
You need to be logged in to leave comments.
Login now