Mercurial > public > mercurial-scm > hg
comparison mercurial/changegroup.py @ 46513:c3c7a86e9c24
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
| author | Rapha?l Gom?s <rgomes@octobus.net> |
|---|---|
| date | Fri, 12 Feb 2021 12:51:28 +0100 |
| parents | fa7ae7aa0efd |
| children | 357d2ea95ce9 |
comparison
equal
deleted
inserted
replaced
| 46512:866eb4d6bd9f | 46513:c3c7a86e9c24 |
|---|---|
| 683 if store.linkrev(i) == clrev: | 683 if store.linkrev(i) == clrev: |
| 684 return i | 684 return i |
| 685 # We failed to resolve a parent for this node, so | 685 # We failed to resolve a parent for this node, so |
| 686 # we crash the changegroup construction. | 686 # we crash the changegroup construction. |
| 687 raise error.Abort( | 687 raise error.Abort( |
| 688 b'unable to resolve parent while packing %r %r' | 688 b"unable to resolve parent while packing '%s' %r" |
| 689 b' for changeset %r' % (store.indexfile, rev, clrev) | 689 b' for changeset %r' % (store.indexfile, rev, clrev) |
| 690 ) | 690 ) |
| 691 | 691 |
| 692 return nullrev | 692 return nullrev |
| 693 | 693 |