kallithea Changeset - f48b12755d83

Changeset - f48b12755d83

Parent rev.

Child rev.

[Not reviewed]

stable

0 2 0

Mads Kiilerich (mads) - 6 years ago 2020-06-12 18:09:59
mads@kiilerich.com

hg: fix missing py3 string conversions for displaying subrepo (Issue #377)

2 files changed with 2 insertions and 2 deletions:

kallithea/lib/vcs/backends/hg/changeset.py

kallithea/lib/vcs/nodes.py

0 comments (0 inline, 0 general)

kallithea/lib/vcs/backends/hg/changeset.py

➞

Show inline comments

@@ @@ -326,13 +326,13 @@ class MercurialChangeset(BaseChangeset): @@
         als = self.repository.alias
         for k, vals in self._extract_submodules().items():
             #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:
             self.nodes[node.path] = node
         nodes.sort()
         return nodes

kallithea/lib/vcs/nodes.py

➞

Show inline comments

@@ @@ -600,7 +600,7 @@ class SubModuleNode(Node): @@
     def name(self):
         """
         Returns name of the node so if its path
         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))

0 comments (0 inline, 0 general)