tests: fix differing output between py2 and py3
db9e33beb0fb broke the tests because of the difference in bytestring repr
between py2 and py3. Rather than backout that change for so little, I figured
I'd fix it myself.
Hopefully Python 2 supports gets dropped very soon.
Differential Revision: https://phab.mercurial-scm.org/D9987
--- a/mercurial/changegroup.py Thu Feb 04 23:11:42 2021 +0100
+++ b/mercurial/changegroup.py Fri Feb 12 12:51:28 2021 +0100
@@ -685,7 +685,7 @@
# We failed to resolve a parent for this node, so
# we crash the changegroup construction.
raise error.Abort(
- b'unable to resolve parent while packing %r %r'
+ b"unable to resolve parent while packing '%s' %r"
b' for changeset %r' % (store.indexfile, rev, clrev)
)
--- a/tests/test-narrow-pull.t Thu Feb 04 23:11:42 2021 +0100
+++ b/tests/test-narrow-pull.t Fri Feb 12 12:51:28 2021 +0100
@@ -147,7 +147,7 @@
$ hg clone -q --narrow ssh://user@dummy/master narrow2 --include "f1" -r 0
$ cd narrow2
$ hg pull -q -r 1
- remote: abort: unexpected error: unable to resolve parent while packing b'00manifest.i' 1 for changeset 0
+ remote: abort: unexpected error: unable to resolve parent while packing '00manifest.i' 1 for changeset 0
transaction abort!
rollback completed
abort: pull failed on remote