This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10318

revlog: fix error about unknown compression format in py3
ClosedPublic

Authored by valentin.gatienbaron on Apr 6 2021, 1:53 PM.

Details

Reviewers
indygreg
pulkit
Group Reviewers
hg-reviewers
Commits
rHGfbfb1d6d8459: revlog: fix error about unknown compression format in py3
Summary

In py2, the error is something like:
abort: unknown compression type 'x'!

In py3, we get the following unhelpful message:
abort: unknown compression type <memory at 0x7f4650b5cdc8>!

Switch to something like:
abort: unknown compression type 78!

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

pulkit accepted this revision.Apr 8 2021, 3:02 AM
This revision is now accepted and ready to land.Apr 8 2021, 3:02 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/revlog.py (5 lines)

Diff 26689

mercurial/revlog.py

# revlog.py - storage back-end for mercurial # revlog.py - storage back-end for mercurial
# #
# Copyright 2005-2007 Olivia Mackall <olivia@selenic.com> # Copyright 2005-2007 Olivia Mackall <olivia@selenic.com>
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
"""Storage back-end for Mercurial. """Storage back-end for Mercurial.
This provides efficient delta storage with O(1) retrieve and append This provides efficient delta storage with O(1) retrieve and append
and O(changes) merge between branches. and O(changes) merge between branches.
""" """
from __future__ import absolute_import from __future__ import absolute_import
import binascii
import collections import collections
import contextlib import contextlib
import errno import errno
import io import io
import os import os
import struct import struct
import zlib import zlib
try: try:
compressor = self._decompressors[t] compressor = self._decompressors[t]
except KeyError: except KeyError:
try: try:
engine = util.compengines.forrevlogheader(t) engine = util.compengines.forrevlogheader(t)
compressor = engine.revlogcompressor(self._compengineopts) compressor = engine.revlogcompressor(self._compengineopts)
self._decompressors[t] = compressor self._decompressors[t] = compressor
except KeyError: except KeyError:
raise error.RevlogError(_(b'unknown compression type %r') % t) raise error.RevlogError(
_(b'unknown compression type %s') % binascii.hexlify(t)
)
return compressor.decompress(data) return compressor.decompress(data)
def _addrevision( def _addrevision(
self, self,
node, node,
rawtext, rawtext,
transaction, transaction,