kallithea Changeset - 6c13c599d43d

Changeset - 6c13c599d43d

Parent rev.

Child rev.

[Not reviewed]

stable

0 1 0

David Ignjić - 6 years ago 2020-06-12 16:47:30
ignjic@gmail.com

hg: fix crash on displaying bookmarks - add lost hex conversion when computing bookmark property

The crash was seen for example when using "Switch To" with bookmarks.

The problem was introduced with py3 conversion in e7dbe089e10d.

1 file changed with 1 insertions and 1 deletions:

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

0 comments (0 inline, 0 general)

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

➞

Show inline comments

@@ @@ -227,13 +227,13 @@ class MercurialRepository(BaseRepository @@
     def _get_bookmarks(self):
         if self._empty:
             return {}
         return OrderedDict(sorted(
             ((safe_str(n), ascii_str(h)) for n, h in self._repo._bookmarks.items()),
+            ((safe_str(n), ascii_str(mercurial.node.hex(h))) for n, h in self._repo._bookmarks.items()),
             reverse=True,
             key=lambda x: x[0],  # sort by name
         ))
     def _get_all_revisions(self):
         return [ascii_str(self._repo[x].hex()) for x in self._repo.filtered(b'visible').changelog.revs()]

0 comments (0 inline, 0 general)