Mercurial > kallithea
changeset 8440:6c13c599d43d stable
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.
| author | David Ignjić <ignjic@gmail.com> |
|---|---|
| date | Fri, 12 Jun 2020 14:47:30 +0000 |
| parents | 84b3d6248a80 |
| children | f48b12755d83 |
| files | kallithea/lib/vcs/backends/hg/repository.py |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/lib/vcs/backends/hg/repository.py Sun Jun 07 21:52:58 2020 +0200 +++ b/kallithea/lib/vcs/backends/hg/repository.py Fri Jun 12 14:47:30 2020 +0000 @@ -230,7 +230,7 @@ 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 ))