##// END OF EJS Templates
branching: fix wrong merge conflict resolution from 13dfad0f9f7a...
branching: fix wrong merge conflict resolution from 13dfad0f9f7a 13dfad0f9f7a merged stable into default, but accidentally added the _blockingreader class from stable (but deindented) instead of merging the changes from stable (2fe4efaa59af) into the existing _blockingreader class. This resulted in the _blockingreader being there two times.

File last commit:

r47349:e9901d01 default
r50119:cdb85d05 default
Show More
concurrency_checker.py
38 lines | 1.5 KiB | text/x-python | PythonLexer
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