##// END OF EJS Templates
statichttprepo: fix `httprangereader.read()` for py3...
statichttprepo: fix `httprangereader.read()` for py3 It looks like there were a bunch of problems, not all of them py3 related: 1) The signature of BinaryIO.read() is -1, not None 2) The `end` variable can't be bytes and interpolate into str with "%s" 3) The `end` variable can't be an int and interpolate into str with "%s" 4) The result slicing could be out of bounds if more is requested than returned I guess if somebody would have called `read(-1)` (either directly or because a wrapper defaults to that), it wouldn't have been handled correctly. The fact that it is a valid value meaning to read everything requires some additional changes later in the method around when it slices the byte string that was read, but that seems to have already been broken.

File last commit:

r52757:1c5810ce default
r52792:e26a0856 default
Show More
concurrency_checker.py
40 lines | 1.5 KiB | text/x-python | PythonLexer
from __future__ import annotations
from ..i18n import _
from .. import error
def get_checker(ui, revlog_name=b'changelog'):
"""Get a function that checks file handle position is as expected.
This is used to ensure that files haven't been modified outside of our
knowledge (such as on a networked filesystem, if `hg debuglocks` was used,
or writes to .hg that ignored locks happened).
Due to revlogs supporting a concept of buffered, delayed, or diverted
writes, we're allowing the files to be shorter than expected (the data may
not have been written yet), but they can't be longer.
Please note that this check is not perfect; it can't detect all cases (there
may be false-negatives/false-OKs), but it should never claim there's an
issue when there isn't (false-positives/false-failures).
"""
vpos = ui.config(b'debug', b'revlog.verifyposition.' + revlog_name)
# Avoid any `fh.tell` cost if this isn't enabled.
if not vpos or vpos not in [b'log', b'warn', b'fail']:
return None
def _checker(fh, fn, expected):
if fh.tell() <= expected:
return
msg = _(b'%s: file cursor at position %d, expected %d')
# Always log if we're going to warn or fail.
ui.log(b'debug', msg + b'\n', fn, fh.tell(), expected)
if vpos == b'warn':
ui.warn((msg + b'\n') % (fn, fh.tell(), expected))
elif vpos == b'fail':
raise error.RevlogError(msg % (fn, fh.tell(), expected))
return _checker