# HG changeset patch # User Mads Kiilerich # Date 1591978199 -7200 # Node ID f48b12755d83cba1c8e6613e9df2b004ade3721f # Parent 6c13c599d43dce24ab795cdc6395d8d2f2a74a1c hg: fix missing py3 string conversions for displaying subrepo (Issue #377) diff -r 6c13c599d43d -r f48b12755d83 kallithea/lib/vcs/backends/hg/changeset.py --- a/kallithea/lib/vcs/backends/hg/changeset.py Fri Jun 12 14:47:30 2020 +0000 +++ b/kallithea/lib/vcs/backends/hg/changeset.py Fri Jun 12 18:09:59 2020 +0200 @@ -329,7 +329,7 @@ #vals = url,rev,type loc = vals[0] cs = vals[1] - dirnodes.append(SubModuleNode(k, url=loc, changeset=cs, + dirnodes.append(SubModuleNode(safe_str(k), url=safe_str(loc), changeset=cs, alias=als)) nodes = dirnodes + filenodes for node in nodes: diff -r 6c13c599d43d -r f48b12755d83 kallithea/lib/vcs/nodes.py --- a/kallithea/lib/vcs/nodes.py Fri Jun 12 14:47:30 2020 +0000 +++ b/kallithea/lib/vcs/nodes.py Fri Jun 12 18:09:59 2020 +0200 @@ -603,4 +603,4 @@ then only last part is returned. """ org = self.path.rstrip('/').rsplit('/', 1)[-1] - return '%s @ %s' % (org, self.changeset.short_id) + return '%s @ %s' % (org, safe_str(self.changeset.short_id))