comparison mercurial/hgweb/webcommands.py @ 34695:e178fcaa3933

python3: use our bytes-only version of cgi.escape everywhere

As suggested by Yuya in D965.

Differential Revision: https://phab.mercurial-scm.org/D1067

34694:2976cf87a60a

# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.

from __future__ import absolute_import

import cgi
import copy
import mimetypes
import os
import re

    revsetlang,
    scmutil,
    smartset,
    templatefilters,
    templater,
    util,
)

from . import (
    webutil,

            if type != graphmod.CHANGESET:
                continue
            node = str(ctx)
            age = encodestr(templatefilters.age(ctx.date()))
            desc = templatefilters.firstline(encodestr(ctx.description()))
            desc = cgi.escape(templatefilters.nonempty(desc))
            user = cgi.escape(templatefilters.person(encodestr(ctx.user())))
            branch = cgi.escape(encodestr(ctx.branch()))
            try:
                branchnode = web.repo.branchtip(branch)
            except error.RepoLookupError:
                branchnode = None
            branch = branch, branchnode == ctx.node()

            if usetuples:
                data.append((node, vtx, edges, desc, user, age, branch,
                             [cgi.escape(encodestr(x)) for x in ctx.tags()],
                             [cgi.escape(encodestr(x))
                              for x in ctx.bookmarks()]))
            else:
                edgedata = [{'col': edge[0], 'nextcol': edge[1],
                             'color': (edge[2] - 1) % 6 + 1,
                             'width': edge[3], 'bcolor': edge[4]}

34695:e178fcaa3933

# This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version.

from __future__ import absolute_import

import copy
import mimetypes
import os
import re

    revsetlang,
    scmutil,
    smartset,
    templatefilters,
    templater,
    url,
    util,
)

from . import (
    webutil,

            if type != graphmod.CHANGESET:
                continue
            node = str(ctx)
            age = encodestr(templatefilters.age(ctx.date()))
            desc = templatefilters.firstline(encodestr(ctx.description()))
            desc = url.escape(templatefilters.nonempty(desc))
            user = url.escape(templatefilters.person(encodestr(ctx.user())))
            branch = url.escape(encodestr(ctx.branch()))
            try:
                branchnode = web.repo.branchtip(branch)
            except error.RepoLookupError:
                branchnode = None
            branch = branch, branchnode == ctx.node()

            if usetuples:
                data.append((node, vtx, edges, desc, user, age, branch,
                             [url.escape(encodestr(x)) for x in ctx.tags()],
                             [url.escape(encodestr(x))
                              for x in ctx.bookmarks()]))
            else:
                edgedata = [{'col': edge[0], 'nextcol': edge[1],
                             'color': (edge[2] - 1) % 6 + 1,
                             'width': edge[3], 'bcolor': edge[4]}