Mercurial > kallithea

changeset 8128:f537a6e23e2c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: add missing ascii_str for display of hg changeset graft/transplant source revision
author Mads Kiilerich <mads@kiilerich.com>
date Fri, 03 Jan 2020 03:07:28 +0100
parents 7fdefd3c5bd5
children b72e8b7c33ae
files kallithea/controllers/changeset.py
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/kallithea/controllers/changeset.py	Fri Jan 03 01:55:06 2020 +0100
+++ b/kallithea/controllers/changeset.py	Fri Jan 03 03:07:28 2020 +0100
@@ -41,7 +41,7 @@
 from kallithea.lib.base import BaseRepoController, jsonify, render
 from kallithea.lib.graphmod import graph_data
 from kallithea.lib.utils import action_logger
-from kallithea.lib.utils2 import safe_unicode
+from kallithea.lib.utils2 import ascii_str, safe_unicode
 from kallithea.lib.vcs.backends.base import EmptyChangeset
 from kallithea.lib.vcs.exceptions import ChangesetDoesNotExistError, EmptyRepositoryError, RepositoryError
 from kallithea.model.changeset_status import ChangesetStatusModel
@@ -396,8 +396,8 @@
             c.changeset = c.cs_ranges[0]
             c.parent_tmpl = ''.join(['# Parent  %s\n' % x.raw_id
                                      for x in c.changeset.parents])
-            c.changeset_graft_source_hash = c.changeset.extra.get(b'source', b'')
-            c.changeset_transplant_source_hash = binascii.hexlify(c.changeset.extra.get(b'transplant_source', b''))
+            c.changeset_graft_source_hash = ascii_str(c.changeset.extra.get(b'source', b''))
+            c.changeset_transplant_source_hash = ascii_str(binascii.hexlify(c.changeset.extra.get(b'transplant_source', b'')))
         if method == 'download':
             response.content_type = 'text/plain'
             response.content_disposition = 'attachment; filename=%s.diff' \