##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

dispatch: don't mangle ImportError abort messages...
dispatch: don't mangle ImportError abort messages Previously, Mercurial assumed that the last word of the string representation was the name of the moduled that was imported. This assmption is incorrect, despite being true for the common case of an exception raised by the Python VM. For example, hgsubversion raises an ImportError with a helpful message if the Subversion bindings were not found. The final word of this message is not meaningful on its own, and is never the name of a module. This patch changes the output printed to be a simple stringification of the exception instance. In most cases, this will be `abort: No module named X!' rather than `abort: could not import module X!'. No functionality change; all tests pass.
Matt Mackall - - Load All Authors

File last commit:

r10263:25e57239 stable
r11053:59d0d715 stable
Show More
parsers.py
90 lines | 2.3 KiB | text/x-python | PythonLexer
/ mercurial / pure / parsers.py
History | Source | Raw |Copy content |Copy permalink
Martin Geisler
pure Python implementation of parsers.c
 r7700 # parsers.py - Python implementation of parsers.c
#
# Copyright 2009 Matt Mackall <mpm@selenic.com> and others
#
Martin Geisler
updated license to be explicit about GPL version 2
 r8225 # This software may be used and distributed according to the terms of the
Matt Mackall
Update license to GPLv2+
 r10263 # GNU General Public License version 2 or any later version.
Martin Geisler
pure Python implementation of parsers.c
 r7700
Matt Mackall
pure/parsers: fix circular imports, import mercurial modules properly
 r7945 from mercurial.node import bin, nullid, nullrev
from mercurial import util
import struct, zlib
Martin Geisler
pure Python implementation of parsers.c
 r7700
_pack = struct.pack
_unpack = struct.unpack
_compress = zlib.compress
_decompress = zlib.decompress
_sha = util.sha1
def parse_manifest(mfdict, fdict, lines):
for l in lines.splitlines():
f, n = l.split('\0')
if len(n) > 40:
fdict[f] = n[40:]
mfdict[f] = bin(n[:40])
else:
mfdict[f] = bin(n)
def parse_index(data, inline):
Matt Mackall
pure/parsers: fix circular imports, import mercurial modules properly
 r7945 def gettype(q):
return int(q & 0xFFFF)
def offset_type(offset, type):
return long(long(offset) << 16 | type)
indexformatng = ">Qiiiiii20s12x"
Martin Geisler
pure Python implementation of parsers.c
 r7700 s = struct.calcsize(indexformatng)
index = []
cache = None
nodemap = {nullid: nullrev}
n = off = 0
# if we're not using lazymap, always read the whole index
l = len(data) - s
append = index.append
if inline:
cache = (0, data)
while off <= l:
e = _unpack(indexformatng, data[off:off + s])
nodemap[e[7]] = n
append(e)
n += 1
if e[1] < 0:
break
off += e[1] + s
else:
while off <= l:
e = _unpack(indexformatng, data[off:off + s])
nodemap[e[7]] = n
append(e)
n += 1
off += s
e = list(index[0])
Matt Mackall
pure/parsers: fix circular imports, import mercurial modules properly
 r7945 type = gettype(e[0])
e[0] = offset_type(0, type)
Martin Geisler
pure Python implementation of parsers.c
 r7700 index[0] = tuple(e)
# add the magic null revision at -1
index.append((0, 0, 0, -1, -1, -1, -1, nullid))
return index, nodemap, cache
def parse_dirstate(dmap, copymap, st):
parents = [st[:20], st[20: 40]]
# deref fields so they will be local in loop
Matt Mackall
pure/parsers: fix circular imports, import mercurial modules properly
 r7945 format = ">cllll"
e_size = struct.calcsize(format)
Martin Geisler
pure Python implementation of parsers.c
 r7700 pos1 = 40
l = len(st)
# the inner loop
while pos1 < l:
pos2 = pos1 + e_size
e = _unpack(">cllll", st[pos1:pos2]) # a literal here is faster
pos1 = pos2 + e[4]
f = st[pos2:pos1]
if '\0' in f:
f, c = f.split('\0')
copymap[f] = c
dmap[f] = e[:4]
return parents