revlog.py
1654 lines
| 57.3 KiB
| text/x-python
|
PythonLexer
/ mercurial / revlog.py
Martin Geisler
|
r8226 | # revlog.py - storage back-end for mercurial | ||
# | ||||
# Copyright 2005-2007 Matt Mackall <mpm@selenic.com> | ||||
# | ||||
# This software may be used and distributed according to the terms of the | ||||
Matt Mackall
|
r10263 | # GNU General Public License version 2 or any later version. | ||
mpm@selenic.com
|
r0 | |||
Martin Geisler
|
r8227 | """Storage back-end for Mercurial. | ||
This provides efficient delta storage with O(1) retrieve and append | ||||
and O(changes) merge between branches. | ||||
""" | ||||
Peter Arrenbrecht
|
r7873 | # import stuff from node for others to import from revlog | ||
Martin von Zweigbergk
|
r25113 | import collections | ||
Matt Mackall
|
r14393 | from node import bin, hex, nullid, nullrev | ||
Matt Mackall
|
r3891 | from i18n import _ | ||
Wojciech Lopata
|
r19624 | import ancestor, mdiff, parsers, error, util, templatefilters | ||
Bryan O'Sullivan
|
r16834 | import struct, zlib, errno | ||
mpm@selenic.com
|
r36 | |||
Matt Mackall
|
r5007 | _pack = struct.pack | ||
_unpack = struct.unpack | ||||
_compress = zlib.compress | ||||
_decompress = zlib.decompress | ||||
Dirkjan Ochtman
|
r6470 | _sha = util.sha1 | ||
Matt Mackall
|
r5007 | |||
Vishakh H
|
r11746 | # revlog header flags | ||
mason@suse.com
|
r2072 | REVLOGV0 = 0 | ||
REVLOGNG = 1 | ||||
mason@suse.com
|
r2073 | REVLOGNGINLINEDATA = (1 << 16) | ||
Sune Foldager
|
r14253 | REVLOGGENERALDELTA = (1 << 17) | ||
mason@suse.com
|
r2222 | REVLOG_DEFAULT_FLAGS = REVLOGNGINLINEDATA | ||
REVLOG_DEFAULT_FORMAT = REVLOGNG | ||||
REVLOG_DEFAULT_VERSION = REVLOG_DEFAULT_FORMAT | REVLOG_DEFAULT_FLAGS | ||||
Sune Foldager
|
r14253 | REVLOGNG_FLAGS = REVLOGNGINLINEDATA | REVLOGGENERALDELTA | ||
Vishakh H
|
r11746 | |||
# revlog index flags | ||||
Mike Edgar
|
r23855 | REVIDX_ISCENSORED = (1 << 15) # revision has censor metadata, must be verified | ||
REVIDX_DEFAULT_FLAGS = 0 | ||||
REVIDX_KNOWN_FLAGS = REVIDX_ISCENSORED | ||||
mason@suse.com
|
r2073 | |||
Benoit Boissinot
|
r10916 | # max size of revlog with inline data | ||
_maxinline = 131072 | ||||
Matt Mackall
|
r13253 | _chunksize = 1048576 | ||
Greg Ward
|
r10913 | |||
Matt Mackall
|
r7633 | RevlogError = error.RevlogError | ||
LookupError = error.LookupError | ||||
Mike Edgar
|
r22934 | CensoredNodeError = error.CensoredNodeError | ||
Alexander Solovyov
|
r6703 | |||
Matt Mackall
|
r4987 | def getoffset(q): | ||
return int(q >> 16) | ||||
def gettype(q): | ||||
return int(q & 0xFFFF) | ||||
def offset_type(offset, type): | ||||
return long(long(offset) << 16 | type) | ||||
Augie Fackler
|
r22784 | _nullhash = _sha(nullid) | ||
Nicolas Dumazet
|
r7883 | |||
mpm@selenic.com
|
r1091 | def hash(text, p1, p2): | ||
"""generate a hash from the given text and its parent hashes | ||||
This hash combines both the current file contents and its history | ||||
in a manner that makes it easy to distinguish nodes with the same | ||||
content in the revision graph. | ||||
""" | ||||
Nicolas Dumazet
|
r7883 | # As of now, if one of the parent node is null, p2 is null | ||
if p2 == nullid: | ||||
# deep copy of a hash is faster than creating one | ||||
Augie Fackler
|
r22784 | s = _nullhash.copy() | ||
Nicolas Dumazet
|
r7883 | s.update(p1) | ||
else: | ||||
# none of the parent nodes are nullid | ||||
l = [p1, p2] | ||||
l.sort() | ||||
s = _sha(l[0]) | ||||
s.update(l[1]) | ||||
mpm@selenic.com
|
r1091 | s.update(text) | ||
return s.digest() | ||||
mpm@selenic.com
|
r0 | def decompress(bin): | ||
mpm@selenic.com
|
r1083 | """ decompress the given input """ | ||
Matt Mackall
|
r4980 | if not bin: | ||
return bin | ||||
mpm@selenic.com
|
r112 | t = bin[0] | ||
Matt Mackall
|
r4980 | if t == '\0': | ||
return bin | ||||
if t == 'x': | ||||
Brad Hall
|
r16883 | try: | ||
return _decompress(bin) | ||||
Gregory Szorc
|
r25660 | except zlib.error as e: | ||
Brad Hall
|
r16883 | raise RevlogError(_("revlog decompress error: %s") % str(e)) | ||
Matt Mackall
|
r4980 | if t == 'u': | ||
return bin[1:] | ||||
Thomas Arendsen Hein
|
r1853 | raise RevlogError(_("unknown compression type %r") % t) | ||
mpm@selenic.com
|
r0 | |||
Benoit Boissinot
|
r18585 | # index v0: | ||
# 4 bytes: offset | ||||
# 4 bytes: compressed length | ||||
# 4 bytes: base rev | ||||
# 4 bytes: link rev | ||||
Yuya Nishihara
|
r25891 | # 20 bytes: parent 1 nodeid | ||
# 20 bytes: parent 2 nodeid | ||||
# 20 bytes: nodeid | ||||
Matt Mackall
|
r4987 | indexformatv0 = ">4l20s20s20s" | ||
Matt Mackall
|
r4918 | |||
Matt Mackall
|
r4972 | class revlogoldio(object): | ||
def __init__(self): | ||||
Matt Mackall
|
r4977 | self.size = struct.calcsize(indexformatv0) | ||
Matt Mackall
|
r4972 | |||
Benoit Boissinot
|
r13264 | def parseindex(self, data, inline): | ||
Matt Mackall
|
r4977 | s = self.size | ||
Matt Mackall
|
r4972 | index = [] | ||
nodemap = {nullid: nullrev} | ||||
Matt Mackall
|
r4973 | n = off = 0 | ||
l = len(data) | ||||
while off + s <= l: | ||||
cur = data[off:off + s] | ||||
off += s | ||||
Matt Mackall
|
r5007 | e = _unpack(indexformatv0, cur) | ||
Matt Mackall
|
r4977 | # transform to revlogv1 format | ||
e2 = (offset_type(e[0], 0), e[1], -1, e[2], e[3], | ||||
Matt Mackall
|
r5544 | nodemap.get(e[4], nullrev), nodemap.get(e[5], nullrev), e[6]) | ||
Matt Mackall
|
r4977 | index.append(e2) | ||
nodemap[e[6]] = n | ||||
Matt Mackall
|
r4973 | n += 1 | ||
Matt Mackall
|
r4972 | |||
Benoit Boissinot
|
r13265 | # add the magic null revision at -1 | ||
index.append((0, 0, 0, -1, -1, -1, -1, nullid)) | ||||
Matt Mackall
|
r4983 | return index, nodemap, None | ||
Matt Mackall
|
r4972 | |||
Alexis S. L. Carvalho
|
r5338 | def packentry(self, entry, node, version, rev): | ||
Benoit Boissinot
|
r10395 | if gettype(entry[0]): | ||
raise RevlogError(_("index entry flags need RevlogNG")) | ||||
Matt Mackall
|
r4986 | e2 = (getoffset(entry[0]), entry[1], entry[3], entry[4], | ||
node(entry[5]), node(entry[6]), entry[7]) | ||||
Matt Mackall
|
r5007 | return _pack(indexformatv0, *e2) | ||
Matt Mackall
|
r4986 | |||
Matt Mackall
|
r4987 | # index ng: | ||
Martin Geisler
|
r11323 | # 6 bytes: offset | ||
# 2 bytes: flags | ||||
# 4 bytes: compressed length | ||||
# 4 bytes: uncompressed length | ||||
# 4 bytes: base rev | ||||
# 4 bytes: link rev | ||||
# 4 bytes: parent 1 rev | ||||
# 4 bytes: parent 2 rev | ||||
Matt Mackall
|
r4987 | # 32 bytes: nodeid | ||
indexformatng = ">Qiiiiii20s12x" | ||||
versionformat = ">I" | ||||
Jordi Gutiérrez Hermoso
|
r25410 | # corresponds to uncompressed length of indexformatng (2 gigs, 4-byte | ||
# signed integer) | ||||
_maxentrysize = 0x7fffffff | ||||
Matt Mackall
|
r4972 | class revlogio(object): | ||
def __init__(self): | ||||
Matt Mackall
|
r4977 | self.size = struct.calcsize(indexformatng) | ||
Matt Mackall
|
r4972 | |||
Benoit Boissinot
|
r13264 | def parseindex(self, data, inline): | ||
Bernhard Leiner
|
r7109 | # call the C implementation to parse the index data | ||
Matt Mackall
|
r13254 | index, cache = parsers.parse_index2(data, inline) | ||
Bryan O'Sullivan
|
r16414 | return index, getattr(index, 'nodemap', None), cache | ||
Matt Mackall
|
r4972 | |||
Alexis S. L. Carvalho
|
r5338 | def packentry(self, entry, node, version, rev): | ||
Matt Mackall
|
r5007 | p = _pack(indexformatng, *entry) | ||
Alexis S. L. Carvalho
|
r5338 | if rev == 0: | ||
Matt Mackall
|
r5007 | p = _pack(versionformat, version) + p[4:] | ||
Matt Mackall
|
r4986 | return p | ||
Eric Hopper
|
r1559 | class revlog(object): | ||
mpm@selenic.com
|
r1083 | """ | ||
the underlying revision storage object | ||||
A revlog consists of two parts, an index and the revision data. | ||||
The index is a file with a fixed record size containing | ||||
Martin Geisler
|
r6912 | information on each revision, including its nodeid (hash), the | ||
mpm@selenic.com
|
r1083 | nodeids of its parents, the position and offset of its data within | ||
the data file, and the revision it's based on. Finally, each entry | ||||
contains a linkrev entry that can serve as a pointer to external | ||||
data. | ||||
The revision data itself is a linear collection of data chunks. | ||||
Each chunk represents a revision and is usually represented as a | ||||
delta against the previous chunk. To bound lookup time, runs of | ||||
deltas are limited to about 2 times the length of the original | ||||
version data. This makes retrieval of a version proportional to | ||||
its size, or O(1) relative to the number of revisions. | ||||
Both pieces of the revlog are written to in an append-only | ||||
fashion, which means we never need to rewrite a file to insert or | ||||
remove data, and can use some simple techniques to avoid the need | ||||
for locking while reading. | ||||
""" | ||||
Sune Foldager
|
r14251 | def __init__(self, opener, indexfile): | ||
mpm@selenic.com
|
r1083 | """ | ||
create a revlog object | ||||
opener is a function that abstracts the file opening operation | ||||
and can be used to implement COW semantics or the like. | ||||
""" | ||||
mpm@selenic.com
|
r0 | self.indexfile = indexfile | ||
Matt Mackall
|
r4257 | self.datafile = indexfile[:-2] + ".d" | ||
mpm@selenic.com
|
r0 | self.opener = opener | ||
Matt Mackall
|
r4984 | self._cache = None | ||
Wojciech Lopata
|
r19764 | self._basecache = None | ||
Matt Mackall
|
r8316 | self._chunkcache = (0, '') | ||
Brodie Rao
|
r20180 | self._chunkcachesize = 65536 | ||
Mateusz Kwapich
|
r23255 | self._maxchainlen = None | ||
Durham Goode
|
r26118 | self._aggressivemergedeltas = False | ||
Matt Mackall
|
r4985 | self.index = [] | ||
Matt Mackall
|
r13258 | self._pcache = {} | ||
Matt Mackall
|
r13275 | self._nodecache = {nullid: nullrev} | ||
self._nodepos = None | ||||
Matt Mackall
|
r4985 | |||
v = REVLOG_DEFAULT_VERSION | ||||
Augie Fackler
|
r14960 | opts = getattr(opener, 'options', None) | ||
if opts is not None: | ||||
if 'revlogv1' in opts: | ||||
if 'generaldelta' in opts: | ||||
Sune Foldager
|
r14333 | v |= REVLOGGENERALDELTA | ||
else: | ||||
v = 0 | ||||
Brodie Rao
|
r20180 | if 'chunkcachesize' in opts: | ||
self._chunkcachesize = opts['chunkcachesize'] | ||||
Mateusz Kwapich
|
r23255 | if 'maxchainlen' in opts: | ||
self._maxchainlen = opts['maxchainlen'] | ||||
Durham Goode
|
r26118 | if 'aggressivemergedeltas' in opts: | ||
self._aggressivemergedeltas = opts['aggressivemergedeltas'] | ||||
Brodie Rao
|
r20180 | |||
if self._chunkcachesize <= 0: | ||||
raise RevlogError(_('revlog chunk cache size %r is not greater ' | ||||
'than 0') % self._chunkcachesize) | ||||
elif self._chunkcachesize & (self._chunkcachesize - 1): | ||||
raise RevlogError(_('revlog chunk cache size %r is not a power ' | ||||
'of 2') % self._chunkcachesize) | ||||
Pradeepkumar Gayam
|
r11928 | |||
Gregory Szorc
|
r26241 | indexdata = '' | ||
Sune Foldager
|
r14334 | self._initempty = True | ||
mpm@selenic.com
|
r0 | try: | ||
Benoit Boissinot
|
r1784 | f = self.opener(self.indexfile) | ||
Gregory Szorc
|
r26241 | indexdata = f.read() | ||
Dan Villiom Podlaski Christiansen
|
r13400 | f.close() | ||
Gregory Szorc
|
r26241 | if len(indexdata) > 0: | ||
v = struct.unpack(versionformat, indexdata[:4])[0] | ||||
Sune Foldager
|
r14334 | self._initempty = False | ||
Gregory Szorc
|
r25660 | except IOError as inst: | ||
Bryan O'Sullivan
|
r1322 | if inst.errno != errno.ENOENT: | ||
raise | ||||
Matt Mackall
|
r4985 | |||
self.version = v | ||||
self._inline = v & REVLOGNGINLINEDATA | ||||
Sune Foldager
|
r14253 | self._generaldelta = v & REVLOGGENERALDELTA | ||
mason@suse.com
|
r2073 | flags = v & ~0xFFFF | ||
fmt = v & 0xFFFF | ||||
Matt Mackall
|
r4985 | if fmt == REVLOGV0 and flags: | ||
raise RevlogError(_("index %s unknown flags %#04x for format v0") | ||||
% (self.indexfile, flags >> 16)) | ||||
Vishakh H
|
r11746 | elif fmt == REVLOGNG and flags & ~REVLOGNG_FLAGS: | ||
Matt Mackall
|
r4985 | raise RevlogError(_("index %s unknown flags %#04x for revlogng") | ||
% (self.indexfile, flags >> 16)) | ||||
elif fmt > REVLOGNG: | ||||
Matt Mackall
|
r3743 | raise RevlogError(_("index %s unknown format %d") | ||
Thomas Arendsen Hein
|
r3680 | % (self.indexfile, fmt)) | ||
Matt Mackall
|
r4985 | |||
Matt Mackall
|
r4972 | self._io = revlogio() | ||
Matt Mackall
|
r4971 | if self.version == REVLOGV0: | ||
Matt Mackall
|
r4972 | self._io = revlogoldio() | ||
Benoit Boissinot
|
r13265 | try: | ||
Gregory Szorc
|
r26241 | d = self._io.parseindex(indexdata, self._inline) | ||
Benoit Boissinot
|
r13265 | except (ValueError, IndexError): | ||
raise RevlogError(_("index %s is corrupted") % (self.indexfile)) | ||||
Benoit Boissinot
|
r13268 | self.index, nodemap, self._chunkcache = d | ||
if nodemap is not None: | ||||
Matt Mackall
|
r13275 | self.nodemap = self._nodecache = nodemap | ||
Benoit Boissinot
|
r13265 | if not self._chunkcache: | ||
self._chunkclear() | ||||
Siddharth Agarwal
|
r23306 | # revnum -> (chain-length, sum-delta-length) | ||
self._chaininfocache = {} | ||||
mpm@selenic.com
|
r116 | |||
Matt Mackall
|
r4980 | def tip(self): | ||
return self.node(len(self.index) - 2) | ||||
Yuya Nishihara
|
r24030 | def __contains__(self, rev): | ||
return 0 <= rev < len(self) | ||||
Matt Mackall
|
r6750 | def __len__(self): | ||
Matt Mackall
|
r4980 | return len(self.index) - 1 | ||
Matt Mackall
|
r6750 | def __iter__(self): | ||
Durham Goode
|
r17951 | return iter(xrange(len(self))) | ||
Pierre-Yves David
|
r17672 | def revs(self, start=0, stop=None): | ||
"""iterate over all rev in this revlog (from start to stop)""" | ||||
Pierre-Yves David
|
r17975 | step = 1 | ||
if stop is not None: | ||||
if start > stop: | ||||
step = -1 | ||||
stop += step | ||||
Pierre-Yves David
|
r17672 | else: | ||
Pierre-Yves David
|
r17975 | stop = len(self) | ||
return xrange(start, stop, step) | ||||
Matt Mackall
|
r13275 | |||
@util.propertycache | ||||
def nodemap(self): | ||||
Alexander Solovyov
|
r14064 | self.rev(self.node(0)) | ||
Matt Mackall
|
r13275 | return self._nodecache | ||
Matt Mackall
|
r13259 | |||
Matt Mackall
|
r16374 | def hasnode(self, node): | ||
try: | ||||
self.rev(node) | ||||
return True | ||||
except KeyError: | ||||
return False | ||||
Bryan O'Sullivan
|
r16414 | def clearcaches(self): | ||
try: | ||||
self._nodecache.clearcaches() | ||||
except AttributeError: | ||||
self._nodecache = {nullid: nullrev} | ||||
self._nodepos = None | ||||
Matt Mackall
|
r13259 | def rev(self, node): | ||
Matt Mackall
|
r13275 | try: | ||
return self._nodecache[node] | ||||
Matt Mackall
|
r22282 | except TypeError: | ||
raise | ||||
Bryan O'Sullivan
|
r16414 | except RevlogError: | ||
# parsers.c radix tree lookup failed | ||||
raise LookupError(node, self.indexfile, _('no node')) | ||||
Matt Mackall
|
r13275 | except KeyError: | ||
Bryan O'Sullivan
|
r16414 | # pure python cache lookup failed | ||
Matt Mackall
|
r13275 | n = self._nodecache | ||
i = self.index | ||||
p = self._nodepos | ||||
if p is None: | ||||
p = len(i) - 2 | ||||
for r in xrange(p, -1, -1): | ||||
v = i[r][7] | ||||
n[v] = r | ||||
if v == node: | ||||
self._nodepos = r - 1 | ||||
return r | ||||
raise LookupError(node, self.indexfile, _('no node')) | ||||
Matt Mackall
|
r4980 | def node(self, rev): | ||
return self.index[rev][7] | ||||
Matt Mackall
|
r7361 | def linkrev(self, rev): | ||
return self.index[rev][4] | ||||
mpm@selenic.com
|
r2 | def parents(self, node): | ||
Matt Mackall
|
r7363 | i = self.index | ||
d = i[self.rev(node)] | ||||
return i[d[5]][7], i[d[6]][7] # map revisions to nodes inline | ||||
Alexis S. L. Carvalho
|
r2489 | def parentrevs(self, rev): | ||
Matt Mackall
|
r4979 | return self.index[rev][5:7] | ||
mason@suse.com
|
r2072 | def start(self, rev): | ||
Matt Mackall
|
r5006 | return int(self.index[rev][0] >> 16) | ||
Matt Mackall
|
r4980 | def end(self, rev): | ||
return self.start(rev) + self.length(rev) | ||||
def length(self, rev): | ||||
return self.index[rev][1] | ||||
Sune Foldager
|
r14252 | def chainbase(self, rev): | ||
index = self.index | ||||
base = index[rev][3] | ||||
while base != rev: | ||||
rev = base | ||||
base = index[rev][3] | ||||
return base | ||||
Mateusz Kwapich
|
r23254 | def chainlen(self, rev): | ||
Siddharth Agarwal
|
r23286 | return self._chaininfo(rev)[0] | ||
Siddharth Agarwal
|
r23306 | |||
Siddharth Agarwal
|
r23286 | def _chaininfo(self, rev): | ||
Siddharth Agarwal
|
r23306 | chaininfocache = self._chaininfocache | ||
if rev in chaininfocache: | ||||
return chaininfocache[rev] | ||||
Mateusz Kwapich
|
r23254 | index = self.index | ||
generaldelta = self._generaldelta | ||||
iterrev = rev | ||||
e = index[iterrev] | ||||
clen = 0 | ||||
Siddharth Agarwal
|
r23286 | compresseddeltalen = 0 | ||
Mateusz Kwapich
|
r23254 | while iterrev != e[3]: | ||
clen += 1 | ||||
Siddharth Agarwal
|
r23286 | compresseddeltalen += e[1] | ||
Mateusz Kwapich
|
r23254 | if generaldelta: | ||
iterrev = e[3] | ||||
else: | ||||
iterrev -= 1 | ||||
Siddharth Agarwal
|
r23306 | if iterrev in chaininfocache: | ||
t = chaininfocache[iterrev] | ||||
clen += t[0] | ||||
compresseddeltalen += t[1] | ||||
break | ||||
Mateusz Kwapich
|
r23254 | e = index[iterrev] | ||
Siddharth Agarwal
|
r23306 | else: | ||
# Add text length of base since decompressing that also takes | ||||
# work. For cache hits the length is already included. | ||||
compresseddeltalen += e[1] | ||||
r = (clen, compresseddeltalen) | ||||
chaininfocache[rev] = r | ||||
return r | ||||
Pradeepkumar Gayam
|
r11693 | def flags(self, rev): | ||
return self.index[rev][0] & 0xFFFF | ||||
Benoit Boissinot
|
r12024 | def rawsize(self, rev): | ||
mason@suse.com
|
r2078 | """return the length of the uncompressed text for a given revision""" | ||
Matt Mackall
|
r4977 | l = self.index[rev][2] | ||
mason@suse.com
|
r2078 | if l >= 0: | ||
return l | ||||
t = self.revision(self.node(rev)) | ||||
return len(t) | ||||
Benoit Boissinot
|
r12024 | size = rawsize | ||
mason@suse.com
|
r2078 | |||
Siddharth Agarwal
|
r18081 | def ancestors(self, revs, stoprev=0, inclusive=False): | ||
Greg Ward
|
r10047 | """Generate the ancestors of 'revs' in reverse topological order. | ||
Joshua Redstone
|
r16868 | Does not generate revs lower than stoprev. | ||
Greg Ward
|
r10047 | |||
Siddharth Agarwal
|
r18090 | See the documentation for ancestor.lazyancestors for more details.""" | ||
Siddharth Agarwal
|
r18081 | |||
Siddharth Agarwal
|
r23328 | return ancestor.lazyancestors(self.parentrevs, revs, stoprev=stoprev, | ||
Siddharth Agarwal
|
r18090 | inclusive=inclusive) | ||
Stefano Tortarolo
|
r6872 | |||
Bryan O'Sullivan
|
r16867 | def descendants(self, revs): | ||
Greg Ward
|
r10047 | """Generate the descendants of 'revs' in revision order. | ||
Yield a sequence of revision numbers starting with a child of | ||||
some rev in revs, i.e., each revision is *not* considered a | ||||
descendant of itself. Results are ordered by revision number (a | ||||
topological sort).""" | ||||
Nicolas Dumazet
|
r12950 | first = min(revs) | ||
if first == nullrev: | ||||
for i in self: | ||||
yield i | ||||
return | ||||
Martin Geisler
|
r8150 | seen = set(revs) | ||
Pierre-Yves David
|
r17672 | for i in self.revs(start=first + 1): | ||
Stefano Tortarolo
|
r6872 | for x in self.parentrevs(i): | ||
if x != nullrev and x in seen: | ||||
seen.add(i) | ||||
yield i | ||||
break | ||||
Peter Arrenbrecht
|
r13741 | def findcommonmissing(self, common=None, heads=None): | ||
"""Return a tuple of the ancestors of common and the ancestors of heads | ||||
Pierre-Yves David
|
r15835 | that are not ancestors of common. In revset terminology, we return the | ||
tuple: | ||||
Greg Ward
|
r10047 | |||
Pierre-Yves David
|
r15835 | ::common, (::heads) - (::common) | ||
Benoit Boissinot
|
r7233 | |||
Greg Ward
|
r10047 | The list is sorted by revision number, meaning it is | ||
topologically sorted. | ||||
'heads' and 'common' are both lists of node IDs. If heads is | ||||
not supplied, uses all of the revlog's heads. If common is not | ||||
supplied, uses nullid.""" | ||||
Benoit Boissinot
|
r7233 | if common is None: | ||
common = [nullid] | ||||
if heads is None: | ||||
heads = self.heads() | ||||
common = [self.rev(n) for n in common] | ||||
heads = [self.rev(n) for n in heads] | ||||
# we want the ancestors, but inclusive | ||||
Durham Goode
|
r20073 | class lazyset(object): | ||
def __init__(self, lazyvalues): | ||||
self.addedvalues = set() | ||||
self.lazyvalues = lazyvalues | ||||
def __contains__(self, value): | ||||
return value in self.addedvalues or value in self.lazyvalues | ||||
def __iter__(self): | ||||
added = self.addedvalues | ||||
for r in added: | ||||
yield r | ||||
for r in self.lazyvalues: | ||||
if not r in added: | ||||
yield r | ||||
def add(self, value): | ||||
self.addedvalues.add(value) | ||||
def update(self, values): | ||||
self.addedvalues.update(values) | ||||
has = lazyset(self.ancestors(common)) | ||||
Martin Geisler
|
r8152 | has.add(nullrev) | ||
has.update(common) | ||||
Benoit Boissinot
|
r7233 | |||
# take all ancestors from heads that aren't in has | ||||
Benoit Boissinot
|
r8453 | missing = set() | ||
Martin von Zweigbergk
|
r25113 | visit = collections.deque(r for r in heads if r not in has) | ||
Benoit Boissinot
|
r7233 | while visit: | ||
Bryan O'Sullivan
|
r16803 | r = visit.popleft() | ||
Benoit Boissinot
|
r7233 | if r in missing: | ||
continue | ||||
else: | ||||
Benoit Boissinot
|
r8453 | missing.add(r) | ||
Benoit Boissinot
|
r7233 | for p in self.parentrevs(r): | ||
if p not in has: | ||||
visit.append(p) | ||||
Benoit Boissinot
|
r8453 | missing = list(missing) | ||
Benoit Boissinot
|
r7233 | missing.sort() | ||
Peter Arrenbrecht
|
r13741 | return has, [self.node(r) for r in missing] | ||
Siddharth Agarwal
|
r23337 | def incrementalmissingrevs(self, common=None): | ||
"""Return an object that can be used to incrementally compute the | ||||
revision numbers of the ancestors of arbitrary sets that are not | ||||
ancestors of common. This is an ancestor.incrementalmissingancestors | ||||
object. | ||||
'common' is a list of revision numbers. If common is not supplied, uses | ||||
nullrev. | ||||
""" | ||||
if common is None: | ||||
common = [nullrev] | ||||
return ancestor.incrementalmissingancestors(self.parentrevs, common) | ||||
Siddharth Agarwal
|
r17972 | def findmissingrevs(self, common=None, heads=None): | ||
"""Return the revision numbers of the ancestors of heads that | ||||
are not ancestors of common. | ||||
More specifically, return a list of revision numbers corresponding to | ||||
nodes N such that every N satisfies the following constraints: | ||||
1. N is an ancestor of some node in 'heads' | ||||
2. N is not an ancestor of any node in 'common' | ||||
The list is sorted by revision number, meaning it is | ||||
topologically sorted. | ||||
'heads' and 'common' are both lists of revision numbers. If heads is | ||||
not supplied, uses all of the revlog's heads. If common is not | ||||
supplied, uses nullid.""" | ||||
if common is None: | ||||
common = [nullrev] | ||||
if heads is None: | ||||
heads = self.headrevs() | ||||
Siddharth Agarwal
|
r23338 | inc = self.incrementalmissingrevs(common=common) | ||
return inc.missingancestors(heads) | ||||
Siddharth Agarwal
|
r17972 | |||
Peter Arrenbrecht
|
r13741 | def findmissing(self, common=None, heads=None): | ||
"""Return the ancestors of heads that are not ancestors of common. | ||||
More specifically, return a list of nodes N such that every N | ||||
satisfies the following constraints: | ||||
1. N is an ancestor of some node in 'heads' | ||||
2. N is not an ancestor of any node in 'common' | ||||
The list is sorted by revision number, meaning it is | ||||
topologically sorted. | ||||
'heads' and 'common' are both lists of node IDs. If heads is | ||||
not supplied, uses all of the revlog's heads. If common is not | ||||
supplied, uses nullid.""" | ||||
Siddharth Agarwal
|
r17971 | if common is None: | ||
common = [nullid] | ||||
if heads is None: | ||||
heads = self.heads() | ||||
common = [self.rev(n) for n in common] | ||||
heads = [self.rev(n) for n in heads] | ||||
Siddharth Agarwal
|
r23338 | inc = self.incrementalmissingrevs(common=common) | ||
return [self.node(r) for r in inc.missingancestors(heads)] | ||||
Benoit Boissinot
|
r7233 | |||
Eric Hopper
|
r1457 | def nodesbetween(self, roots=None, heads=None): | ||
Greg Ward
|
r10047 | """Return a topological path from 'roots' to 'heads'. | ||
Return a tuple (nodes, outroots, outheads) where 'nodes' is a | ||||
topologically sorted list of all nodes N that satisfy both of | ||||
these constraints: | ||||
1. N is a descendant of some node in 'roots' | ||||
2. N is an ancestor of some node in 'heads' | ||||
Eric Hopper
|
r1457 | |||
Greg Ward
|
r10047 | Every node is considered to be both a descendant and an ancestor | ||
of itself, so every reachable node in 'roots' and 'heads' will be | ||||
included in 'nodes'. | ||||
Eric Hopper
|
r1457 | |||
Greg Ward
|
r10047 | 'outroots' is the list of reachable nodes in 'roots', i.e., the | ||
subset of 'roots' that is returned in 'nodes'. Likewise, | ||||
'outheads' is the subset of 'heads' that is also in 'nodes'. | ||||
'roots' and 'heads' are both lists of node IDs. If 'roots' is | ||||
unspecified, uses nullid as the only root. If 'heads' is | ||||
unspecified, uses list of all of the revlog's heads.""" | ||||
Eric Hopper
|
r1463 | nonodes = ([], [], []) | ||
Eric Hopper
|
r1457 | if roots is not None: | ||
roots = list(roots) | ||||
Eric Hopper
|
r1463 | if not roots: | ||
return nonodes | ||||
Eric Hopper
|
r1457 | lowestrev = min([self.rev(n) for n in roots]) | ||
else: | ||||
Matt Mackall
|
r14549 | roots = [nullid] # Everybody's a descendant of nullid | ||
Thomas Arendsen Hein
|
r3578 | lowestrev = nullrev | ||
if (lowestrev == nullrev) and (heads is None): | ||||
Eric Hopper
|
r1457 | # We want _all_ the nodes! | ||
Matt Mackall
|
r6750 | return ([self.node(r) for r in self], [nullid], list(self.heads())) | ||
Eric Hopper
|
r1457 | if heads is None: | ||
# All nodes are ancestors, so the latest ancestor is the last | ||||
# node. | ||||
Matt Mackall
|
r6750 | highestrev = len(self) - 1 | ||
Eric Hopper
|
r1457 | # Set ancestors to None to signal that every node is an ancestor. | ||
ancestors = None | ||||
# Set heads to an empty dictionary for later discovery of heads | ||||
heads = {} | ||||
else: | ||||
Eric Hopper
|
r1463 | heads = list(heads) | ||
if not heads: | ||||
return nonodes | ||||
Benoit Boissinot
|
r8464 | ancestors = set() | ||
Eric Hopper
|
r1457 | # Turn heads into a dictionary so we can remove 'fake' heads. | ||
# Also, later we will be using it to filter out the heads we can't | ||||
# find from roots. | ||||
Martin Geisler
|
r14219 | heads = dict.fromkeys(heads, False) | ||
Benoit Boissinot
|
r3360 | # Start at the top and keep marking parents until we're done. | ||
Martin Geisler
|
r8163 | nodestotag = set(heads) | ||
Eric Hopper
|
r1457 | # Remember where the top was so we can use it as a limit later. | ||
highestrev = max([self.rev(n) for n in nodestotag]) | ||||
while nodestotag: | ||||
# grab a node to tag | ||||
n = nodestotag.pop() | ||||
# Never tag nullid | ||||
if n == nullid: | ||||
continue | ||||
# A node's revision number represents its place in a | ||||
# topologically sorted list of nodes. | ||||
r = self.rev(n) | ||||
if r >= lowestrev: | ||||
if n not in ancestors: | ||||
Matt Mackall
|
r14549 | # If we are possibly a descendant of one of the roots | ||
Eric Hopper
|
r1457 | # and we haven't already been marked as an ancestor | ||
Benoit Boissinot
|
r8464 | ancestors.add(n) # Mark as ancestor | ||
Eric Hopper
|
r1457 | # Add non-nullid parents to list of nodes to tag. | ||
Martin Geisler
|
r8153 | nodestotag.update([p for p in self.parents(n) if | ||
Eric Hopper
|
r1457 | p != nullid]) | ||
elif n in heads: # We've seen it before, is it a fake head? | ||||
# So it is, real heads should not be the ancestors of | ||||
# any other heads. | ||||
heads.pop(n) | ||||
Eric Hopper
|
r1459 | if not ancestors: | ||
Eric Hopper
|
r1463 | return nonodes | ||
Eric Hopper
|
r1457 | # Now that we have our set of ancestors, we want to remove any | ||
# roots that are not ancestors. | ||||
# If one of the roots was nullid, everything is included anyway. | ||||
Thomas Arendsen Hein
|
r3578 | if lowestrev > nullrev: | ||
Eric Hopper
|
r1457 | # But, since we weren't, let's recompute the lowest rev to not | ||
# include roots that aren't ancestors. | ||||
# Filter out roots that aren't ancestors of heads | ||||
roots = [n for n in roots if n in ancestors] | ||||
# Recompute the lowest revision | ||||
if roots: | ||||
lowestrev = min([self.rev(n) for n in roots]) | ||||
else: | ||||
# No more roots? Return empty list | ||||
Eric Hopper
|
r1463 | return nonodes | ||
Eric Hopper
|
r1457 | else: | ||
# We are descending from nullid, and don't need to care about | ||||
# any other roots. | ||||
Thomas Arendsen Hein
|
r3578 | lowestrev = nullrev | ||
Eric Hopper
|
r1457 | roots = [nullid] | ||
Martin Geisler
|
r8152 | # Transform our roots list into a set. | ||
Matt Mackall
|
r14549 | descendants = set(roots) | ||
Eric Hopper
|
r1457 | # Also, keep the original roots so we can filter out roots that aren't | ||
# 'real' roots (i.e. are descended from other roots). | ||||
Matt Mackall
|
r14549 | roots = descendants.copy() | ||
Eric Hopper
|
r1457 | # Our topologically sorted list of output nodes. | ||
orderedout = [] | ||||
# Don't start at nullid since we don't want nullid in our output list, | ||||
timeless@mozdev.org
|
r17483 | # and if nullid shows up in descendants, empty parents will look like | ||
Matt Mackall
|
r14549 | # they're descendants. | ||
Pierre-Yves David
|
r17672 | for r in self.revs(start=max(lowestrev, 0), stop=highestrev + 1): | ||
Eric Hopper
|
r1457 | n = self.node(r) | ||
Matt Mackall
|
r14549 | isdescendant = False | ||
if lowestrev == nullrev: # Everybody is a descendant of nullid | ||||
isdescendant = True | ||||
elif n in descendants: | ||||
# n is already a descendant | ||||
isdescendant = True | ||||
Eric Hopper
|
r1457 | # This check only needs to be done here because all the roots | ||
Matt Mackall
|
r14549 | # will start being marked is descendants before the loop. | ||
Eric Hopper
|
r1457 | if n in roots: | ||
# If n was a root, check if it's a 'real' root. | ||||
p = tuple(self.parents(n)) | ||||
Matt Mackall
|
r14549 | # If any of its parents are descendants, it's not a root. | ||
if (p[0] in descendants) or (p[1] in descendants): | ||||
Martin Geisler
|
r8152 | roots.remove(n) | ||
Eric Hopper
|
r1457 | else: | ||
p = tuple(self.parents(n)) | ||||
Matt Mackall
|
r14549 | # A node is a descendant if either of its parents are | ||
# descendants. (We seeded the dependents list with the roots | ||||
Eric Hopper
|
r1457 | # up there, remember?) | ||
Matt Mackall
|
r14549 | if (p[0] in descendants) or (p[1] in descendants): | ||
descendants.add(n) | ||||
isdescendant = True | ||||
if isdescendant and ((ancestors is None) or (n in ancestors)): | ||||
# Only include nodes that are both descendants and ancestors. | ||||
Eric Hopper
|
r1457 | orderedout.append(n) | ||
if (ancestors is not None) and (n in heads): | ||||
# We're trying to figure out which heads are reachable | ||||
# from roots. | ||||
# Mark this head as having been reached | ||||
Martin Geisler
|
r14219 | heads[n] = True | ||
Eric Hopper
|
r1457 | elif ancestors is None: | ||
# Otherwise, we're trying to discover the heads. | ||||
# Assume this is a head because if it isn't, the next step | ||||
# will eventually remove it. | ||||
Martin Geisler
|
r14219 | heads[n] = True | ||
Eric Hopper
|
r1457 | # But, obviously its parents aren't. | ||
for p in self.parents(n): | ||||
heads.pop(p, None) | ||||
Martin Geisler
|
r14219 | heads = [n for n, flag in heads.iteritems() if flag] | ||
Martin Geisler
|
r8152 | roots = list(roots) | ||
Eric Hopper
|
r1457 | assert orderedout | ||
assert roots | ||||
assert heads | ||||
return (orderedout, roots, heads) | ||||
Peter Arrenbrecht
|
r14164 | def headrevs(self): | ||
Bryan O'Sullivan
|
r16786 | try: | ||
return self.index.headrevs() | ||||
except AttributeError: | ||||
Pierre-Yves David
|
r17674 | return self._headrevs() | ||
Laurent Charignon
|
r24444 | def computephases(self, roots): | ||
Laurent Charignon
|
r25361 | return self.index.computephasesmapsets(roots) | ||
Laurent Charignon
|
r24444 | |||
Pierre-Yves David
|
r17674 | def _headrevs(self): | ||
Peter Arrenbrecht
|
r14164 | count = len(self) | ||
if not count: | ||||
return [nullrev] | ||||
Pierre-Yves David
|
r17673 | # we won't iter over filtered rev so nobody is a head at start | ||
ishead = [0] * (count + 1) | ||||
Peter Arrenbrecht
|
r14164 | index = self.index | ||
Pierre-Yves David
|
r17672 | for r in self: | ||
Pierre-Yves David
|
r17673 | ishead[r] = 1 # I may be an head | ||
Peter Arrenbrecht
|
r14164 | e = index[r] | ||
Pierre-Yves David
|
r17673 | ishead[e[5]] = ishead[e[6]] = 0 # my parent are not | ||
return [r for r, val in enumerate(ishead) if val] | ||||
Peter Arrenbrecht
|
r14164 | |||
Benoit Boissinot
|
r3923 | def heads(self, start=None, stop=None): | ||
Benoit Boissinot
|
r1550 | """return the list of all nodes that have no children | ||
Thomas Arendsen Hein
|
r1551 | |||
if start is specified, only heads that are descendants of | ||||
start will be returned | ||||
Benoit Boissinot
|
r3923 | if stop is specified, it will consider all the revs from stop | ||
as if they had no children | ||||
Thomas Arendsen Hein
|
r1551 | """ | ||
Matt Mackall
|
r4991 | if start is None and stop is None: | ||
Peter Arrenbrecht
|
r14164 | if not len(self): | ||
Matt Mackall
|
r4991 | return [nullid] | ||
Peter Arrenbrecht
|
r14164 | return [self.node(r) for r in self.headrevs()] | ||
Matt Mackall
|
r4991 | |||
Thomas Arendsen Hein
|
r1551 | if start is None: | ||
start = nullid | ||||
Benoit Boissinot
|
r3923 | if stop is None: | ||
stop = [] | ||||
Martin Geisler
|
r8152 | stoprevs = set([self.rev(n) for n in stop]) | ||
Benoit Boissinot
|
r1550 | startrev = self.rev(start) | ||
Benoit Boissinot
|
r8464 | reachable = set((startrev,)) | ||
heads = set((startrev,)) | ||||
mpm@selenic.com
|
r1083 | |||
Alexis S. L. Carvalho
|
r2490 | parentrevs = self.parentrevs | ||
Pierre-Yves David
|
r17672 | for r in self.revs(start=startrev + 1): | ||
Alexis S. L. Carvalho
|
r2490 | for p in parentrevs(r): | ||
if p in reachable: | ||||
Benoit Boissinot
|
r3923 | if r not in stoprevs: | ||
Benoit Boissinot
|
r8464 | reachable.add(r) | ||
heads.add(r) | ||||
Benoit Boissinot
|
r3923 | if p in heads and p not in stoprevs: | ||
Benoit Boissinot
|
r8464 | heads.remove(p) | ||
Benoit Boissinot
|
r3923 | |||
Alexis S. L. Carvalho
|
r2490 | return [self.node(r) for r in heads] | ||
mpm@selenic.com
|
r370 | |||
def children(self, node): | ||||
mpm@selenic.com
|
r1083 | """find the children of a given node""" | ||
mpm@selenic.com
|
r370 | c = [] | ||
p = self.rev(node) | ||||
Pierre-Yves David
|
r17672 | for r in self.revs(start=p + 1): | ||
Thomas Arendsen Hein
|
r4746 | prevs = [pr for pr in self.parentrevs(r) if pr != nullrev] | ||
if prevs: | ||||
for pr in prevs: | ||||
if pr == p: | ||||
c.append(self.node(r)) | ||||
elif p == nullrev: | ||||
c.append(self.node(r)) | ||||
mpm@selenic.com
|
r370 | return c | ||
mpm@selenic.com
|
r515 | |||
Benoit Boissinot
|
r10897 | def descendant(self, start, end): | ||
Nicolas Dumazet
|
r12949 | if start == nullrev: | ||
return True | ||||
Bryan O'Sullivan
|
r16867 | for i in self.descendants([start]): | ||
Benoit Boissinot
|
r10897 | if i == end: | ||
return True | ||||
elif i > end: | ||||
break | ||||
return False | ||||
Mads Kiilerich
|
r21104 | def commonancestorsheads(self, a, b): | ||
"""calculate all the heads of the common ancestors of nodes a and b""" | ||||
a, b = self.rev(a), self.rev(b) | ||||
try: | ||||
ancs = self.index.commonancestorsheads(a, b) | ||||
except (AttributeError, OverflowError): # C implementation failed | ||||
ancs = ancestor.commonancestorsheads(self.parentrevs, a, b) | ||||
return map(self.node, ancs) | ||||
Mads Kiilerich
|
r22381 | def isancestor(self, a, b): | ||
"""return True if node a is an ancestor of node b | ||||
The implementation of this is trivial but the use of | ||||
commonancestorsheads is not.""" | ||||
return a in self.commonancestorsheads(a, b) | ||||
Mads Kiilerich
|
r21107 | def ancestor(self, a, b): | ||
Mads Kiilerich
|
r22389 | """calculate the "best" common ancestor of nodes a and b""" | ||
Mads Kiilerich
|
r21107 | |||
Benoit Boissinot
|
r10897 | a, b = self.rev(a), self.rev(b) | ||
Bryan O'Sullivan
|
r18988 | try: | ||
ancs = self.index.ancestors(a, b) | ||||
Mads Kiilerich
|
r21107 | except (AttributeError, OverflowError): | ||
Bryan O'Sullivan
|
r18988 | ancs = ancestor.ancestors(self.parentrevs, a, b) | ||
Bryan O'Sullivan
|
r18987 | if ancs: | ||
# choose a consistent winner when there's a tie | ||||
Mads Kiilerich
|
r21107 | return min(map(self.node, ancs)) | ||
Bryan O'Sullivan
|
r18987 | return nullid | ||
Benoit Boissinot
|
r10897 | |||
Matt Mackall
|
r3453 | def _match(self, id): | ||
Matt Mackall
|
r16762 | if isinstance(id, int): | ||
Benoit Boissinot
|
r3156 | # rev | ||
Benoit Boissinot
|
r2641 | return self.node(id) | ||
Matt Mackall
|
r3438 | if len(id) == 20: | ||
# possibly a binary node | ||||
# odds of a binary node being all hex in ASCII are 1 in 10**25 | ||||
try: | ||||
node = id | ||||
Peter Arrenbrecht
|
r7874 | self.rev(node) # quick search the index | ||
Matt Mackall
|
r3438 | return node | ||
Brendan Cully
|
r3930 | except LookupError: | ||
Matt Mackall
|
r3438 | pass # may be partial hex id | ||
mpm@selenic.com
|
r36 | try: | ||
Benoit Boissinot
|
r3156 | # str(rev) | ||
mpm@selenic.com
|
r36 | rev = int(id) | ||
Matt Mackall
|
r4980 | if str(rev) != id: | ||
raise ValueError | ||||
if rev < 0: | ||||
Matt Mackall
|
r6750 | rev = len(self) + rev | ||
if rev < 0 or rev >= len(self): | ||||
Matt Mackall
|
r4980 | raise ValueError | ||
mpm@selenic.com
|
r36 | return self.node(rev) | ||
mpm@selenic.com
|
r469 | except (ValueError, OverflowError): | ||
Benoit Boissinot
|
r3156 | pass | ||
Matt Mackall
|
r3453 | if len(id) == 40: | ||
try: | ||||
Matt Mackall
|
r3438 | # a full hex nodeid? | ||
node = bin(id) | ||||
Peter Arrenbrecht
|
r7874 | self.rev(node) | ||
Benoit Boissinot
|
r3157 | return node | ||
Sune Foldager
|
r7062 | except (TypeError, LookupError): | ||
Matt Mackall
|
r3453 | pass | ||
def _partialmatch(self, id): | ||||
Bryan O'Sullivan
|
r16665 | try: | ||
Matt Mackall
|
r19471 | n = self.index.partialmatch(id) | ||
if n and self.hasnode(n): | ||||
return n | ||||
return None | ||||
Bryan O'Sullivan
|
r16665 | except RevlogError: | ||
# parsers.c radix tree lookup gave multiple matches | ||||
Matt Mackall
|
r19471 | # fall through to slow path that filters hidden revisions | ||
pass | ||||
Bryan O'Sullivan
|
r16665 | except (AttributeError, ValueError): | ||
# we are pure python, or key was too short to search radix tree | ||||
pass | ||||
Matt Mackall
|
r13258 | if id in self._pcache: | ||
return self._pcache[id] | ||||
Matt Mackall
|
r3453 | if len(id) < 40: | ||
try: | ||||
Matt Mackall
|
r3438 | # hex(node)[:...] | ||
Alejandro Santos
|
r9029 | l = len(id) // 2 # grab an even number of digits | ||
Matt Mackall
|
r13259 | prefix = bin(id[:l * 2]) | ||
nl = [e[7] for e in self.index if e[7].startswith(prefix)] | ||||
Matt Mackall
|
r19471 | nl = [n for n in nl if hex(n).startswith(id) and | ||
self.hasnode(n)] | ||||
Matt Mackall
|
r7365 | if len(nl) > 0: | ||
if len(nl) == 1: | ||||
Matt Mackall
|
r13258 | self._pcache[id] = nl[0] | ||
Matt Mackall
|
r7365 | return nl[0] | ||
raise LookupError(id, self.indexfile, | ||||
_('ambiguous identifier')) | ||||
return None | ||||
Matt Mackall
|
r3453 | except TypeError: | ||
pass | ||||
def lookup(self, id): | ||||
"""locate a node based on: | ||||
- revision number or str(revision number) | ||||
- nodeid or subset of hex nodeid | ||||
""" | ||||
n = self._match(id) | ||||
if n is not None: | ||||
return n | ||||
n = self._partialmatch(id) | ||||
if n: | ||||
return n | ||||
mpm@selenic.com
|
r515 | |||
Matt Mackall
|
r6228 | raise LookupError(id, self.indexfile, _('no match found')) | ||
mpm@selenic.com
|
r36 | |||
Matt Mackall
|
r2890 | def cmp(self, node, text): | ||
Nicolas Dumazet
|
r11539 | """compare text with a given file revision | ||
returns True if text is different than what is stored. | ||||
""" | ||||
Matt Mackall
|
r2890 | p1, p2 = self.parents(node) | ||
return hash(text, p1, p2) != node | ||||
Matt Mackall
|
r8316 | def _addchunk(self, offset, data): | ||
o, d = self._chunkcache | ||||
# try to add to existing cache | ||||
Matt Mackall
|
r13253 | if o + len(d) == offset and len(d) + len(data) < _chunksize: | ||
Matt Mackall
|
r8316 | self._chunkcache = o, d + data | ||
else: | ||||
self._chunkcache = offset, data | ||||
Matt Mackall
|
r8650 | def _loadchunk(self, offset, length): | ||
if self._inline: | ||||
df = self.opener(self.indexfile) | ||||
else: | ||||
df = self.opener(self.datafile) | ||||
Matt Mackall
|
r8316 | |||
Brodie Rao
|
r20179 | # Cache data both forward and backward around the requested | ||
# data, in a fixed size window. This helps speed up operations | ||||
# involving reading the revlog backwards. | ||||
Brodie Rao
|
r20180 | cachesize = self._chunkcachesize | ||
realoffset = offset & ~(cachesize - 1) | ||||
reallength = (((offset + length + cachesize) & ~(cachesize - 1)) | ||||
- realoffset) | ||||
Brodie Rao
|
r20179 | df.seek(realoffset) | ||
d = df.read(reallength) | ||||
Matt Mackall
|
r15407 | df.close() | ||
Brodie Rao
|
r20179 | self._addchunk(realoffset, d) | ||
if offset != realoffset or reallength != length: | ||||
return util.buffer(d, offset - realoffset, length) | ||||
Matt Mackall
|
r8316 | return d | ||
Matt Mackall
|
r8650 | def _getchunk(self, offset, length): | ||
Matt Mackall
|
r8316 | o, d = self._chunkcache | ||
l = len(d) | ||||
# is it in the cache? | ||||
cachestart = offset - o | ||||
cacheend = cachestart + length | ||||
if cachestart >= 0 and cacheend <= l: | ||||
if cachestart == 0 and cacheend == l: | ||||
return d # avoid a copy | ||||
Bryan O'Sullivan
|
r16423 | return util.buffer(d, cachestart, cacheend - cachestart) | ||
Matt Mackall
|
r8316 | |||
Matt Mackall
|
r8650 | return self._loadchunk(offset, length) | ||
Matt Mackall
|
r8316 | |||
Matt Mackall
|
r8650 | def _chunkraw(self, startrev, endrev): | ||
Matt Mackall
|
r8318 | start = self.start(startrev) | ||
Siddharth Agarwal
|
r19714 | end = self.end(endrev) | ||
Matt Mackall
|
r8318 | if self._inline: | ||
start += (startrev + 1) * self._io.size | ||||
Siddharth Agarwal
|
r19714 | end += (endrev + 1) * self._io.size | ||
length = end - start | ||||
Matt Mackall
|
r8650 | return self._getchunk(start, length) | ||
Matt Mackall
|
r8318 | |||
Matt Mackall
|
r8650 | def _chunk(self, rev): | ||
return decompress(self._chunkraw(rev, rev)) | ||||
Siddharth Agarwal
|
r19713 | def _chunks(self, revs): | ||
'''faster version of [self._chunk(rev) for rev in revs] | ||||
Assumes that revs is in ascending order.''' | ||||
Siddharth Agarwal
|
r19716 | if not revs: | ||
return [] | ||||
Siddharth Agarwal
|
r19713 | start = self.start | ||
length = self.length | ||||
inline = self._inline | ||||
iosize = self._io.size | ||||
Siddharth Agarwal
|
r19715 | buffer = util.buffer | ||
Siddharth Agarwal
|
r19713 | |||
l = [] | ||||
ladd = l.append | ||||
Siddharth Agarwal
|
r19716 | # preload the cache | ||
Matt Mackall
|
r20957 | try: | ||
Matt Mackall
|
r21752 | while True: | ||
Matt Mackall
|
r21749 | # ensure that the cache doesn't change out from under us | ||
_cache = self._chunkcache | ||||
self._chunkraw(revs[0], revs[-1]) | ||||
if _cache == self._chunkcache: | ||||
break | ||||
offset, data = _cache | ||||
Matt Mackall
|
r20957 | except OverflowError: | ||
# issue4215 - we can't cache a run of chunks greater than | ||||
# 2G on Windows | ||||
return [self._chunk(rev) for rev in revs] | ||||
Siddharth Agarwal
|
r19715 | |||
Siddharth Agarwal
|
r19713 | for rev in revs: | ||
chunkstart = start(rev) | ||||
if inline: | ||||
chunkstart += (rev + 1) * iosize | ||||
chunklength = length(rev) | ||||
Siddharth Agarwal
|
r19715 | ladd(decompress(buffer(data, chunkstart - offset, chunklength))) | ||
Siddharth Agarwal
|
r19713 | |||
return l | ||||
Sune Foldager
|
r14075 | |||
Matt Mackall
|
r8650 | def _chunkclear(self): | ||
self._chunkcache = (0, '') | ||||
Benoit Boissinot
|
r1598 | |||
Pradeepkumar Gayam
|
r11929 | def deltaparent(self, rev): | ||
Sune Foldager
|
r14195 | """return deltaparent of the given revision""" | ||
Sune Foldager
|
r14253 | base = self.index[rev][3] | ||
if base == rev: | ||||
Sune Foldager
|
r14208 | return nullrev | ||
Sune Foldager
|
r14253 | elif self._generaldelta: | ||
return base | ||||
Sune Foldager
|
r14208 | else: | ||
return rev - 1 | ||||
Pradeepkumar Gayam
|
r11929 | |||
Benoit Boissinot
|
r1941 | def revdiff(self, rev1, rev2): | ||
"""return or calculate a delta between two revisions""" | ||||
Sune Foldager
|
r14208 | if rev1 != nullrev and self.deltaparent(rev2) == rev1: | ||
Bryan O'Sullivan
|
r16423 | return str(self._chunk(rev2)) | ||
Matt Mackall
|
r5005 | |||
Matt Mackall
|
r16424 | return mdiff.textdiff(self.revision(rev1), | ||
self.revision(rev2)) | ||||
mpm@selenic.com
|
r119 | |||
Matt Mackall
|
r16375 | def revision(self, nodeorrev): | ||
Patrick Mezard
|
r16435 | """return an uncompressed revision of a given node or revision | ||
number. | ||||
""" | ||||
Matt Mackall
|
r16375 | if isinstance(nodeorrev, int): | ||
rev = nodeorrev | ||||
node = self.node(rev) | ||||
else: | ||||
node = nodeorrev | ||||
rev = None | ||||
Benoit Boissinot
|
r11996 | cachedrev = None | ||
Matt Mackall
|
r4980 | if node == nullid: | ||
return "" | ||||
Gregory Szorc
|
r26242 | if self._cache: | ||
if self._cache[0] == node: | ||||
return self._cache[2] | ||||
cachedrev = self._cache[1] | ||||
mpm@selenic.com
|
r0 | |||
mpm@selenic.com
|
r1083 | # look up what we need to read | ||
mpm@selenic.com
|
r0 | text = None | ||
Matt Mackall
|
r16375 | if rev is None: | ||
rev = self.rev(node) | ||||
mpm@selenic.com
|
r0 | |||
Matt Mackall
|
r5004 | # check rev flags | ||
Vishakh H
|
r11745 | if self.flags(rev) & ~REVIDX_KNOWN_FLAGS: | ||
Matt Mackall
|
r5312 | raise RevlogError(_('incompatible revision flag %x') % | ||
Vishakh H
|
r11745 | (self.flags(rev) & ~REVIDX_KNOWN_FLAGS)) | ||
Matt Mackall
|
r5004 | |||
Benoit Boissinot
|
r11995 | # build delta chain | ||
Benoit Boissinot
|
r11998 | chain = [] | ||
Sune Foldager
|
r14252 | index = self.index # for performance | ||
Sune Foldager
|
r14253 | generaldelta = self._generaldelta | ||
Benoit Boissinot
|
r11998 | iterrev = rev | ||
Sune Foldager
|
r14252 | e = index[iterrev] | ||
while iterrev != e[3] and iterrev != cachedrev: | ||||
Benoit Boissinot
|
r11998 | chain.append(iterrev) | ||
Sune Foldager
|
r14253 | if generaldelta: | ||
iterrev = e[3] | ||||
else: | ||||
iterrev -= 1 | ||||
Sune Foldager
|
r14252 | e = index[iterrev] | ||
Benoit Boissinot
|
r11995 | |||
Benoit Boissinot
|
r11998 | if iterrev == cachedrev: | ||
# cache hit | ||||
Gregory Szorc
|
r26242 | text = self._cache[2] | ||
Siddharth Agarwal
|
r19716 | else: | ||
chain.append(iterrev) | ||||
chain.reverse() | ||||
mpm@selenic.com
|
r0 | |||
Matt Mackall
|
r11754 | # drop cache to save memory | ||
self._cache = None | ||||
Siddharth Agarwal
|
r19716 | bins = self._chunks(chain) | ||
Matt Mackall
|
r8650 | if text is None: | ||
Siddharth Agarwal
|
r19716 | text = str(bins[0]) | ||
bins = bins[1:] | ||||
Matt Mackall
|
r8650 | |||
Matt Mackall
|
r4989 | text = mdiff.patches(text, bins) | ||
Matt Mackall
|
r13239 | |||
Matt Mackall
|
r13276 | text = self._checkhash(text, node, rev) | ||
Matt Mackall
|
r13239 | |||
self._cache = (node, rev, text) | ||||
return text | ||||
Augie Fackler
|
r22785 | def hash(self, text, p1, p2): | ||
"""Compute a node hash. | ||||
Available as a function so that subclasses can replace the hash | ||||
as needed. | ||||
""" | ||||
return hash(text, p1, p2) | ||||
Matt Mackall
|
r13276 | def _checkhash(self, text, node, rev): | ||
Benoit Boissinot
|
r1598 | p1, p2 = self.parents(node) | ||
Wojciech Lopata
|
r19624 | self.checkhash(text, p1, p2, node, rev) | ||
return text | ||||
def checkhash(self, text, p1, p2, node, rev=None): | ||||
Augie Fackler
|
r22785 | if node != self.hash(text, p1, p2): | ||
Wojciech Lopata
|
r19624 | revornode = rev | ||
if revornode is None: | ||||
revornode = templatefilters.short(hex(node)) | ||||
raise RevlogError(_("integrity check failed on %s:%s") | ||||
% (self.indexfile, revornode)) | ||||
mpm@selenic.com
|
r0 | |||
mason@suse.com
|
r2075 | def checkinlinesize(self, tr, fp=None): | ||
Greg Ward
|
r10913 | if not self._inline or (self.start(-2) + self.length(-2)) < _maxinline: | ||
mason@suse.com
|
r2073 | return | ||
Matt Mackall
|
r8315 | |||
Chris Mason
|
r2084 | trinfo = tr.find(self.indexfile) | ||
Martin Geisler
|
r8527 | if trinfo is None: | ||
Thomas Arendsen Hein
|
r3680 | raise RevlogError(_("%s not found in the transaction") | ||
% self.indexfile) | ||||
Chris Mason
|
r2084 | |||
trindex = trinfo[2] | ||||
Mike Edgar
|
r24454 | if trindex is not None: | ||
dataoff = self.start(trindex) | ||||
else: | ||||
# revlog was stripped at start of transaction, use all leftover data | ||||
trindex = len(self) - 1 | ||||
dataoff = self.end(-2) | ||||
Chris Mason
|
r2084 | |||
tr.add(self.datafile, dataoff) | ||||
Matt Mackall
|
r8315 | |||
Matt Mackall
|
r8317 | if fp: | ||
fp.flush() | ||||
fp.close() | ||||
Matt Mackall
|
r8315 | |||
mason@suse.com
|
r2073 | df = self.opener(self.datafile, 'w') | ||
Benoit Boissinot
|
r6261 | try: | ||
Matt Mackall
|
r6750 | for r in self: | ||
Matt Mackall
|
r8650 | df.write(self._chunkraw(r, r)) | ||
Benoit Boissinot
|
r6261 | finally: | ||
df.close() | ||||
mason@suse.com
|
r2076 | fp = self.opener(self.indexfile, 'w', atomictemp=True) | ||
mason@suse.com
|
r2073 | self.version &= ~(REVLOGNGINLINEDATA) | ||
Matt Mackall
|
r4982 | self._inline = False | ||
Matt Mackall
|
r6750 | for i in self: | ||
Alexis S. L. Carvalho
|
r5338 | e = self._io.packentry(self.index[i], self.node, self.version, i) | ||
mason@suse.com
|
r2073 | fp.write(e) | ||
Greg Ward
|
r15057 | # if we don't call close, the temp file will never replace the | ||
mason@suse.com
|
r2076 | # real index | ||
Greg Ward
|
r15057 | fp.close() | ||
Chris Mason
|
r2084 | |||
Matt Mackall
|
r8650 | tr.replace(self.indexfile, trindex * self._io.size) | ||
self._chunkclear() | ||||
mason@suse.com
|
r2073 | |||
Wojciech Lopata
|
r19625 | def addrevision(self, text, transaction, link, p1, p2, cachedelta=None, | ||
node=None): | ||||
mpm@selenic.com
|
r1083 | """add a revision to the log | ||
text - the revision data to add | ||||
transaction - the transaction object used for rollback | ||||
link - the linkrev data to add | ||||
p1, p2 - the parent nodeids of the revision | ||||
Benoit Boissinot
|
r12012 | cachedelta - an optional precomputed delta | ||
Wojciech Lopata
|
r19625 | node - nodeid of revision; typically node is not specified, and it is | ||
computed by default as hash(text, p1, p2), however subclasses might | ||||
use different hashing method (and override checkhash() in such case) | ||||
mpm@selenic.com
|
r1083 | """ | ||
Durham Goode
|
r19326 | if link == nullrev: | ||
raise RevlogError(_("attempted to add linkrev -1 to %s") | ||||
% self.indexfile) | ||||
Matt Mackall
|
r25459 | |||
if len(text) > _maxentrysize: | ||||
raise RevlogError( | ||||
_("%s: size of %d bytes exceeds maximum revlog storage of 2GiB") | ||||
% (self.indexfile, len(text))) | ||||
Augie Fackler
|
r22785 | node = node or self.hash(text, p1, p2) | ||
Sune Foldager
|
r14196 | if node in self.nodemap: | ||
Benoit Boissinot
|
r12023 | return node | ||
Matt Mackall
|
r4981 | dfh = None | ||
Matt Mackall
|
r4982 | if not self._inline: | ||
Alexis S. L. Carvalho
|
r3390 | dfh = self.opener(self.datafile, "a") | ||
ifh = self.opener(self.indexfile, "a+") | ||||
Benoit Boissinot
|
r6261 | try: | ||
Benoit Boissinot
|
r12023 | return self._addrevision(node, text, transaction, link, p1, p2, | ||
Mike Edgar
|
r23856 | REVIDX_DEFAULT_FLAGS, cachedelta, ifh, dfh) | ||
Benoit Boissinot
|
r6261 | finally: | ||
if dfh: | ||||
dfh.close() | ||||
ifh.close() | ||||
Alexis S. L. Carvalho
|
r3390 | |||
Bryan O'Sullivan
|
r17128 | def compress(self, text): | ||
""" generate a possibly-compressed representation of text """ | ||||
if not text: | ||||
return ("", text) | ||||
l = len(text) | ||||
bin = None | ||||
if l < 44: | ||||
pass | ||||
elif l > 1000000: | ||||
# zlib makes an internal copy, thus doubling memory usage for | ||||
# large files, so lets do this in pieces | ||||
z = zlib.compressobj() | ||||
p = [] | ||||
pos = 0 | ||||
while pos < l: | ||||
pos2 = pos + 2**20 | ||||
p.append(z.compress(text[pos:pos2])) | ||||
pos = pos2 | ||||
p.append(z.flush()) | ||||
if sum(map(len, p)) < l: | ||||
bin = "".join(p) | ||||
else: | ||||
bin = _compress(text) | ||||
if bin is None or len(bin) > l: | ||||
if text[0] == '\0': | ||||
return ("", text) | ||||
return ('u', text) | ||||
return ("", bin) | ||||
Durham Goode
|
r26115 | def _isgooddelta(self, d, textlen): | ||
"""Returns True if the given delta is good. Good means that it is within | ||||
the disk span, disk size, and chain length bounds that we know to be | ||||
performant.""" | ||||
if d is None: | ||||
return False | ||||
# - 'dist' is the distance from the base revision -- bounding it limits | ||||
# the amount of I/O we need to do. | ||||
# - 'compresseddeltalen' is the sum of the total size of deltas we need | ||||
# to apply -- bounding it limits the amount of CPU we consume. | ||||
dist, l, data, base, chainbase, chainlen, compresseddeltalen = d | ||||
if (dist > textlen * 4 or l > textlen or | ||||
compresseddeltalen > textlen * 2 or | ||||
(self._maxchainlen and chainlen > self._maxchainlen)): | ||||
return False | ||||
return True | ||||
Mike Edgar
|
r23856 | def _addrevision(self, node, text, transaction, link, p1, p2, flags, | ||
Gregory Szorc
|
r26243 | cachedelta, ifh, dfh, alwayscache=False): | ||
Sune Foldager
|
r14292 | """internal function to add revisions to the log | ||
Benoit Boissinot
|
r12623 | |||
Sune Foldager
|
r14292 | see addrevision for argument descriptions. | ||
invariants: | ||||
- text is optional (can be None); if not set, cachedelta must be set. | ||||
Mads Kiilerich
|
r17424 | if both are set, they must correspond to each other. | ||
Sune Foldager
|
r14292 | """ | ||
Matt Mackall
|
r12886 | btext = [text] | ||
def buildtext(): | ||||
if btext[0] is not None: | ||||
return btext[0] | ||||
Benoit Boissinot
|
r12623 | # flush any pending writes here so we can read it in revision | ||
if dfh: | ||||
dfh.flush() | ||||
ifh.flush() | ||||
Mike Edgar
|
r24122 | baserev = cachedelta[0] | ||
delta = cachedelta[1] | ||||
# special case deltas which replace entire base; no need to decode | ||||
# base revision. this neatly avoids censored bases, which throw when | ||||
# they're decoded. | ||||
hlen = struct.calcsize(">lll") | ||||
if delta[:hlen] == mdiff.replacediffheader(self.rawsize(baserev), | ||||
len(delta) - hlen): | ||||
btext[0] = delta[hlen:] | ||||
else: | ||||
basetext = self.revision(self.node(baserev)) | ||||
btext[0] = mdiff.patch(basetext, delta) | ||||
Mike Edgar
|
r22934 | try: | ||
self.checkhash(btext[0], p1, p2, node) | ||||
Mike Edgar
|
r23857 | if flags & REVIDX_ISCENSORED: | ||
raise RevlogError(_('node %s is not censored') % node) | ||||
Mike Edgar
|
r22934 | except CensoredNodeError: | ||
Mike Edgar
|
r23857 | # must pass the censored index flag to add censored revisions | ||
if not flags & REVIDX_ISCENSORED: | ||||
raise | ||||
Matt Mackall
|
r12886 | return btext[0] | ||
Benoit Boissinot
|
r12623 | |||
Matt Mackall
|
r12888 | def builddelta(rev): | ||
# can we use the cached delta? | ||||
if cachedelta and cachedelta[0] == rev: | ||||
delta = cachedelta[1] | ||||
else: | ||||
t = buildtext() | ||||
Mike Edgar
|
r24123 | if self.iscensored(rev): | ||
# deltas based on a censored revision must replace the | ||||
# full content in one patch, so delta works everywhere | ||||
header = mdiff.replacediffheader(self.rawsize(rev), len(t)) | ||||
delta = header + t | ||||
else: | ||||
ptext = self.revision(self.node(rev)) | ||||
delta = mdiff.textdiff(ptext, t) | ||||
Bryan O'Sullivan
|
r17128 | data = self.compress(delta) | ||
Matt Mackall
|
r12888 | l = len(data[1]) + len(data[0]) | ||
Sune Foldager
|
r14296 | if basecache[0] == rev: | ||
Sune Foldager
|
r14270 | chainbase = basecache[1] | ||
Sune Foldager
|
r14252 | else: | ||
Sune Foldager
|
r14270 | chainbase = self.chainbase(rev) | ||
Matt Mackall
|
r17150 | dist = l + offset - self.start(chainbase) | ||
Sune Foldager
|
r14270 | if self._generaldelta: | ||
base = rev | ||||
else: | ||||
base = chainbase | ||||
Siddharth Agarwal
|
r23287 | chainlen, compresseddeltalen = self._chaininfo(rev) | ||
chainlen += 1 | ||||
compresseddeltalen += l | ||||
return dist, l, data, base, chainbase, chainlen, compresseddeltalen | ||||
Matt Mackall
|
r12888 | |||
Matt Mackall
|
r6750 | curr = len(self) | ||
Matt Mackall
|
r4981 | prev = curr - 1 | ||
Sune Foldager
|
r14296 | base = chainbase = curr | ||
Mateusz Kwapich
|
r23255 | chainlen = None | ||
Matt Mackall
|
r4981 | offset = self.end(prev) | ||
Benoit Boissinot
|
r11962 | d = None | ||
Wojciech Lopata
|
r19764 | if self._basecache is None: | ||
self._basecache = (prev, self.chainbase(prev)) | ||||
Sune Foldager
|
r14296 | basecache = self._basecache | ||
Matt Mackall
|
r12889 | p1r, p2r = self.rev(p1), self.rev(p2) | ||
mpm@selenic.com
|
r0 | |||
Durham Goode
|
r26116 | # full versions are inserted when the needed deltas | ||
# become comparable to the uncompressed text | ||||
if text is None: | ||||
textlen = mdiff.patchedsize(self.rawsize(cachedelta[0]), | ||||
cachedelta[1]) | ||||
else: | ||||
textlen = len(text) | ||||
Benoit Boissinot
|
r11963 | # should we try to build a delta? | ||
Matt Mackall
|
r12890 | if prev != nullrev: | ||
Sune Foldager
|
r14270 | if self._generaldelta: | ||
Durham Goode
|
r26118 | if p2r != nullrev and self._aggressivemergedeltas: | ||
d = builddelta(p1r) | ||||
d2 = builddelta(p2r) | ||||
p1good = self._isgooddelta(d, textlen) | ||||
p2good = self._isgooddelta(d2, textlen) | ||||
if p1good and p2good: | ||||
# If both are good deltas, choose the smallest | ||||
if d2[1] < d[1]: | ||||
d = d2 | ||||
elif p2good: | ||||
# If only p2 is good, use it | ||||
d = d2 | ||||
elif p1good: | ||||
pass | ||||
else: | ||||
# Neither is good, try against prev to hopefully save us | ||||
# a fulltext. | ||||
d = builddelta(prev) | ||||
else: | ||||
# Pick whichever parent is closer to us (to minimize the | ||||
# chance of having to build a fulltext). Since | ||||
# nullrev == -1, any non-merge commit will always pick p1r. | ||||
drev = p2r if p2r > p1r else p1r | ||||
d = builddelta(drev) | ||||
# If the chosen delta will result in us making a full text, | ||||
# give it one last try against prev. | ||||
if drev != prev and not self._isgooddelta(d, textlen): | ||||
d = builddelta(prev) | ||||
Sune Foldager
|
r14270 | else: | ||
d = builddelta(prev) | ||||
Siddharth Agarwal
|
r23287 | dist, l, data, base, chainbase, chainlen, compresseddeltalen = d | ||
mpm@selenic.com
|
r0 | |||
Durham Goode
|
r26115 | if not self._isgooddelta(d, textlen): | ||
Matt Mackall
|
r12886 | text = buildtext() | ||
Bryan O'Sullivan
|
r17128 | data = self.compress(text) | ||
mason@suse.com
|
r1533 | l = len(data[1]) + len(data[0]) | ||
Sune Foldager
|
r14296 | base = chainbase = curr | ||
mpm@selenic.com
|
r0 | |||
Benoit Boissinot
|
r12623 | e = (offset_type(offset, flags), l, textlen, | ||
Matt Mackall
|
r12889 | base, link, p1r, p2r, node) | ||
Matt Mackall
|
r4979 | self.index.insert(-1, e) | ||
Matt Mackall
|
r4981 | self.nodemap[node] = curr | ||
Matt Mackall
|
r4977 | |||
Alexis S. L. Carvalho
|
r5338 | entry = self._io.packentry(e, self.node, self.version, curr) | ||
Durham Goode
|
r20217 | self._writeentry(transaction, ifh, dfh, entry, data, link, offset) | ||
Gregory Szorc
|
r26243 | if alwayscache and text is None: | ||
text = buildtext() | ||||
Durham Goode
|
r20217 | if type(text) == str: # only accept immutable objects | ||
self._cache = (node, curr, text) | ||||
self._basecache = (curr, chainbase) | ||||
return node | ||||
def _writeentry(self, transaction, ifh, dfh, entry, data, link, offset): | ||||
curr = len(self) - 1 | ||||
Matt Mackall
|
r4982 | if not self._inline: | ||
mason@suse.com
|
r2073 | transaction.add(self.datafile, offset) | ||
Matt Mackall
|
r4981 | transaction.add(self.indexfile, curr * len(entry)) | ||
mason@suse.com
|
r2073 | if data[0]: | ||
Alexis S. L. Carvalho
|
r3390 | dfh.write(data[0]) | ||
dfh.write(data[1]) | ||||
dfh.flush() | ||||
Matt Mackall
|
r4981 | ifh.write(entry) | ||
mason@suse.com
|
r2073 | else: | ||
Matt Mackall
|
r4996 | offset += curr * self._io.size | ||
Patrick Mezard
|
r5324 | transaction.add(self.indexfile, offset, curr) | ||
Matt Mackall
|
r4981 | ifh.write(entry) | ||
Alexis S. L. Carvalho
|
r3390 | ifh.write(data[0]) | ||
ifh.write(data[1]) | ||||
self.checkinlinesize(transaction, ifh) | ||||
mason@suse.com
|
r2073 | |||
Gregory Szorc
|
r25822 | def addgroup(self, bundle, linkmapper, transaction, addrevisioncb=None): | ||
mpm@selenic.com
|
r1083 | """ | ||
add a delta group | ||||
mpm@selenic.com
|
r46 | |||
mpm@selenic.com
|
r1083 | given a set of deltas, add them to the revision log. the | ||
first delta is against its parent, which should be in our | ||||
log, the rest are against the previous delta. | ||||
Gregory Szorc
|
r25822 | |||
If ``addrevisioncb`` is defined, it will be called with arguments of | ||||
this revlog and the node that was added. | ||||
mpm@selenic.com
|
r1083 | """ | ||
Benoit Boissinot
|
r12624 | # track the base of the current delta log | ||
Pierre-Yves David
|
r15890 | content = [] | ||
Thomas Arendsen Hein
|
r2002 | node = None | ||
mpm@selenic.com
|
r515 | |||
Benoit Boissinot
|
r12624 | r = len(self) | ||
end = 0 | ||||
mpm@selenic.com
|
r46 | if r: | ||
Benoit Boissinot
|
r12624 | end = self.end(r - 1) | ||
mason@suse.com
|
r2072 | ifh = self.opener(self.indexfile, "a+") | ||
Matt Mackall
|
r4996 | isize = r * self._io.size | ||
Matt Mackall
|
r4982 | if self._inline: | ||
Matt Mackall
|
r4996 | transaction.add(self.indexfile, end + isize, r) | ||
mason@suse.com
|
r2073 | dfh = None | ||
else: | ||||
Matt Mackall
|
r4996 | transaction.add(self.indexfile, isize, r) | ||
mason@suse.com
|
r2073 | transaction.add(self.datafile, end) | ||
dfh = self.opener(self.datafile, "a") | ||||
Mike Edgar
|
r24255 | def flush(): | ||
if dfh: | ||||
dfh.flush() | ||||
ifh.flush() | ||||
Benoit Boissinot
|
r6261 | try: | ||
# loop through our set of deltas | ||||
chain = None | ||||
Martin Geisler
|
r14494 | while True: | ||
Benoit Boissinot
|
r14144 | chunkdata = bundle.deltachunk(chain) | ||
Matt Mackall
|
r12336 | if not chunkdata: | ||
Matt Mackall
|
r12335 | break | ||
Matt Mackall
|
r12336 | node = chunkdata['node'] | ||
p1 = chunkdata['p1'] | ||||
p2 = chunkdata['p2'] | ||||
cs = chunkdata['cs'] | ||||
Benoit Boissinot
|
r14141 | deltabase = chunkdata['deltabase'] | ||
delta = chunkdata['delta'] | ||||
Matt Mackall
|
r12336 | |||
Pierre-Yves David
|
r15890 | content.append(node) | ||
Benoit Boissinot
|
r6261 | link = linkmapper(cs) | ||
Sune Foldager
|
r14196 | if node in self.nodemap: | ||
Benoit Boissinot
|
r6261 | # this can happen if two branches make the same change | ||
chain = node | ||||
continue | ||||
mpm@selenic.com
|
r192 | |||
Benoit Boissinot
|
r6261 | for p in (p1, p2): | ||
Brodie Rao
|
r16686 | if p not in self.nodemap: | ||
Sune Foldager
|
r14196 | raise LookupError(p, self.indexfile, | ||
_('unknown parent')) | ||||
mpm@selenic.com
|
r46 | |||
Benoit Boissinot
|
r14141 | if deltabase not in self.nodemap: | ||
raise LookupError(deltabase, self.indexfile, | ||||
_('unknown delta base')) | ||||
mpm@selenic.com
|
r46 | |||
Benoit Boissinot
|
r14141 | baserev = self.rev(deltabase) | ||
Mike Edgar
|
r24120 | |||
if baserev != nullrev and self.iscensored(baserev): | ||||
# if base is censored, delta must be full replacement in a | ||||
# single patch operation | ||||
hlen = struct.calcsize(">lll") | ||||
oldlen = self.rawsize(baserev) | ||||
newlen = len(delta) - hlen | ||||
if delta[:hlen] != mdiff.replacediffheader(oldlen, newlen): | ||||
raise error.CensoredBaseError(self.indexfile, | ||||
self.node(baserev)) | ||||
Mike Edgar
|
r24255 | flags = REVIDX_DEFAULT_FLAGS | ||
if self._peek_iscensored(baserev, delta, flush): | ||||
flags |= REVIDX_ISCENSORED | ||||
Gregory Szorc
|
r26243 | # We assume consumers of addrevisioncb will want to retrieve | ||
# the added revision, which will require a call to | ||||
# revision(). revision() will fast path if there is a cache | ||||
# hit. So, we tell _addrevision() to always cache in this case. | ||||
Benoit Boissinot
|
r12624 | chain = self._addrevision(node, None, transaction, link, | ||
Mike Edgar
|
r24255 | p1, p2, flags, (baserev, delta), | ||
Gregory Szorc
|
r26243 | ifh, dfh, | ||
alwayscache=bool(addrevisioncb)) | ||||
Gregory Szorc
|
r25822 | |||
if addrevisioncb: | ||||
addrevisioncb(self, chain) | ||||
Benoit Boissinot
|
r12624 | if not dfh and not self._inline: | ||
# addrevision switched from inline to conventional | ||||
# reopen the index | ||||
Dan Villiom Podlaski Christiansen
|
r13400 | ifh.close() | ||
Benoit Boissinot
|
r12624 | dfh = self.opener(self.datafile, "a") | ||
ifh = self.opener(self.indexfile, "a") | ||||
Benoit Boissinot
|
r6261 | finally: | ||
if dfh: | ||||
dfh.close() | ||||
ifh.close() | ||||
mpm@selenic.com
|
r46 | |||
Pierre-Yves David
|
r15890 | return content | ||
Matt Mackall
|
r1493 | |||
Mike Edgar
|
r24118 | def iscensored(self, rev): | ||
"""Check if a file revision is censored.""" | ||||
return False | ||||
Mike Edgar
|
r24255 | def _peek_iscensored(self, baserev, delta, flush): | ||
"""Quickly check if a delta produces a censored revision.""" | ||||
return False | ||||
Durham Goode
|
r20074 | def getstrippoint(self, minlink): | ||
"""find the minimum rev that must be stripped to strip the linkrev | ||||
Returns a tuple containing the minimum rev and a set of all revs that | ||||
have linkrevs that will be broken by this strip. | ||||
""" | ||||
brokenrevs = set() | ||||
strippoint = len(self) | ||||
heads = {} | ||||
futurelargelinkrevs = set() | ||||
for head in self.headrevs(): | ||||
headlinkrev = self.linkrev(head) | ||||
heads[head] = headlinkrev | ||||
if headlinkrev >= minlink: | ||||
futurelargelinkrevs.add(headlinkrev) | ||||
# This algorithm involves walking down the rev graph, starting at the | ||||
# heads. Since the revs are topologically sorted according to linkrev, | ||||
# once all head linkrevs are below the minlink, we know there are | ||||
# no more revs that could have a linkrev greater than minlink. | ||||
# So we can stop walking. | ||||
while futurelargelinkrevs: | ||||
strippoint -= 1 | ||||
linkrev = heads.pop(strippoint) | ||||
if linkrev < minlink: | ||||
brokenrevs.add(strippoint) | ||||
else: | ||||
futurelargelinkrevs.remove(linkrev) | ||||
for p in self.parentrevs(strippoint): | ||||
if p != nullrev: | ||||
plinkrev = self.linkrev(p) | ||||
heads[p] = plinkrev | ||||
if plinkrev >= minlink: | ||||
futurelargelinkrevs.add(plinkrev) | ||||
return strippoint, brokenrevs | ||||
Henrik Stuart
|
r8073 | def strip(self, minlink, transaction): | ||
Alexis S. L. Carvalho
|
r5910 | """truncate the revlog on the first revision with a linkrev >= minlink | ||
This function is called when we're stripping revision minlink and | ||||
its descendants from the repository. | ||||
We have to remove all revisions with linkrev >= minlink, because | ||||
the equivalent changelog revisions will be renumbered after the | ||||
strip. | ||||
So we truncate the revlog on the first of these revisions, and | ||||
trust that the caller has saved the revisions that shouldn't be | ||||
Steven Brown
|
r15827 | removed and that it'll re-add them after this truncation. | ||
Alexis S. L. Carvalho
|
r5910 | """ | ||
Matt Mackall
|
r6750 | if len(self) == 0: | ||
mason@suse.com
|
r1535 | return | ||
Durham Goode
|
r20074 | rev, _ = self.getstrippoint(minlink) | ||
if rev == len(self): | ||||
Alexis S. L. Carvalho
|
r5909 | return | ||
mason@suse.com
|
r1535 | |||
# first truncate the files on disk | ||||
end = self.start(rev) | ||||
Matt Mackall
|
r4982 | if not self._inline: | ||
Henrik Stuart
|
r8073 | transaction.add(self.datafile, end) | ||
Matt Mackall
|
r4977 | end = rev * self._io.size | ||
mason@suse.com
|
r2073 | else: | ||
Matt Mackall
|
r4977 | end += rev * self._io.size | ||
mason@suse.com
|
r2072 | |||
Henrik Stuart
|
r8073 | transaction.add(self.indexfile, end) | ||
mason@suse.com
|
r1535 | |||
# then reset internal state in memory to forget those revisions | ||||
Matt Mackall
|
r4984 | self._cache = None | ||
Siddharth Agarwal
|
r23306 | self._chaininfocache = {} | ||
Matt Mackall
|
r8650 | self._chunkclear() | ||
Matt Mackall
|
r6750 | for x in xrange(rev, len(self)): | ||
mason@suse.com
|
r2072 | del self.nodemap[self.node(x)] | ||
mason@suse.com
|
r1535 | |||
Matt Mackall
|
r4979 | del self.index[rev:-1] | ||
mason@suse.com
|
r1535 | |||
Matt Mackall
|
r1493 | def checksize(self): | ||
expected = 0 | ||||
Matt Mackall
|
r6750 | if len(self): | ||
expected = max(0, self.end(len(self) - 1)) | ||||
Matt Mackall
|
r1667 | |||
Matt Mackall
|
r1494 | try: | ||
f = self.opener(self.datafile) | ||||
f.seek(0, 2) | ||||
actual = f.tell() | ||||
Dan Villiom Podlaski Christiansen
|
r13400 | f.close() | ||
Matt Mackall
|
r1667 | dd = actual - expected | ||
Gregory Szorc
|
r25660 | except IOError as inst: | ||
Matt Mackall
|
r1667 | if inst.errno != errno.ENOENT: | ||
raise | ||||
dd = 0 | ||||
try: | ||||
f = self.opener(self.indexfile) | ||||
f.seek(0, 2) | ||||
actual = f.tell() | ||||
Dan Villiom Podlaski Christiansen
|
r13400 | f.close() | ||
Matt Mackall
|
r4977 | s = self._io.size | ||
Alejandro Santos
|
r9029 | i = max(0, actual // s) | ||
Matt Mackall
|
r1667 | di = actual - (i * s) | ||
Matt Mackall
|
r4982 | if self._inline: | ||
mason@suse.com
|
r2073 | databytes = 0 | ||
Matt Mackall
|
r6750 | for r in self: | ||
Matt Mackall
|
r5312 | databytes += max(0, self.length(r)) | ||
mason@suse.com
|
r2073 | dd = 0 | ||
Matt Mackall
|
r6750 | di = actual - len(self) * s - databytes | ||
Gregory Szorc
|
r25660 | except IOError as inst: | ||
Matt Mackall
|
r1667 | if inst.errno != errno.ENOENT: | ||
raise | ||||
di = 0 | ||||
return (dd, di) | ||||
Adrian Buehlmann
|
r6891 | |||
def files(self): | ||||
Matt Mackall
|
r10282 | res = [self.indexfile] | ||
Adrian Buehlmann
|
r6891 | if not self._inline: | ||
res.append(self.datafile) | ||||
return res | ||||