Mercurial > kallithea
changeset 8441:f48b12755d83 stable
hg: fix missing py3 string conversions for displaying subrepo (Issue #377)
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Fri, 12 Jun 2020 18:09:59 +0200 |
| parents | 6c13c599d43d |
| children | 75b1994e4959 |
| files | kallithea/lib/vcs/backends/hg/changeset.py kallithea/lib/vcs/nodes.py |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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:
--- 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))