Mercurial > public > mercurial-scm > hg
comparison mercurial/revlog.py @ 47414:5fbac82a8780
revlog: byteify a few error strings
Differential Revision: https://phab.mercurial-scm.org/D10875
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Sat, 12 Jun 2021 00:51:34 -0400 |
parents | 5e44936b82be |
children | e0a314bcbc9d |
comparison
equal
deleted
inserted
replaced
47413:5e44936b82be | 47414:5fbac82a8780 |
---|---|
1758 elif compression_mode == COMP_MODE_DEFAULT: | 1758 elif compression_mode == COMP_MODE_DEFAULT: |
1759 return self._decompressor(data) | 1759 return self._decompressor(data) |
1760 elif compression_mode == COMP_MODE_INLINE: | 1760 elif compression_mode == COMP_MODE_INLINE: |
1761 return self.decompress(data) | 1761 return self.decompress(data) |
1762 else: | 1762 else: |
1763 msg = 'unknown compression mode %d' | 1763 msg = b'unknown compression mode %d' |
1764 msg %= compression_mode | 1764 msg %= compression_mode |
1765 raise error.RevlogError(msg) | 1765 raise error.RevlogError(msg) |
1766 | 1766 |
1767 def _chunks(self, revs, df=None, targetsize=None): | 1767 def _chunks(self, revs, df=None, targetsize=None): |
1768 """Obtain decompressed chunks for the specified revisions. | 1768 """Obtain decompressed chunks for the specified revisions. |
1824 elif comp_mode == COMP_MODE_INLINE: | 1824 elif comp_mode == COMP_MODE_INLINE: |
1825 ladd(decomp(c)) | 1825 ladd(decomp(c)) |
1826 elif comp_mode == COMP_MODE_DEFAULT: | 1826 elif comp_mode == COMP_MODE_DEFAULT: |
1827 ladd(def_decomp(c)) | 1827 ladd(def_decomp(c)) |
1828 else: | 1828 else: |
1829 msg = 'unknown compression mode %d' | 1829 msg = b'unknown compression mode %d' |
1830 msg %= comp_mode | 1830 msg %= comp_mode |
1831 raise error.RevlogError(msg) | 1831 raise error.RevlogError(msg) |
1832 | 1832 |
1833 return l | 1833 return l |
1834 | 1834 |
2052 elif comp == COMP_MODE_DEFAULT: | 2052 elif comp == COMP_MODE_DEFAULT: |
2053 segment = self._decompressor(comp_segment) | 2053 segment = self._decompressor(comp_segment) |
2054 elif comp == COMP_MODE_INLINE: | 2054 elif comp == COMP_MODE_INLINE: |
2055 segment = self.decompress(comp_segment) | 2055 segment = self.decompress(comp_segment) |
2056 else: | 2056 else: |
2057 msg = 'unknown compression mode %d' | 2057 msg = b'unknown compression mode %d' |
2058 msg %= comp | 2058 msg %= comp |
2059 raise error.RevlogError(msg) | 2059 raise error.RevlogError(msg) |
2060 | 2060 |
2061 sidedata = sidedatautil.deserialize_sidedata(segment) | 2061 sidedata = sidedatautil.deserialize_sidedata(segment) |
2062 return sidedata | 2062 return sidedata |