Mercurial > public > mercurial-scm > hg-stable
view mercurial/linelog.py @ 49599:48e38b179106 stable
demandimport: fix a crash in LazyFinder.__delattr__
I was tinkering with `with hgdemandimport.deactivated()` wrapped around loading
the keyring module, and got spew that seemed to be confirmed by PyCharm. But I
can't believe we haven't seen this before (and phabricator uses the same
pattern):
** Unknown exception encountered with possibly-broken third-party extension "mercurial_keyring" 1.4.3 (keyring 23.11.0, backend unknown)
** which supports versions unknown of Mercurial.
** Please disable "mercurial_keyring" and try your action again.
** If that fixes the bug please report it to https://foss.heptapod.net/mercurial/mercurial_keyring/issues
** Python 3.9.15 (main, Oct 13 2022, 04:28:25) [GCC 7.5.0]
** Mercurial Distributed SCM (version 6.3.1)
** Extensions loaded: absorb, attorc 20220315, blackbox, eol, extdiff, fastannotate, lfs, mercurial_keyring 1.4.3 (keyring 23.11.0, backend unknown), phabblocker 20220315, phabricator 20220315, purge, rebase, schemes, share, show, strip, uncommit
Traceback (most recent call last):
File "/usr/local/bin/hg", line 59, in <module>
dispatch.run()
File "/usr/local/lib/python3.9/site-packages/mercurial/dispatch.py", line 143, in run
status = dispatch(req)
File "/usr/local/lib/python3.9/site-packages/mercurial/dispatch.py", line 232, in dispatch
status = _rundispatch(req)
File "/usr/local/lib/python3.9/site-packages/mercurial/dispatch.py", line 276, in _rundispatch
ret = _runcatch(req) or 0
File "/usr/local/lib/python3.9/site-packages/mercurial/dispatch.py", line 451, in _runcatch
return _callcatch(ui, _runcatchfunc)
File "/usr/local/lib/python3.9/site-packages/mercurial/dispatch.py", line 461, in _callcatch
return scmutil.callcatch(ui, func)
File "/usr/local/lib/python3.9/site-packages/mercurial/scmutil.py", line 153, in callcatch
return func()
File "/usr/local/lib/python3.9/site-packages/mercurial/dispatch.py", line 441, in _runcatchfunc
return _dispatch(req)
File "/usr/local/lib/python3.9/site-packages/mercurial/dispatch.py", line 1265, in _dispatch
return runcommand(
File "/usr/local/lib/python3.9/site-packages/mercurial/dispatch.py", line 899, in runcommand
ret = _runcommand(ui, options, cmd, d)
File "/usr/local/lib/python3.9/site-packages/mercurial/dispatch.py", line 1277, in _runcommand
return cmdfunc()
File "/usr/local/lib/python3.9/site-packages/mercurial/dispatch.py", line 1263, in <lambda>
d = lambda: util.checksignature(func)(ui, *args, **strcmdopt)
File "/usr/local/lib/python3.9/site-packages/mercurial/util.py", line 1880, in check
return func(*args, **kwargs)
File "/root/mercurial_keyring/mercurial_keyring/mercurial_keyring.py", line 962, in cmd_keyring_check
user, pwd, source, final_url = handler.get_credentials(
File "/root/mercurial_keyring/mercurial_keyring/mercurial_keyring.py", line 497, in get_credentials
keyring_pwd = password_store.get_http_password(keyring_url, actual_user)
File "/root/mercurial_keyring/mercurial_keyring/mercurial_keyring.py", line 287, in get_http_password
return self._read_password_from_keyring(
File "/root/mercurial_keyring/mercurial_keyring/mercurial_keyring.py", line 335, in _read_password_from_keyring
keyring = import_keyring()
>> `with hgdemandimport.deactivated()` inserted here
File "/root/mercurial_keyring/mercurial_keyring/mercurial_keyring.py", line 120, in import_keyring
return _import_keyring()
File "/root/mercurial_keyring/mercurial_keyring/mercurial_keyring.py", line 133, in _import_keyring
mod, was_imported_now = meu.direct_import_ext(
File "/usr/lib/python3.9/site-packages/mercurial_extension_utils.py", line 1381, in direct_import_ext
__import__(module_name)
File "<frozen importlib._bootstrap>", line 1007, in _find_and_load
File "<frozen importlib._bootstrap>", line 986, in _find_and_load_unlocked
File "<frozen importlib._bootstrap>", line 680, in _load_unlocked
File "/usr/local/lib/python3.9/site-packages/hgdemandimport/demandimportpy3.py", line 46, in exec_module
self.loader.exec_module(module)
File "/usr/lib/python3.9/site-packages/keyring/__init__.py", line 1, in <module>
from .core import (
File "<frozen importlib._bootstrap>", line 1007, in _find_and_load
File "<frozen importlib._bootstrap>", line 986, in _find_and_load_unlocked
File "<frozen importlib._bootstrap>", line 680, in _load_unlocked
File "/usr/local/lib/python3.9/site-packages/hgdemandimport/demandimportpy3.py", line 46, in exec_module
self.loader.exec_module(module)
File "/usr/lib/python3.9/site-packages/keyring/core.py", line 11, in <module>
from . import backend, credentials
File "<frozen importlib._bootstrap>", line 1007, in _find_and_load
File "<frozen importlib._bootstrap>", line 986, in _find_and_load_unlocked
File "<frozen importlib._bootstrap>", line 680, in _load_unlocked
File "/usr/local/lib/python3.9/site-packages/hgdemandimport/demandimportpy3.py", line 46, in exec_module
self.loader.exec_module(module)
File "/usr/lib/python3.9/site-packages/keyring/backend.py", line 13, in <module>
from .py312compat import metadata
File "<frozen importlib._bootstrap>", line 1007, in _find_and_load
File "<frozen importlib._bootstrap>", line 986, in _find_and_load_unlocked
File "<frozen importlib._bootstrap>", line 680, in _load_unlocked
File "/usr/local/lib/python3.9/site-packages/hgdemandimport/demandimportpy3.py", line 46, in exec_module
self.loader.exec_module(module)
File "/usr/lib/python3.9/site-packages/keyring/py312compat.py", line 10, in <module>
import importlib_metadata as metadata # type: ignore
File "<frozen importlib._bootstrap>", line 1007, in _find_and_load
File "<frozen importlib._bootstrap>", line 986, in _find_and_load_unlocked
File "<frozen importlib._bootstrap>", line 680, in _load_unlocked
File "/usr/local/lib/python3.9/site-packages/hgdemandimport/demandimportpy3.py", line 46, in exec_module
self.loader.exec_module(module)
File "/usr/lib/python3.9/site-packages/importlib_metadata/__init__.py", line 715, in <module>
class MetadataPathFinder(NullFinder, DistributionFinder):
File "/usr/lib/python3.9/site-packages/importlib_metadata/_compat.py", line 24, in install
disable_stdlib_finder()
File "/usr/lib/python3.9/site-packages/importlib_metadata/_compat.py", line 43, in disable_stdlib_finder
del finder.find_distributions
File "/usr/local/lib/python3.9/site-packages/hgdemandimport/demandimportpy3.py", line 88, in __delattr__
return delattr(object.__getattribute__(self, "_finder"))
TypeError: delattr expected 2 arguments, got 1
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Thu, 08 Dec 2022 21:45:47 -0500 |
parents | d44e3c45f0e4 |
children | 011eec5a66b2 |
line wrap: on
line source
# linelog - efficient cache for annotate data # # Copyright 2018 Google LLC. # # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. """linelog is an efficient cache for annotate data inspired by SCCS Weaves. SCCS Weaves are an implementation of https://en.wikipedia.org/wiki/Interleaved_deltas. See mercurial/helptext/internals/linelog.txt for an exploration of SCCS weaves and how linelog works in detail. Here's a hacker's summary: a linelog is a program which is executed in the context of a revision. Executing the program emits information about lines, including the revision that introduced them and the line number in the file at the introducing revision. When an insertion or deletion is performed on the file, a jump instruction is used to patch in a new body of annotate information. """ import abc import struct from .thirdparty import attr from . import pycompat _llentry = struct.Struct(b'>II') class LineLogError(Exception): """Error raised when something bad happens internally in linelog.""" @attr.s class lineinfo: # Introducing revision of this line. rev = attr.ib() # Line number for this line in its introducing revision. linenum = attr.ib() # Private. Offset in the linelog program of this line. Used internally. _offset = attr.ib() @attr.s class annotateresult: rev = attr.ib() lines = attr.ib() _eof = attr.ib() def __iter__(self): return iter(self.lines) class _llinstruction: # pytype: disable=ignored-metaclass __metaclass__ = abc.ABCMeta @abc.abstractmethod def __init__(self, op1, op2): pass @abc.abstractmethod def __str__(self): pass def __repr__(self): return str(self) @abc.abstractmethod def __eq__(self, other): pass @abc.abstractmethod def encode(self): """Encode this instruction to the binary linelog format.""" @abc.abstractmethod def execute(self, rev, pc, emit): """Execute this instruction. Args: rev: The revision we're annotating. pc: The current offset in the linelog program. emit: A function that accepts a single lineinfo object. Returns: The new value of pc. Returns None if exeuction should stop (that is, we've found the end of the file.) """ class _jge(_llinstruction): """If the current rev is greater than or equal to op1, jump to op2.""" def __init__(self, op1, op2): self._cmprev = op1 self._target = op2 def __str__(self): return 'JGE %d %d' % (self._cmprev, self._target) def __eq__(self, other): return ( type(self) == type(other) and self._cmprev == other._cmprev and self._target == other._target ) def encode(self): return _llentry.pack(self._cmprev << 2, self._target) def execute(self, rev, pc, emit): if rev >= self._cmprev: return self._target return pc + 1 class _jump(_llinstruction): """Unconditional jumps are expressed as a JGE with op1 set to 0.""" def __init__(self, op1, op2): if op1 != 0: raise LineLogError(b"malformed JUMP, op1 must be 0, got %d" % op1) self._target = op2 def __str__(self): return 'JUMP %d' % (self._target) def __eq__(self, other): return type(self) == type(other) and self._target == other._target def encode(self): return _llentry.pack(0, self._target) def execute(self, rev, pc, emit): return self._target class _eof(_llinstruction): """EOF is expressed as a JGE that always jumps to 0.""" def __init__(self, op1, op2): if op1 != 0: raise LineLogError(b"malformed EOF, op1 must be 0, got %d" % op1) if op2 != 0: raise LineLogError(b"malformed EOF, op2 must be 0, got %d" % op2) def __str__(self): return r'EOF' def __eq__(self, other): return type(self) == type(other) def encode(self): return _llentry.pack(0, 0) def execute(self, rev, pc, emit): return None class _jl(_llinstruction): """If the current rev is less than op1, jump to op2.""" def __init__(self, op1, op2): self._cmprev = op1 self._target = op2 def __str__(self): return 'JL %d %d' % (self._cmprev, self._target) def __eq__(self, other): return ( type(self) == type(other) and self._cmprev == other._cmprev and self._target == other._target ) def encode(self): return _llentry.pack(1 | (self._cmprev << 2), self._target) def execute(self, rev, pc, emit): if rev < self._cmprev: return self._target return pc + 1 class _line(_llinstruction): """Emit a line.""" def __init__(self, op1, op2): # This line was introduced by this revision number. self._rev = op1 # This line had the specified line number in the introducing revision. self._origlineno = op2 def __str__(self): return 'LINE %d %d' % (self._rev, self._origlineno) def __eq__(self, other): return ( type(self) == type(other) and self._rev == other._rev and self._origlineno == other._origlineno ) def encode(self): return _llentry.pack(2 | (self._rev << 2), self._origlineno) def execute(self, rev, pc, emit): emit(lineinfo(self._rev, self._origlineno, pc)) return pc + 1 def _decodeone(data, offset): """Decode a single linelog instruction from an offset in a buffer.""" try: op1, op2 = _llentry.unpack_from(data, offset) except struct.error as e: raise LineLogError(b'reading an instruction failed: %r' % e) opcode = op1 & 0b11 op1 = op1 >> 2 if opcode == 0: if op1 == 0: if op2 == 0: return _eof(op1, op2) return _jump(op1, op2) return _jge(op1, op2) elif opcode == 1: return _jl(op1, op2) elif opcode == 2: return _line(op1, op2) raise NotImplementedError(b'Unimplemented opcode %r' % opcode) class linelog: """Efficient cache for per-line history information.""" def __init__(self, program=None, maxrev=0): if program is None: # We pad the program with an extra leading EOF so that our # offsets will match the C code exactly. This means we can # interoperate with the C code. program = [_eof(0, 0), _eof(0, 0)] self._program = program self._lastannotate = None self._maxrev = maxrev def __eq__(self, other): return ( type(self) == type(other) and self._program == other._program and self._maxrev == other._maxrev ) def __repr__(self): return '<linelog at %s: maxrev=%d size=%d>' % ( hex(id(self)), self._maxrev, len(self._program), ) def debugstr(self): fmt = '%%%dd %%s' % len(str(len(self._program))) return pycompat.sysstr(b'\n').join( fmt % (idx, i) for idx, i in enumerate(self._program[1:], 1) ) @classmethod def fromdata(cls, buf): if len(buf) % _llentry.size != 0: raise LineLogError( b"invalid linelog buffer size %d (must be a multiple of %d)" % (len(buf), _llentry.size) ) expected = len(buf) / _llentry.size fakejge = _decodeone(buf, 0) if isinstance(fakejge, _jump): maxrev = 0 elif isinstance(fakejge, (_jge, _jl)): maxrev = fakejge._cmprev else: raise LineLogError( 'Expected one of _jump, _jge, or _jl. Got %s.' % type(fakejge).__name__ ) assert isinstance(fakejge, (_jump, _jge, _jl)) # help pytype numentries = fakejge._target if expected != numentries: raise LineLogError( b"corrupt linelog data: claimed" b" %d entries but given data for %d entries" % (expected, numentries) ) instructions = [_eof(0, 0)] for offset in range(1, numentries): instructions.append(_decodeone(buf, offset * _llentry.size)) return cls(instructions, maxrev=maxrev) def encode(self): hdr = _jge(self._maxrev, len(self._program)).encode() return hdr + b''.join(i.encode() for i in self._program[1:]) def clear(self): self._program = [] self._maxrev = 0 self._lastannotate = None def replacelines_vec(self, rev, a1, a2, blines): return self.replacelines( rev, a1, a2, 0, len(blines), _internal_blines=blines ) def replacelines(self, rev, a1, a2, b1, b2, _internal_blines=None): """Replace lines [a1, a2) with lines [b1, b2).""" if self._lastannotate: # TODO(augie): make replacelines() accept a revision at # which we're editing as well as a revision to mark # responsible for the edits. In hg-experimental it's # stateful like this, so we're doing the same thing to # retain compatibility with absorb until that's imported. ar = self._lastannotate else: ar = self.annotate(rev) # ar = self.annotate(self._maxrev) if a1 > len(ar.lines): raise LineLogError( b'%d contains %d lines, tried to access line %d' % (rev, len(ar.lines), a1) ) elif a1 == len(ar.lines): # Simulated EOF instruction since we're at EOF, which # doesn't have a "real" line. a1inst = _eof(0, 0) a1info = lineinfo(0, 0, ar._eof) else: a1info = ar.lines[a1] a1inst = self._program[a1info._offset] programlen = self._program.__len__ oldproglen = programlen() appendinst = self._program.append # insert blineinfos = [] bappend = blineinfos.append if b1 < b2: # Determine the jump target for the JGE at the start of # the new block. tgt = oldproglen + (b2 - b1 + 1) # Jump to skip the insert if we're at an older revision. appendinst(_jl(rev, tgt)) for linenum in range(b1, b2): if _internal_blines is None: bappend(lineinfo(rev, linenum, programlen())) appendinst(_line(rev, linenum)) else: newrev, newlinenum = _internal_blines[linenum] bappend(lineinfo(newrev, newlinenum, programlen())) appendinst(_line(newrev, newlinenum)) # delete if a1 < a2: if a2 > len(ar.lines): raise LineLogError( b'%d contains %d lines, tried to access line %d' % (rev, len(ar.lines), a2) ) elif a2 == len(ar.lines): endaddr = ar._eof else: endaddr = ar.lines[a2]._offset if a2 > 0 and rev < self._maxrev: # If we're here, we're deleting a chunk of an old # commit, so we need to be careful and not touch # invisible lines between a2-1 and a2 (IOW, lines that # are added later). endaddr = ar.lines[a2 - 1]._offset + 1 appendinst(_jge(rev, endaddr)) # copy instruction from a1 a1instpc = programlen() appendinst(a1inst) # if a1inst isn't a jump or EOF, then we need to add an unconditional # jump back into the program here. if not isinstance(a1inst, (_jump, _eof)): appendinst(_jump(0, a1info._offset + 1)) # Patch instruction at a1, which makes our patch live. self._program[a1info._offset] = _jump(0, oldproglen) # Update self._lastannotate in place. This serves as a cache to avoid # expensive "self.annotate" in this function, when "replacelines" is # used continuously. if len(self._lastannotate.lines) > a1: self._lastannotate.lines[a1]._offset = a1instpc else: assert isinstance(a1inst, _eof) self._lastannotate._eof = a1instpc self._lastannotate.lines[a1:a2] = blineinfos self._lastannotate.rev = max(self._lastannotate.rev, rev) if rev > self._maxrev: self._maxrev = rev def annotate(self, rev): pc = 1 lines = [] executed = 0 # Sanity check: if instructions executed exceeds len(program), we # hit an infinite loop in the linelog program somehow and we # should stop. while pc is not None and executed < len(self._program): inst = self._program[pc] lastpc = pc pc = inst.execute(rev, pc, lines.append) executed += 1 if pc is not None: raise LineLogError( r'Probably hit an infinite loop in linelog. Program:\n' + self.debugstr() ) ar = annotateresult(rev, lines, lastpc) self._lastannotate = ar return ar @property def maxrev(self): return self._maxrev # Stateful methods which depend on the value of the last # annotation run. This API is for compatiblity with the original # linelog, and we should probably consider refactoring it. @property def annotateresult(self): """Return the last annotation result. C linelog code exposed this.""" return [(l.rev, l.linenum) for l in self._lastannotate.lines] def getoffset(self, line): return self._lastannotate.lines[line]._offset def getalllines(self, start=0, end=0): """Get all lines that ever occurred in [start, end). Passing start == end == 0 means "all lines ever". This works in terms of *internal* program offsets, not line numbers. """ pc = start or 1 lines = [] # only take as many steps as there are instructions in the # program - if we don't find an EOF or our stop-line before # then, something is badly broken. for step in range(len(self._program)): inst = self._program[pc] nextpc = pc + 1 if isinstance(inst, _jump): nextpc = inst._target elif isinstance(inst, _eof): return lines elif isinstance(inst, (_jl, _jge)): pass elif isinstance(inst, _line): lines.append((inst._rev, inst._origlineno)) else: raise LineLogError(b"Illegal instruction %r" % inst) if nextpc == end: return lines pc = nextpc raise LineLogError(b"Failed to perform getalllines")