Mercurial > hg

changeset 43666:4394687b298b stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pure: use string for exception in the pure version of base85 Without this change, running the test with python3 and --pure gives the following error:: --- /home/marmoute/src/mercurial-dev/tests/test-import-git.t +++ /home/marmoute/src/mercurial-dev/tests/test-import-git.t.err @@ -518,7 +518,7 @@ > > EOF applying patch from stdin - abort: could not decode "binary2" binary patch: bad base85 character at position 6 + abort: could not decode "binary2" binary patch: b'bad base85 character at position 6' [255] $ hg revert -aq To make the cext implementation, we use a "native" string for the exception. This fix the test failure.
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Sat, 16 Nov 2019 20:07:49 +0100
parents 856cce0c255c
children 4cd911040ba5
files mercurial/pure/base85.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/pure/base85.py	Tue Nov 12 11:05:03 2019 +0100
+++ b/mercurial/pure/base85.py	Sat Nov 16 20:07:49 2019 +0100
@@ -67,7 +67,7 @@
                 acc = acc * 85 + _b85dec[c]
             except KeyError:
                 raise ValueError(
-                    b'bad base85 character at position %d' % (i + j)
+                    'bad base85 character at position %d' % (i + j)
                 )
         if acc > 4294967295:
             raise ValueError(b'Base85 overflow in hunk starting at byte %d' % i)