mercurial-scm/hg-stable: mercurial/revlog.py annotate

annotate mercurial/revlog.py @ 8226:8b2cd04a6e97

put license and copyright info into comment blocks

author	Martin Geisler <mg@lazybytes.net>
date	Sun, 26 Apr 2009 01:13:08 +0200
parents	46293a0c7e9f
children	0a9542703300

rev	line source
8226 8b2cd04a6e97 put license and copyright info into comment blocks Martin Geisler <mg@lazybytes.net> parents: 8225 diff changeset	1 # revlog.py - storage back-end for mercurial
8b2cd04a6e97 put license and copyright info into comment blocks Martin Geisler <mg@lazybytes.net> parents: 8225 diff changeset	2 #
8b2cd04a6e97 put license and copyright info into comment blocks Martin Geisler <mg@lazybytes.net> parents: 8225 diff changeset	3 # This provides efficient delta storage with O(1) retrieve and append
8b2cd04a6e97 put license and copyright info into comment blocks Martin Geisler <mg@lazybytes.net> parents: 8225 diff changeset	4 # and O(changes) merge between branches
8b2cd04a6e97 put license and copyright info into comment blocks Martin Geisler <mg@lazybytes.net> parents: 8225 diff changeset	5 #
8b2cd04a6e97 put license and copyright info into comment blocks Martin Geisler <mg@lazybytes.net> parents: 8225 diff changeset	6 # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
8b2cd04a6e97 put license and copyright info into comment blocks Martin Geisler <mg@lazybytes.net> parents: 8225 diff changeset	7 #
8b2cd04a6e97 put license and copyright info into comment blocks Martin Geisler <mg@lazybytes.net> parents: 8225 diff changeset	8 # This software may be used and distributed according to the terms of the
8b2cd04a6e97 put license and copyright info into comment blocks Martin Geisler <mg@lazybytes.net> parents: 8225 diff changeset	9 # GNU General Public License version 2, incorporated herein by reference.
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	10
7873 4a4c7f6a5912 cleanup: drop unused imports Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 7633 diff changeset	11 # import stuff from node for others to import from revlog
4a4c7f6a5912 cleanup: drop unused imports Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 7633 diff changeset	12 from node import bin, hex, nullid, nullrev, short #@UnusedImport
3891 6b4127c7d52a Simplify i18n imports Matt Mackall <mpm@selenic.com> parents: 3877 diff changeset	13 from i18n import _
7109 528b7fc1216c use the new parseindex implementation C in parsers Bernhard Leiner <bleiner@gmail.com> parents: 7089 diff changeset	14 import changegroup, errno, ancestor, mdiff, parsers
7633 08cabecfa8a8 errors: move revlog errors Matt Mackall <mpm@selenic.com> parents: 7365 diff changeset	15 import struct, util, zlib, error
36 da28286bf6b7 Add smart node lookup by substring or by rev number mpm@selenic.com parents: 26 diff changeset	16
5007 3addf4531643 revlog: localize some fastpath functions Matt Mackall <mpm@selenic.com> parents: 5006 diff changeset	17 _pack = struct.pack
3addf4531643 revlog: localize some fastpath functions Matt Mackall <mpm@selenic.com> parents: 5006 diff changeset	18 _unpack = struct.unpack
3addf4531643 revlog: localize some fastpath functions Matt Mackall <mpm@selenic.com> parents: 5006 diff changeset	19 _compress = zlib.compress
3addf4531643 revlog: localize some fastpath functions Matt Mackall <mpm@selenic.com> parents: 5006 diff changeset	20 _decompress = zlib.decompress
6470 ac0bcd951c2c python 2.6 compatibility: compatibility wrappers for hash functions Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6264 diff changeset	21 _sha = util.sha1
5007 3addf4531643 revlog: localize some fastpath functions Matt Mackall <mpm@selenic.com> parents: 5006 diff changeset	22
4987 8d30004ada40 revlog: some basic code reordering Matt Mackall <mpm@selenic.com> parents: 4986 diff changeset	23 # revlog flags
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	24 REVLOGV0 = 0
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	25 REVLOGNG = 1
2073 1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	26 REVLOGNGINLINEDATA = (1 << 16)
2222 c9e264b115e6 Use revlogng and inlined data files by default mason@suse.com parents: 2177 diff changeset	27 REVLOG_DEFAULT_FLAGS = REVLOGNGINLINEDATA
c9e264b115e6 Use revlogng and inlined data files by default mason@suse.com parents: 2177 diff changeset	28 REVLOG_DEFAULT_FORMAT = REVLOGNG
c9e264b115e6 Use revlogng and inlined data files by default mason@suse.com parents: 2177 diff changeset	29 REVLOG_DEFAULT_VERSION = REVLOG_DEFAULT_FORMAT \| REVLOG_DEFAULT_FLAGS
2073 1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	30
7633 08cabecfa8a8 errors: move revlog errors Matt Mackall <mpm@selenic.com> parents: 7365 diff changeset	31 RevlogError = error.RevlogError
08cabecfa8a8 errors: move revlog errors Matt Mackall <mpm@selenic.com> parents: 7365 diff changeset	32 LookupError = error.LookupError
6703 bacfee67c1a9 LookupError should have same __str__ as RevlogError Alexander Solovyov <piranha@piranha.org.ua> parents: 6700 diff changeset	33
4987 8d30004ada40 revlog: some basic code reordering Matt Mackall <mpm@selenic.com> parents: 4986 diff changeset	34 def getoffset(q):
8d30004ada40 revlog: some basic code reordering Matt Mackall <mpm@selenic.com> parents: 4986 diff changeset	35 return int(q >> 16)
8d30004ada40 revlog: some basic code reordering Matt Mackall <mpm@selenic.com> parents: 4986 diff changeset	36
8d30004ada40 revlog: some basic code reordering Matt Mackall <mpm@selenic.com> parents: 4986 diff changeset	37 def gettype(q):
8d30004ada40 revlog: some basic code reordering Matt Mackall <mpm@selenic.com> parents: 4986 diff changeset	38 return int(q & 0xFFFF)
8d30004ada40 revlog: some basic code reordering Matt Mackall <mpm@selenic.com> parents: 4986 diff changeset	39
8d30004ada40 revlog: some basic code reordering Matt Mackall <mpm@selenic.com> parents: 4986 diff changeset	40 def offset_type(offset, type):
8d30004ada40 revlog: some basic code reordering Matt Mackall <mpm@selenic.com> parents: 4986 diff changeset	41 return long(long(offset) << 16 \| type)
8d30004ada40 revlog: some basic code reordering Matt Mackall <mpm@selenic.com> parents: 4986 diff changeset	42
7883 c63c30ae9e39 revlog: faster hash computation when one of the parent node is null Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 7874 diff changeset	43 nullhash = _sha(nullid)
c63c30ae9e39 revlog: faster hash computation when one of the parent node is null Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 7874 diff changeset	44
1091 d62130f99a73 Move hash function back to revlog from node mpm@selenic.com parents: 1089 diff changeset	45 def hash(text, p1, p2):
d62130f99a73 Move hash function back to revlog from node mpm@selenic.com parents: 1089 diff changeset	46 """generate a hash from the given text and its parent hashes
d62130f99a73 Move hash function back to revlog from node mpm@selenic.com parents: 1089 diff changeset	47
d62130f99a73 Move hash function back to revlog from node mpm@selenic.com parents: 1089 diff changeset	48 This hash combines both the current file contents and its history
d62130f99a73 Move hash function back to revlog from node mpm@selenic.com parents: 1089 diff changeset	49 in a manner that makes it easy to distinguish nodes with the same
d62130f99a73 Move hash function back to revlog from node mpm@selenic.com parents: 1089 diff changeset	50 content in the revision graph.
d62130f99a73 Move hash function back to revlog from node mpm@selenic.com parents: 1089 diff changeset	51 """
7883 c63c30ae9e39 revlog: faster hash computation when one of the parent node is null Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 7874 diff changeset	52 # As of now, if one of the parent node is null, p2 is null
c63c30ae9e39 revlog: faster hash computation when one of the parent node is null Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 7874 diff changeset	53 if p2 == nullid:
c63c30ae9e39 revlog: faster hash computation when one of the parent node is null Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 7874 diff changeset	54 # deep copy of a hash is faster than creating one
c63c30ae9e39 revlog: faster hash computation when one of the parent node is null Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 7874 diff changeset	55 s = nullhash.copy()
c63c30ae9e39 revlog: faster hash computation when one of the parent node is null Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 7874 diff changeset	56 s.update(p1)
c63c30ae9e39 revlog: faster hash computation when one of the parent node is null Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 7874 diff changeset	57 else:
c63c30ae9e39 revlog: faster hash computation when one of the parent node is null Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 7874 diff changeset	58 # none of the parent nodes are nullid
c63c30ae9e39 revlog: faster hash computation when one of the parent node is null Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 7874 diff changeset	59 l = [p1, p2]
c63c30ae9e39 revlog: faster hash computation when one of the parent node is null Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 7874 diff changeset	60 l.sort()
c63c30ae9e39 revlog: faster hash computation when one of the parent node is null Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 7874 diff changeset	61 s = _sha(l[0])
c63c30ae9e39 revlog: faster hash computation when one of the parent node is null Nicolas Dumazet <nicdumz.commits@gmail.com> parents: 7874 diff changeset	62 s.update(l[1])
1091 d62130f99a73 Move hash function back to revlog from node mpm@selenic.com parents: 1089 diff changeset	63 s.update(text)
d62130f99a73 Move hash function back to revlog from node mpm@selenic.com parents: 1089 diff changeset	64 return s.digest()
d62130f99a73 Move hash function back to revlog from node mpm@selenic.com parents: 1089 diff changeset	65
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	66 def compress(text):
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	67 """ generate a possibly-compressed representation of text """
4980 fc44c8df9d99 revlog: some codingstyle cleanups Matt Mackall <mpm@selenic.com> parents: 4979 diff changeset	68 if not text:
fc44c8df9d99 revlog: some codingstyle cleanups Matt Mackall <mpm@selenic.com> parents: 4979 diff changeset	69 return ("", text)
5451 0a43875677b1 revlog: break up compression of large deltas Matt Mackall <mpm@selenic.com> parents: 5450 diff changeset	70 l = len(text)
5453 9d77f2b47eb7 fix UnboundLocalError, refactor a bit Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 5451 diff changeset	71 bin = None
5451 0a43875677b1 revlog: break up compression of large deltas Matt Mackall <mpm@selenic.com> parents: 5450 diff changeset	72 if l < 44:
5453 9d77f2b47eb7 fix UnboundLocalError, refactor a bit Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 5451 diff changeset	73 pass
5451 0a43875677b1 revlog: break up compression of large deltas Matt Mackall <mpm@selenic.com> parents: 5450 diff changeset	74 elif l > 1000000:
0a43875677b1 revlog: break up compression of large deltas Matt Mackall <mpm@selenic.com> parents: 5450 diff changeset	75 # zlib makes an internal copy, thus doubling memory usage for
0a43875677b1 revlog: break up compression of large deltas Matt Mackall <mpm@selenic.com> parents: 5450 diff changeset	76 # large files, so lets do this in pieces
0a43875677b1 revlog: break up compression of large deltas Matt Mackall <mpm@selenic.com> parents: 5450 diff changeset	77 z = zlib.compressobj()
0a43875677b1 revlog: break up compression of large deltas Matt Mackall <mpm@selenic.com> parents: 5450 diff changeset	78 p = []
0a43875677b1 revlog: break up compression of large deltas Matt Mackall <mpm@selenic.com> parents: 5450 diff changeset	79 pos = 0
0a43875677b1 revlog: break up compression of large deltas Matt Mackall <mpm@selenic.com> parents: 5450 diff changeset	80 while pos < l:
0a43875677b1 revlog: break up compression of large deltas Matt Mackall <mpm@selenic.com> parents: 5450 diff changeset	81 pos2 = pos + 2**20
0a43875677b1 revlog: break up compression of large deltas Matt Mackall <mpm@selenic.com> parents: 5450 diff changeset	82 p.append(z.compress(text[pos:pos2]))
0a43875677b1 revlog: break up compression of large deltas Matt Mackall <mpm@selenic.com> parents: 5450 diff changeset	83 pos = pos2
0a43875677b1 revlog: break up compression of large deltas Matt Mackall <mpm@selenic.com> parents: 5450 diff changeset	84 p.append(z.flush())
0a43875677b1 revlog: break up compression of large deltas Matt Mackall <mpm@selenic.com> parents: 5450 diff changeset	85 if sum(map(len, p)) < l:
0a43875677b1 revlog: break up compression of large deltas Matt Mackall <mpm@selenic.com> parents: 5450 diff changeset	86 bin = "".join(p)
0a43875677b1 revlog: break up compression of large deltas Matt Mackall <mpm@selenic.com> parents: 5450 diff changeset	87 else:
0a43875677b1 revlog: break up compression of large deltas Matt Mackall <mpm@selenic.com> parents: 5450 diff changeset	88 bin = _compress(text)
5453 9d77f2b47eb7 fix UnboundLocalError, refactor a bit Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 5451 diff changeset	89 if bin is None or len(bin) > l:
4980 fc44c8df9d99 revlog: some codingstyle cleanups Matt Mackall <mpm@selenic.com> parents: 4979 diff changeset	90 if text[0] == '\0':
fc44c8df9d99 revlog: some codingstyle cleanups Matt Mackall <mpm@selenic.com> parents: 4979 diff changeset	91 return ("", text)
1533 3d11f81c9145 Reduce string duplication in compression code mason@suse.com parents: 1509 diff changeset	92 return ('u', text)
3d11f81c9145 Reduce string duplication in compression code mason@suse.com parents: 1509 diff changeset	93 return ("", bin)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	94
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	95 def decompress(bin):
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	96 """ decompress the given input """
4980 fc44c8df9d99 revlog: some codingstyle cleanups Matt Mackall <mpm@selenic.com> parents: 4979 diff changeset	97 if not bin:
fc44c8df9d99 revlog: some codingstyle cleanups Matt Mackall <mpm@selenic.com> parents: 4979 diff changeset	98 return bin
112 aea6562add6c Make compression more intelligent: mpm@selenic.com parents: 98 diff changeset	99 t = bin[0]
4980 fc44c8df9d99 revlog: some codingstyle cleanups Matt Mackall <mpm@selenic.com> parents: 4979 diff changeset	100 if t == '\0':
fc44c8df9d99 revlog: some codingstyle cleanups Matt Mackall <mpm@selenic.com> parents: 4979 diff changeset	101 return bin
fc44c8df9d99 revlog: some codingstyle cleanups Matt Mackall <mpm@selenic.com> parents: 4979 diff changeset	102 if t == 'x':
5007 3addf4531643 revlog: localize some fastpath functions Matt Mackall <mpm@selenic.com> parents: 5006 diff changeset	103 return _decompress(bin)
4980 fc44c8df9d99 revlog: some codingstyle cleanups Matt Mackall <mpm@selenic.com> parents: 4979 diff changeset	104 if t == 'u':
fc44c8df9d99 revlog: some codingstyle cleanups Matt Mackall <mpm@selenic.com> parents: 4979 diff changeset	105 return bin[1:]
1853 5ac811b720de Fix some problems when working on broken repositories: Thomas Arendsen Hein <thomas@intevation.de> parents: 1784 diff changeset	106 raise RevlogError(_("unknown compression type %r") % t)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	107
1559 59b3639df0a9 Convert all classes to new-style classes by deriving them from object. Eric Hopper <hopper@omnifarious.org> parents: 1551 diff changeset	108 class lazyparser(object):
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	109 """
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	110 this class avoids the need to parse the entirety of large indices
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	111 """
2250 45aef5ddcdbe windows: revlog.lazyparser not always safe to use. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2222 diff changeset	112
45aef5ddcdbe windows: revlog.lazyparser not always safe to use. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2222 diff changeset	113 # lazyparser is not safe to use on windows if win32 extensions not
45aef5ddcdbe windows: revlog.lazyparser not always safe to use. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2222 diff changeset	114 # available. it keeps file handle open, which make it not possible
45aef5ddcdbe windows: revlog.lazyparser not always safe to use. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2222 diff changeset	115 # to break hardlinks on local cloned repos.
45aef5ddcdbe windows: revlog.lazyparser not always safe to use. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2222 diff changeset	116
4976 79c39cc9ff69 revlog: only allow lazy parsing with revlogng files Matt Mackall <mpm@selenic.com> parents: 4975 diff changeset	117 def __init__(self, dataf, size):
2079 ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	118 self.dataf = dataf
4976 79c39cc9ff69 revlog: only allow lazy parsing with revlogng files Matt Mackall <mpm@selenic.com> parents: 4975 diff changeset	119 self.s = struct.calcsize(indexformatng)
2079 ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	120 self.datasize = size
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	121 self.l = size/self.s
76 d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	122 self.index = [None] * self.l
3578 3b4e00cba57a Define and use nullrev (revision of nullid) instead of -1. Thomas Arendsen Hein <thomas@intevation.de> parents: 3508 diff changeset	123 self.map = {nullid: nullrev}
2079 ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	124 self.allmap = 0
323 c6f0673ab7e9 lazyparser speed ups mpm@selenic.com parents: 306 diff changeset	125 self.all = 0
2079 ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	126 self.mapfind_count = 0
76 d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	127
2079 ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	128 def loadmap(self):
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	129 """
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	130 during a commit, we need to make sure the rev being added is
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	131 not a duplicate. This requires loading the entire index,
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	132 which is fairly slow. loadmap can load up just the node map,
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	133 which takes much less time.
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	134 """
4980 fc44c8df9d99 revlog: some codingstyle cleanups Matt Mackall <mpm@selenic.com> parents: 4979 diff changeset	135 if self.allmap:
fc44c8df9d99 revlog: some codingstyle cleanups Matt Mackall <mpm@selenic.com> parents: 4979 diff changeset	136 return
2079 ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	137 end = self.datasize
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	138 self.allmap = 1
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	139 cur = 0
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	140 count = 0
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	141 blocksize = self.s * 256
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	142 self.dataf.seek(0)
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	143 while cur < end:
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	144 data = self.dataf.read(blocksize)
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	145 off = 0
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	146 for x in xrange(256):
4976 79c39cc9ff69 revlog: only allow lazy parsing with revlogng files Matt Mackall <mpm@selenic.com> parents: 4975 diff changeset	147 n = data[off + ngshaoffset:off + ngshaoffset + 20]
2079 ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	148 self.map[n] = count
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	149 count += 1
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	150 if count >= self.l:
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	151 break
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	152 off += self.s
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	153 cur += blocksize
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	154
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	155 def loadblock(self, blockstart, blocksize, data=None):
4980 fc44c8df9d99 revlog: some codingstyle cleanups Matt Mackall <mpm@selenic.com> parents: 4979 diff changeset	156 if self.all:
fc44c8df9d99 revlog: some codingstyle cleanups Matt Mackall <mpm@selenic.com> parents: 4979 diff changeset	157 return
2079 ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	158 if data is None:
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	159 self.dataf.seek(blockstart)
3078 baa3873eb387 don't let lazyparser read more data than it can handle Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2890 diff changeset	160 if blockstart + blocksize > self.datasize:
baa3873eb387 don't let lazyparser read more data than it can handle Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2890 diff changeset	161 # the revlog may have grown since we've started running,
baa3873eb387 don't let lazyparser read more data than it can handle Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2890 diff changeset	162 # but we don't have space in self.index for more entries.
baa3873eb387 don't let lazyparser read more data than it can handle Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2890 diff changeset	163 # limit blocksize so that we don't get too much data.
3089 e7fc04dc6349 Avoid negative block sizes in lazyparser. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3078 diff changeset	164 blocksize = max(self.datasize - blockstart, 0)
2079 ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	165 data = self.dataf.read(blocksize)
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	166 lend = len(data) / self.s
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	167 i = blockstart / self.s
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	168 off = 0
4061 40030c1b6bc6 lazyindex: handle __delitem__ in loadblock Brendan Cully <brendan@kublai.com> parents: 3930 diff changeset	169 # lazyindex supports __delitem__
40030c1b6bc6 lazyindex: handle __delitem__ in loadblock Brendan Cully <brendan@kublai.com> parents: 3930 diff changeset	170 if lend > len(self.index) - i:
40030c1b6bc6 lazyindex: handle __delitem__ in loadblock Brendan Cully <brendan@kublai.com> parents: 3930 diff changeset	171 lend = len(self.index) - i
2079 ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	172 for x in xrange(lend):
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	173 if self.index[i + x] == None:
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	174 b = data[off : off + self.s]
2080 1cbb14c048cb Reduce index memory usage by storing the bare string instead of tuples mason@suse.com parents: 2079 diff changeset	175 self.index[i + x] = b
4976 79c39cc9ff69 revlog: only allow lazy parsing with revlogng files Matt Mackall <mpm@selenic.com> parents: 4975 diff changeset	176 n = b[ngshaoffset:ngshaoffset + 20]
2080 1cbb14c048cb Reduce index memory usage by storing the bare string instead of tuples mason@suse.com parents: 2079 diff changeset	177 self.map[n] = i + x
2079 ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	178 off += self.s
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	179
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	180 def findnode(self, node):
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	181 """search backwards through the index file for a specific node"""
4980 fc44c8df9d99 revlog: some codingstyle cleanups Matt Mackall <mpm@selenic.com> parents: 4979 diff changeset	182 if self.allmap:
fc44c8df9d99 revlog: some codingstyle cleanups Matt Mackall <mpm@selenic.com> parents: 4979 diff changeset	183 return None
2079 ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	184
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	185 # hg log will cause many many searches for the manifest
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	186 # nodes. After we get called a few times, just load the whole
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	187 # thing.
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	188 if self.mapfind_count > 8:
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	189 self.loadmap()
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	190 if node in self.map:
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	191 return node
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	192 return None
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	193 self.mapfind_count += 1
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	194 last = self.l - 1
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	195 while self.index[last] != None:
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	196 if last == 0:
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	197 self.all = 1
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	198 self.allmap = 1
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	199 return None
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	200 last -= 1
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	201 end = (last + 1) * self.s
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	202 blocksize = self.s * 256
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	203 while end >= 0:
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	204 start = max(end - blocksize, 0)
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	205 self.dataf.seek(start)
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	206 data = self.dataf.read(end - start)
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	207 findend = end - start
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	208 while True:
4994 d36310dd51d7 lazyparser.findnode: fix typo and s/rfind/find/ Matt Mackall <mpm@selenic.com> parents: 4993 diff changeset	209 # we're searching backwards, so we have to make sure
2079 ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	210 # we don't find a changeset where this node is a parent
4994 d36310dd51d7 lazyparser.findnode: fix typo and s/rfind/find/ Matt Mackall <mpm@selenic.com> parents: 4993 diff changeset	211 off = data.find(node, 0, findend)
2079 ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	212 findend = off
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	213 if off >= 0:
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	214 i = off / self.s
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	215 off = i * self.s
4976 79c39cc9ff69 revlog: only allow lazy parsing with revlogng files Matt Mackall <mpm@selenic.com> parents: 4975 diff changeset	216 n = data[off + ngshaoffset:off + ngshaoffset + 20]
2079 ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	217 if n == node:
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	218 self.map[n] = i + start / self.s
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	219 return node
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	220 else:
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	221 break
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	222 end -= blocksize
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	223 return None
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	224
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	225 def loadindex(self, i=None, end=None):
4980 fc44c8df9d99 revlog: some codingstyle cleanups Matt Mackall <mpm@selenic.com> parents: 4979 diff changeset	226 if self.all:
fc44c8df9d99 revlog: some codingstyle cleanups Matt Mackall <mpm@selenic.com> parents: 4979 diff changeset	227 return
2079 ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	228 all = False
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	229 if i == None:
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	230 blockstart = 0
4992 0a676643687b lazyparser: up the blocksize from 512 bytes to 64k Matt Mackall <mpm@selenic.com> parents: 4991 diff changeset	231 blocksize = (65536 / self.s) * self.s
2079 ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	232 end = self.datasize
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	233 all = True
323 c6f0673ab7e9 lazyparser speed ups mpm@selenic.com parents: 306 diff changeset	234 else:
2079 ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	235 if end:
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	236 blockstart = i * self.s
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	237 end = end * self.s
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	238 blocksize = end - blockstart
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	239 else:
4992 0a676643687b lazyparser: up the blocksize from 512 bytes to 64k Matt Mackall <mpm@selenic.com> parents: 4991 diff changeset	240 blockstart = (i & ~1023) * self.s
0a676643687b lazyparser: up the blocksize from 512 bytes to 64k Matt Mackall <mpm@selenic.com> parents: 4991 diff changeset	241 blocksize = self.s * 1024
2079 ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	242 end = blockstart + blocksize
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	243 while blockstart < end:
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	244 self.loadblock(blockstart, blocksize)
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	245 blockstart += blocksize
4980 fc44c8df9d99 revlog: some codingstyle cleanups Matt Mackall <mpm@selenic.com> parents: 4979 diff changeset	246 if all:
fc44c8df9d99 revlog: some codingstyle cleanups Matt Mackall <mpm@selenic.com> parents: 4979 diff changeset	247 self.all = True
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 484 diff changeset	248
1559 59b3639df0a9 Convert all classes to new-style classes by deriving them from object. Eric Hopper <hopper@omnifarious.org> parents: 1551 diff changeset	249 class lazyindex(object):
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	250 """a lazy version of the index array"""
76 d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	251 def __init__(self, parser):
d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	252 self.p = parser
d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	253 def __len__(self):
d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	254 return len(self.p.index)
115 39b438eeb25a Make lazyindex load slightly faster mpm@selenic.com parents: 112 diff changeset	255 def load(self, pos):
1403 bc3e66edb04c lazyindex fix, make load handle negative indexes properly. Eric Hopper <hopper@omnifarious.org> parents: 1402 diff changeset	256 if pos < 0:
bc3e66edb04c lazyindex fix, make load handle negative indexes properly. Eric Hopper <hopper@omnifarious.org> parents: 1402 diff changeset	257 pos += len(self.p.index)
2079 ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	258 self.p.loadindex(pos)
115 39b438eeb25a Make lazyindex load slightly faster mpm@selenic.com parents: 112 diff changeset	259 return self.p.index[pos]
76 d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	260 def __getitem__(self, pos):
5007 3addf4531643 revlog: localize some fastpath functions Matt Mackall <mpm@selenic.com> parents: 5006 diff changeset	261 return _unpack(indexformatng, self.p.index[pos] or self.load(pos))
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	262 def __setitem__(self, pos, item):
5007 3addf4531643 revlog: localize some fastpath functions Matt Mackall <mpm@selenic.com> parents: 5006 diff changeset	263 self.p.index[pos] = _pack(indexformatng, *item)
1535 7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	264 def __delitem__(self, pos):
7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	265 del self.p.index[pos]
4979 06abdaf78788 revlog: add a magic null revision to our index Matt Mackall <mpm@selenic.com> parents: 4978 diff changeset	266 def insert(self, pos, e):
5007 3addf4531643 revlog: localize some fastpath functions Matt Mackall <mpm@selenic.com> parents: 5006 diff changeset	267 self.p.index.insert(pos, _pack(indexformatng, *e))
76 d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	268 def append(self, e):
5007 3addf4531643 revlog: localize some fastpath functions Matt Mackall <mpm@selenic.com> parents: 5006 diff changeset	269 self.p.index.append(_pack(indexformatng, *e))
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 484 diff changeset	270
1559 59b3639df0a9 Convert all classes to new-style classes by deriving them from object. Eric Hopper <hopper@omnifarious.org> parents: 1551 diff changeset	271 class lazymap(object):
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	272 """a lazy version of the node map"""
76 d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	273 def __init__(self, parser):
d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	274 self.p = parser
d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	275 def load(self, key):
2079 ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	276 n = self.p.findnode(key)
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	277 if n == None:
1214 34706a835d4a Smarter handling of revlog key errors mpm@selenic.com parents: 1201 diff changeset	278 raise KeyError(key)
76 d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	279 def __contains__(self, key):
2079 ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	280 if key in self.p.map:
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	281 return True
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	282 self.p.loadmap()
323 c6f0673ab7e9 lazyparser speed ups mpm@selenic.com parents: 306 diff changeset	283 return key in self.p.map
97 7a2abee6b0c2 Add iterator to the lazymap code mpm@selenic.com parents: 94 diff changeset	284 def __iter__(self):
469 e205194ca7ef Various node id lookup tweaks mpm@selenic.com parents: 451 diff changeset	285 yield nullid
97 7a2abee6b0c2 Add iterator to the lazymap code mpm@selenic.com parents: 94 diff changeset	286 for i in xrange(self.p.l):
2080 1cbb14c048cb Reduce index memory usage by storing the bare string instead of tuples mason@suse.com parents: 2079 diff changeset	287 ret = self.p.index[i]
1cbb14c048cb Reduce index memory usage by storing the bare string instead of tuples mason@suse.com parents: 2079 diff changeset	288 if not ret:
2079 ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	289 self.p.loadindex(i)
2080 1cbb14c048cb Reduce index memory usage by storing the bare string instead of tuples mason@suse.com parents: 2079 diff changeset	290 ret = self.p.index[i]
1cbb14c048cb Reduce index memory usage by storing the bare string instead of tuples mason@suse.com parents: 2079 diff changeset	291 if isinstance(ret, str):
5007 3addf4531643 revlog: localize some fastpath functions Matt Mackall <mpm@selenic.com> parents: 5006 diff changeset	292 ret = _unpack(indexformatng, ret)
4978 93d48a8fa496 revlog: change accesses to index entry elements to use positive offsets Matt Mackall <mpm@selenic.com> parents: 4977 diff changeset	293 yield ret[7]
76 d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	294 def __getitem__(self, key):
d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	295 try:
d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	296 return self.p.map[key]
d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	297 except KeyError:
86 1b945e8ba67b Friendlier exceptions for unknown node errors mpm@selenic.com parents: 84 diff changeset	298 try:
1b945e8ba67b Friendlier exceptions for unknown node errors mpm@selenic.com parents: 84 diff changeset	299 self.load(key)
1b945e8ba67b Friendlier exceptions for unknown node errors mpm@selenic.com parents: 84 diff changeset	300 return self.p.map[key]
1b945e8ba67b Friendlier exceptions for unknown node errors mpm@selenic.com parents: 84 diff changeset	301 except KeyError:
1b945e8ba67b Friendlier exceptions for unknown node errors mpm@selenic.com parents: 84 diff changeset	302 raise KeyError("node " + hex(key))
76 d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	303 def __setitem__(self, key, val):
d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	304 self.p.map[key] = val
1535 7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	305 def __delitem__(self, key):
7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	306 del self.p.map[key]
76 d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	307
4987 8d30004ada40 revlog: some basic code reordering Matt Mackall <mpm@selenic.com> parents: 4986 diff changeset	308 indexformatv0 = ">4l20s20s20s"
8d30004ada40 revlog: some basic code reordering Matt Mackall <mpm@selenic.com> parents: 4986 diff changeset	309 v0shaoffset = 56
4918 e017d3a82e1d revlog: raise offset/type helpers to global scope Matt Mackall <mpm@selenic.com> parents: 4746 diff changeset	310
4972 8d0cf46e0dc6 revlog: add revlogio interface Matt Mackall <mpm@selenic.com> parents: 4971 diff changeset	311 class revlogoldio(object):
8d0cf46e0dc6 revlog: add revlogio interface Matt Mackall <mpm@selenic.com> parents: 4971 diff changeset	312 def __init__(self):
4977 6cb30bc4ca32 revlog: parse revlogv0 indexes into v1 internally Matt Mackall <mpm@selenic.com> parents: 4976 diff changeset	313 self.size = struct.calcsize(indexformatv0)
4972 8d0cf46e0dc6 revlog: add revlogio interface Matt Mackall <mpm@selenic.com> parents: 4971 diff changeset	314
4985 e6525e459157 revlog: simplify revlog.__init__ Matt Mackall <mpm@selenic.com> parents: 4984 diff changeset	315 def parseindex(self, fp, inline):
4977 6cb30bc4ca32 revlog: parse revlogv0 indexes into v1 internally Matt Mackall <mpm@selenic.com> parents: 4976 diff changeset	316 s = self.size
4972 8d0cf46e0dc6 revlog: add revlogio interface Matt Mackall <mpm@selenic.com> parents: 4971 diff changeset	317 index = []
8d0cf46e0dc6 revlog: add revlogio interface Matt Mackall <mpm@selenic.com> parents: 4971 diff changeset	318 nodemap = {nullid: nullrev}
4973 a386a6e4fe46 revlog: simplify the v0 parser Matt Mackall <mpm@selenic.com> parents: 4972 diff changeset	319 n = off = 0
a386a6e4fe46 revlog: simplify the v0 parser Matt Mackall <mpm@selenic.com> parents: 4972 diff changeset	320 data = fp.read()
a386a6e4fe46 revlog: simplify the v0 parser Matt Mackall <mpm@selenic.com> parents: 4972 diff changeset	321 l = len(data)
a386a6e4fe46 revlog: simplify the v0 parser Matt Mackall <mpm@selenic.com> parents: 4972 diff changeset	322 while off + s <= l:
a386a6e4fe46 revlog: simplify the v0 parser Matt Mackall <mpm@selenic.com> parents: 4972 diff changeset	323 cur = data[off:off + s]
a386a6e4fe46 revlog: simplify the v0 parser Matt Mackall <mpm@selenic.com> parents: 4972 diff changeset	324 off += s
5007 3addf4531643 revlog: localize some fastpath functions Matt Mackall <mpm@selenic.com> parents: 5006 diff changeset	325 e = _unpack(indexformatv0, cur)
4977 6cb30bc4ca32 revlog: parse revlogv0 indexes into v1 internally Matt Mackall <mpm@selenic.com> parents: 4976 diff changeset	326 # transform to revlogv1 format
6cb30bc4ca32 revlog: parse revlogv0 indexes into v1 internally Matt Mackall <mpm@selenic.com> parents: 4976 diff changeset	327 e2 = (offset_type(e[0], 0), e[1], -1, e[2], e[3],
5544 686899a7de5b revlog: make revlogv0 loading more robust against corruption Matt Mackall <mpm@selenic.com> parents: 5453 diff changeset	328 nodemap.get(e[4], nullrev), nodemap.get(e[5], nullrev), e[6])
4977 6cb30bc4ca32 revlog: parse revlogv0 indexes into v1 internally Matt Mackall <mpm@selenic.com> parents: 4976 diff changeset	329 index.append(e2)
6cb30bc4ca32 revlog: parse revlogv0 indexes into v1 internally Matt Mackall <mpm@selenic.com> parents: 4976 diff changeset	330 nodemap[e[6]] = n
4973 a386a6e4fe46 revlog: simplify the v0 parser Matt Mackall <mpm@selenic.com> parents: 4972 diff changeset	331 n += 1
4972 8d0cf46e0dc6 revlog: add revlogio interface Matt Mackall <mpm@selenic.com> parents: 4971 diff changeset	332
4983 4dbcfc6e359e revlog: pull chunkcache back into revlog Matt Mackall <mpm@selenic.com> parents: 4982 diff changeset	333 return index, nodemap, None
4972 8d0cf46e0dc6 revlog: add revlogio interface Matt Mackall <mpm@selenic.com> parents: 4971 diff changeset	334
5338 f87685355c9c revlog: fix revlogio.packentry corner case Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5325 diff changeset	335 def packentry(self, entry, node, version, rev):
4986 58cc017ec7e0 revlog: abstract out index entry packing Matt Mackall <mpm@selenic.com> parents: 4985 diff changeset	336 e2 = (getoffset(entry[0]), entry[1], entry[3], entry[4],
58cc017ec7e0 revlog: abstract out index entry packing Matt Mackall <mpm@selenic.com> parents: 4985 diff changeset	337 node(entry[5]), node(entry[6]), entry[7])
5007 3addf4531643 revlog: localize some fastpath functions Matt Mackall <mpm@selenic.com> parents: 5006 diff changeset	338 return _pack(indexformatv0, *e2)
4986 58cc017ec7e0 revlog: abstract out index entry packing Matt Mackall <mpm@selenic.com> parents: 4985 diff changeset	339
4987 8d30004ada40 revlog: some basic code reordering Matt Mackall <mpm@selenic.com> parents: 4986 diff changeset	340 # index ng:
8d30004ada40 revlog: some basic code reordering Matt Mackall <mpm@selenic.com> parents: 4986 diff changeset	341 # 6 bytes offset
8d30004ada40 revlog: some basic code reordering Matt Mackall <mpm@selenic.com> parents: 4986 diff changeset	342 # 2 bytes flags
8d30004ada40 revlog: some basic code reordering Matt Mackall <mpm@selenic.com> parents: 4986 diff changeset	343 # 4 bytes compressed length
8d30004ada40 revlog: some basic code reordering Matt Mackall <mpm@selenic.com> parents: 4986 diff changeset	344 # 4 bytes uncompressed length
8d30004ada40 revlog: some basic code reordering Matt Mackall <mpm@selenic.com> parents: 4986 diff changeset	345 # 4 bytes: base rev
8d30004ada40 revlog: some basic code reordering Matt Mackall <mpm@selenic.com> parents: 4986 diff changeset	346 # 4 bytes link rev
8d30004ada40 revlog: some basic code reordering Matt Mackall <mpm@selenic.com> parents: 4986 diff changeset	347 # 4 bytes parent 1 rev
8d30004ada40 revlog: some basic code reordering Matt Mackall <mpm@selenic.com> parents: 4986 diff changeset	348 # 4 bytes parent 2 rev
8d30004ada40 revlog: some basic code reordering Matt Mackall <mpm@selenic.com> parents: 4986 diff changeset	349 # 32 bytes: nodeid
8d30004ada40 revlog: some basic code reordering Matt Mackall <mpm@selenic.com> parents: 4986 diff changeset	350 indexformatng = ">Qiiiiii20s12x"
8d30004ada40 revlog: some basic code reordering Matt Mackall <mpm@selenic.com> parents: 4986 diff changeset	351 ngshaoffset = 32
8d30004ada40 revlog: some basic code reordering Matt Mackall <mpm@selenic.com> parents: 4986 diff changeset	352 versionformat = ">I"
8d30004ada40 revlog: some basic code reordering Matt Mackall <mpm@selenic.com> parents: 4986 diff changeset	353
4972 8d0cf46e0dc6 revlog: add revlogio interface Matt Mackall <mpm@selenic.com> parents: 4971 diff changeset	354 class revlogio(object):
8d0cf46e0dc6 revlog: add revlogio interface Matt Mackall <mpm@selenic.com> parents: 4971 diff changeset	355 def __init__(self):
4977 6cb30bc4ca32 revlog: parse revlogv0 indexes into v1 internally Matt Mackall <mpm@selenic.com> parents: 4976 diff changeset	356 self.size = struct.calcsize(indexformatng)
4972 8d0cf46e0dc6 revlog: add revlogio interface Matt Mackall <mpm@selenic.com> parents: 4971 diff changeset	357
4985 e6525e459157 revlog: simplify revlog.__init__ Matt Mackall <mpm@selenic.com> parents: 4984 diff changeset	358 def parseindex(self, fp, inline):
e6525e459157 revlog: simplify revlog.__init__ Matt Mackall <mpm@selenic.com> parents: 4984 diff changeset	359 try:
e6525e459157 revlog: simplify revlog.__init__ Matt Mackall <mpm@selenic.com> parents: 4984 diff changeset	360 size = util.fstat(fp).st_size
e6525e459157 revlog: simplify revlog.__init__ Matt Mackall <mpm@selenic.com> parents: 4984 diff changeset	361 except AttributeError:
e6525e459157 revlog: simplify revlog.__init__ Matt Mackall <mpm@selenic.com> parents: 4984 diff changeset	362 size = 0
e6525e459157 revlog: simplify revlog.__init__ Matt Mackall <mpm@selenic.com> parents: 4984 diff changeset	363
5659 3da652f2039c util: get rid of is_win_9x wart Matt Mackall <mpm@selenic.com> parents: 5558 diff changeset	364 if util.openhardlinks() and not inline and size > 1000000:
4972 8d0cf46e0dc6 revlog: add revlogio interface Matt Mackall <mpm@selenic.com> parents: 4971 diff changeset	365 # big index, let's parse it on demand
4985 e6525e459157 revlog: simplify revlog.__init__ Matt Mackall <mpm@selenic.com> parents: 4984 diff changeset	366 parser = lazyparser(fp, size)
4972 8d0cf46e0dc6 revlog: add revlogio interface Matt Mackall <mpm@selenic.com> parents: 4971 diff changeset	367 index = lazyindex(parser)
8d0cf46e0dc6 revlog: add revlogio interface Matt Mackall <mpm@selenic.com> parents: 4971 diff changeset	368 nodemap = lazymap(parser)
8d0cf46e0dc6 revlog: add revlogio interface Matt Mackall <mpm@selenic.com> parents: 4971 diff changeset	369 e = list(index[0])
8d0cf46e0dc6 revlog: add revlogio interface Matt Mackall <mpm@selenic.com> parents: 4971 diff changeset	370 type = gettype(e[0])
8d0cf46e0dc6 revlog: add revlogio interface Matt Mackall <mpm@selenic.com> parents: 4971 diff changeset	371 e[0] = offset_type(0, type)
8d0cf46e0dc6 revlog: add revlogio interface Matt Mackall <mpm@selenic.com> parents: 4971 diff changeset	372 index[0] = e
4983 4dbcfc6e359e revlog: pull chunkcache back into revlog Matt Mackall <mpm@selenic.com> parents: 4982 diff changeset	373 return index, nodemap, None
4972 8d0cf46e0dc6 revlog: add revlogio interface Matt Mackall <mpm@selenic.com> parents: 4971 diff changeset	374
4975 8b7e480a7603 revlog: simplify the v1 immediate parser Matt Mackall <mpm@selenic.com> parents: 4974 diff changeset	375 data = fp.read()
7109 528b7fc1216c use the new parseindex implementation C in parsers Bernhard Leiner <bleiner@gmail.com> parents: 7089 diff changeset	376 # call the C implementation to parse the index data
528b7fc1216c use the new parseindex implementation C in parsers Bernhard Leiner <bleiner@gmail.com> parents: 7089 diff changeset	377 index, nodemap, cache = parsers.parse_index(data, inline)
4983 4dbcfc6e359e revlog: pull chunkcache back into revlog Matt Mackall <mpm@selenic.com> parents: 4982 diff changeset	378 return index, nodemap, cache
4972 8d0cf46e0dc6 revlog: add revlogio interface Matt Mackall <mpm@selenic.com> parents: 4971 diff changeset	379
5338 f87685355c9c revlog: fix revlogio.packentry corner case Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5325 diff changeset	380 def packentry(self, entry, node, version, rev):
5007 3addf4531643 revlog: localize some fastpath functions Matt Mackall <mpm@selenic.com> parents: 5006 diff changeset	381 p = _pack(indexformatng, *entry)
5338 f87685355c9c revlog: fix revlogio.packentry corner case Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5325 diff changeset	382 if rev == 0:
5007 3addf4531643 revlog: localize some fastpath functions Matt Mackall <mpm@selenic.com> parents: 5006 diff changeset	383 p = _pack(versionformat, version) + p[4:]
4986 58cc017ec7e0 revlog: abstract out index entry packing Matt Mackall <mpm@selenic.com> parents: 4985 diff changeset	384 return p
58cc017ec7e0 revlog: abstract out index entry packing Matt Mackall <mpm@selenic.com> parents: 4985 diff changeset	385
1559 59b3639df0a9 Convert all classes to new-style classes by deriving them from object. Eric Hopper <hopper@omnifarious.org> parents: 1551 diff changeset	386 class revlog(object):
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	387 """
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	388 the underlying revision storage object
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	389
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	390 A revlog consists of two parts, an index and the revision data.
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	391
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	392 The index is a file with a fixed record size containing
6912 b92baef99ebf Fixed docstring typos Martin Geisler <mg@daimi.au.dk> parents: 6891 diff changeset	393 information on each revision, including its nodeid (hash), the
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	394 nodeids of its parents, the position and offset of its data within
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	395 the data file, and the revision it's based on. Finally, each entry
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	396 contains a linkrev entry that can serve as a pointer to external
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	397 data.
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	398
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	399 The revision data itself is a linear collection of data chunks.
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	400 Each chunk represents a revision and is usually represented as a
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	401 delta against the previous chunk. To bound lookup time, runs of
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	402 deltas are limited to about 2 times the length of the original
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	403 version data. This makes retrieval of a version proportional to
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	404 its size, or O(1) relative to the number of revisions.
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	405
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	406 Both pieces of the revlog are written to in an append-only
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	407 fashion, which means we never need to rewrite a file to insert or
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	408 remove data, and can use some simple techniques to avoid the need
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	409 for locking while reading.
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	410 """
4258 b11a2fb59cf5 revlog: simplify revlog version handling Matt Mackall <mpm@selenic.com> parents: 4257 diff changeset	411 def __init__(self, opener, indexfile):
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	412 """
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	413 create a revlog object
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	414
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	415 opener is a function that abstracts the file opening operation
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	416 and can be used to implement COW semantics or the like.
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	417 """
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	418 self.indexfile = indexfile
4257 1b5c38e9d7aa revlog: don't pass datafile as an argument Matt Mackall <mpm@selenic.com> parents: 4224 diff changeset	419 self.datafile = indexfile[:-2] + ".d"
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	420 self.opener = opener
4984 b4066fcbd6ba revlog: mark cache private Matt Mackall <mpm@selenic.com> parents: 4983 diff changeset	421 self._cache = None
4983 4dbcfc6e359e revlog: pull chunkcache back into revlog Matt Mackall <mpm@selenic.com> parents: 4982 diff changeset	422 self._chunkcache = None
4985 e6525e459157 revlog: simplify revlog.__init__ Matt Mackall <mpm@selenic.com> parents: 4984 diff changeset	423 self.nodemap = {nullid: nullrev}
e6525e459157 revlog: simplify revlog.__init__ Matt Mackall <mpm@selenic.com> parents: 4984 diff changeset	424 self.index = []
e6525e459157 revlog: simplify revlog.__init__ Matt Mackall <mpm@selenic.com> parents: 4984 diff changeset	425
e6525e459157 revlog: simplify revlog.__init__ Matt Mackall <mpm@selenic.com> parents: 4984 diff changeset	426 v = REVLOG_DEFAULT_VERSION
4258 b11a2fb59cf5 revlog: simplify revlog version handling Matt Mackall <mpm@selenic.com> parents: 4257 diff changeset	427 if hasattr(opener, "defversion"):
4985 e6525e459157 revlog: simplify revlog.__init__ Matt Mackall <mpm@selenic.com> parents: 4984 diff changeset	428 v = opener.defversion
e6525e459157 revlog: simplify revlog.__init__ Matt Mackall <mpm@selenic.com> parents: 4984 diff changeset	429 if v & REVLOGNG:
e6525e459157 revlog: simplify revlog.__init__ Matt Mackall <mpm@selenic.com> parents: 4984 diff changeset	430 v \|= REVLOGNGINLINEDATA
116 e484cd5ec282 Only use lazy indexing for big indices and avoid the overhead of the mpm@selenic.com parents: 115 diff changeset	431
4985 e6525e459157 revlog: simplify revlog.__init__ Matt Mackall <mpm@selenic.com> parents: 4984 diff changeset	432 i = ""
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	433 try:
1784 2e0a288ca93e revalidate revlog data after locking the repo (issue132) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1749 diff changeset	434 f = self.opener(self.indexfile)
2079 ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	435 i = f.read(4)
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	436 f.seek(0)
4918 e017d3a82e1d revlog: raise offset/type helpers to global scope Matt Mackall <mpm@selenic.com> parents: 4746 diff changeset	437 if len(i) > 0:
e017d3a82e1d revlog: raise offset/type helpers to global scope Matt Mackall <mpm@selenic.com> parents: 4746 diff changeset	438 v = struct.unpack(versionformat, i)[0]
1322 b3d44e9b3092 Make revlog constructor more discerning in its treatment of errors. Bryan O'Sullivan <bos@serpentine.com> parents: 1232 diff changeset	439 except IOError, inst:
b3d44e9b3092 Make revlog constructor more discerning in its treatment of errors. Bryan O'Sullivan <bos@serpentine.com> parents: 1232 diff changeset	440 if inst.errno != errno.ENOENT:
b3d44e9b3092 Make revlog constructor more discerning in its treatment of errors. Bryan O'Sullivan <bos@serpentine.com> parents: 1232 diff changeset	441 raise
4985 e6525e459157 revlog: simplify revlog.__init__ Matt Mackall <mpm@selenic.com> parents: 4984 diff changeset	442
e6525e459157 revlog: simplify revlog.__init__ Matt Mackall <mpm@selenic.com> parents: 4984 diff changeset	443 self.version = v
e6525e459157 revlog: simplify revlog.__init__ Matt Mackall <mpm@selenic.com> parents: 4984 diff changeset	444 self._inline = v & REVLOGNGINLINEDATA
2073 1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	445 flags = v & ~0xFFFF
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	446 fmt = v & 0xFFFF
4985 e6525e459157 revlog: simplify revlog.__init__ Matt Mackall <mpm@selenic.com> parents: 4984 diff changeset	447 if fmt == REVLOGV0 and flags:
e6525e459157 revlog: simplify revlog.__init__ Matt Mackall <mpm@selenic.com> parents: 4984 diff changeset	448 raise RevlogError(_("index %s unknown flags %#04x for format v0")
e6525e459157 revlog: simplify revlog.__init__ Matt Mackall <mpm@selenic.com> parents: 4984 diff changeset	449 % (self.indexfile, flags >> 16))
e6525e459157 revlog: simplify revlog.__init__ Matt Mackall <mpm@selenic.com> parents: 4984 diff changeset	450 elif fmt == REVLOGNG and flags & ~REVLOGNGINLINEDATA:
e6525e459157 revlog: simplify revlog.__init__ Matt Mackall <mpm@selenic.com> parents: 4984 diff changeset	451 raise RevlogError(_("index %s unknown flags %#04x for revlogng")
e6525e459157 revlog: simplify revlog.__init__ Matt Mackall <mpm@selenic.com> parents: 4984 diff changeset	452 % (self.indexfile, flags >> 16))
e6525e459157 revlog: simplify revlog.__init__ Matt Mackall <mpm@selenic.com> parents: 4984 diff changeset	453 elif fmt > REVLOGNG:
3743 3a099154b110 Make revlog error slightly less scary Matt Mackall <mpm@selenic.com> parents: 3683 diff changeset	454 raise RevlogError(_("index %s unknown format %d")
3680 69cf255a55a1 Indentation cleanups for 2956948b81f3. Thomas Arendsen Hein <thomas@intevation.de> parents: 3679 diff changeset	455 % (self.indexfile, fmt))
4985 e6525e459157 revlog: simplify revlog.__init__ Matt Mackall <mpm@selenic.com> parents: 4984 diff changeset	456
4972 8d0cf46e0dc6 revlog: add revlogio interface Matt Mackall <mpm@selenic.com> parents: 4971 diff changeset	457 self._io = revlogio()
4971 3e6dae278c99 revlog: regroup parsing code Matt Mackall <mpm@selenic.com> parents: 4920 diff changeset	458 if self.version == REVLOGV0:
4972 8d0cf46e0dc6 revlog: add revlogio interface Matt Mackall <mpm@selenic.com> parents: 4971 diff changeset	459 self._io = revlogoldio()
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	460 if i:
8016 baaa832fd253 raise RevlogError when parser can't parse the revlog index Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7633 diff changeset	461 try:
baaa832fd253 raise RevlogError when parser can't parse the revlog index Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7633 diff changeset	462 d = self._io.parseindex(f, self._inline)
baaa832fd253 raise RevlogError when parser can't parse the revlog index Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7633 diff changeset	463 except (ValueError, IndexError), e:
baaa832fd253 raise RevlogError when parser can't parse the revlog index Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7633 diff changeset	464 raise RevlogError(_("index %s is corrupted") % (self.indexfile))
4983 4dbcfc6e359e revlog: pull chunkcache back into revlog Matt Mackall <mpm@selenic.com> parents: 4982 diff changeset	465 self.index, self.nodemap, self._chunkcache = d
4985 e6525e459157 revlog: simplify revlog.__init__ Matt Mackall <mpm@selenic.com> parents: 4984 diff changeset	466
7109 528b7fc1216c use the new parseindex implementation C in parsers Bernhard Leiner <bleiner@gmail.com> parents: 7089 diff changeset	467 # add the magic null revision at -1 (if it hasn't been done already)
528b7fc1216c use the new parseindex implementation C in parsers Bernhard Leiner <bleiner@gmail.com> parents: 7089 diff changeset	468 if (self.index == [] or isinstance(self.index, lazyindex) or
528b7fc1216c use the new parseindex implementation C in parsers Bernhard Leiner <bleiner@gmail.com> parents: 7089 diff changeset	469 self.index[-1][7] != nullid) :
528b7fc1216c use the new parseindex implementation C in parsers Bernhard Leiner <bleiner@gmail.com> parents: 7089 diff changeset	470 self.index.append((0, 0, 0, -1, -1, -1, -1, nullid))
116 e484cd5ec282 Only use lazy indexing for big indices and avoid the overhead of the mpm@selenic.com parents: 115 diff changeset	471
4920 ee983d0dbea8 revlog: privatize some methods Matt Mackall <mpm@selenic.com> parents: 4919 diff changeset	472 def _loadindex(self, start, end):
2079 ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	473 """load a block of indexes all at once from the lazy parser"""
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	474 if isinstance(self.index, lazyindex):
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	475 self.index.p.loadindex(start, end)
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	476
4920 ee983d0dbea8 revlog: privatize some methods Matt Mackall <mpm@selenic.com> parents: 4919 diff changeset	477 def _loadindexmap(self):
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	478 """loads both the map and the index from the lazy parser"""
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	479 if isinstance(self.index, lazyindex):
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	480 p = self.index.p
2079 ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	481 p.loadindex()
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	482 self.nodemap = p.map
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	483
4920 ee983d0dbea8 revlog: privatize some methods Matt Mackall <mpm@selenic.com> parents: 4919 diff changeset	484 def _loadmap(self):
2079 ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	485 """loads the map from the lazy parser"""
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	486 if isinstance(self.nodemap, lazymap):
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	487 self.nodemap.p.loadmap()
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	488 self.nodemap = self.nodemap.p.map
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	489
4980 fc44c8df9d99 revlog: some codingstyle cleanups Matt Mackall <mpm@selenic.com> parents: 4979 diff changeset	490 def tip(self):
fc44c8df9d99 revlog: some codingstyle cleanups Matt Mackall <mpm@selenic.com> parents: 4979 diff changeset	491 return self.node(len(self.index) - 2)
6750 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6703 diff changeset	492 def __len__(self):
4980 fc44c8df9d99 revlog: some codingstyle cleanups Matt Mackall <mpm@selenic.com> parents: 4979 diff changeset	493 return len(self.index) - 1
6750 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6703 diff changeset	494 def __iter__(self):
fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6703 diff changeset	495 for i in xrange(len(self)):
fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6703 diff changeset	496 yield i
1201 59bfbdbc38f6 revlog: raise informative exception if file is missing. Bryan O'Sullivan <bos@serpentine.com> parents: 1099 diff changeset	497 def rev(self, node):
59bfbdbc38f6 revlog: raise informative exception if file is missing. Bryan O'Sullivan <bos@serpentine.com> parents: 1099 diff changeset	498 try:
59bfbdbc38f6 revlog: raise informative exception if file is missing. Bryan O'Sullivan <bos@serpentine.com> parents: 1099 diff changeset	499 return self.nodemap[node]
59bfbdbc38f6 revlog: raise informative exception if file is missing. Bryan O'Sullivan <bos@serpentine.com> parents: 1099 diff changeset	500 except KeyError:
6228 c0c4c7b1e8d3 revlog: report node and file when lookup fails Matt Mackall <mpm@selenic.com> parents: 6212 diff changeset	501 raise LookupError(node, self.indexfile, _('no node'))
4980 fc44c8df9d99 revlog: some codingstyle cleanups Matt Mackall <mpm@selenic.com> parents: 4979 diff changeset	502 def node(self, rev):
fc44c8df9d99 revlog: some codingstyle cleanups Matt Mackall <mpm@selenic.com> parents: 4979 diff changeset	503 return self.index[rev][7]
7361 9fe97eea5510 linkrev: take a revision number rather than a hash Matt Mackall <mpm@selenic.com> parents: 7233 diff changeset	504 def linkrev(self, rev):
9fe97eea5510 linkrev: take a revision number rather than a hash Matt Mackall <mpm@selenic.com> parents: 7233 diff changeset	505 return self.index[rev][4]
2 ecf3fd948051 Handle nullid better for ancestor mpm@selenic.com parents: 0 diff changeset	506 def parents(self, node):
7363 9d28ff207030 revlog: speed up parents() Matt Mackall <mpm@selenic.com> parents: 7362 diff changeset	507 i = self.index
9d28ff207030 revlog: speed up parents() Matt Mackall <mpm@selenic.com> parents: 7362 diff changeset	508 d = i[self.rev(node)]
9d28ff207030 revlog: speed up parents() Matt Mackall <mpm@selenic.com> parents: 7362 diff changeset	509 return i[d[5]][7], i[d[6]][7] # map revisions to nodes inline
2489 568e58eed096 Add revlog.parentrevs function. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2354 diff changeset	510 def parentrevs(self, rev):
4979 06abdaf78788 revlog: add a magic null revision to our index Matt Mackall <mpm@selenic.com> parents: 4978 diff changeset	511 return self.index[rev][5:7]
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	512 def start(self, rev):
5006 c2febf5420e9 revlog: minor chunk speed-up Matt Mackall <mpm@selenic.com> parents: 5005 diff changeset	513 return int(self.index[rev][0] >> 16)
4980 fc44c8df9d99 revlog: some codingstyle cleanups Matt Mackall <mpm@selenic.com> parents: 4979 diff changeset	514 def end(self, rev):
fc44c8df9d99 revlog: some codingstyle cleanups Matt Mackall <mpm@selenic.com> parents: 4979 diff changeset	515 return self.start(rev) + self.length(rev)
fc44c8df9d99 revlog: some codingstyle cleanups Matt Mackall <mpm@selenic.com> parents: 4979 diff changeset	516 def length(self, rev):
fc44c8df9d99 revlog: some codingstyle cleanups Matt Mackall <mpm@selenic.com> parents: 4979 diff changeset	517 return self.index[rev][1]
fc44c8df9d99 revlog: some codingstyle cleanups Matt Mackall <mpm@selenic.com> parents: 4979 diff changeset	518 def base(self, rev):
fc44c8df9d99 revlog: some codingstyle cleanups Matt Mackall <mpm@selenic.com> parents: 4979 diff changeset	519 return self.index[rev][3]
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	520
2078 441ea218414e Fill in the uncompressed size during revlog.addgroup mason@suse.com parents: 2077 diff changeset	521 def size(self, rev):
441ea218414e Fill in the uncompressed size during revlog.addgroup mason@suse.com parents: 2077 diff changeset	522 """return the length of the uncompressed text for a given revision"""
4977 6cb30bc4ca32 revlog: parse revlogv0 indexes into v1 internally Matt Mackall <mpm@selenic.com> parents: 4976 diff changeset	523 l = self.index[rev][2]
2078 441ea218414e Fill in the uncompressed size during revlog.addgroup mason@suse.com parents: 2077 diff changeset	524 if l >= 0:
441ea218414e Fill in the uncompressed size during revlog.addgroup mason@suse.com parents: 2077 diff changeset	525 return l
441ea218414e Fill in the uncompressed size during revlog.addgroup mason@suse.com parents: 2077 diff changeset	526
441ea218414e Fill in the uncompressed size during revlog.addgroup mason@suse.com parents: 2077 diff changeset	527 t = self.revision(self.node(rev))
441ea218414e Fill in the uncompressed size during revlog.addgroup mason@suse.com parents: 2077 diff changeset	528 return len(t)
441ea218414e Fill in the uncompressed size during revlog.addgroup mason@suse.com parents: 2077 diff changeset	529
441ea218414e Fill in the uncompressed size during revlog.addgroup mason@suse.com parents: 2077 diff changeset	530 # alternate implementation, The advantage to this code is it
441ea218414e Fill in the uncompressed size during revlog.addgroup mason@suse.com parents: 2077 diff changeset	531 # will be faster for a single revision. But, the results are not
441ea218414e Fill in the uncompressed size during revlog.addgroup mason@suse.com parents: 2077 diff changeset	532 # cached, so finding the size of every revision will be slower.
441ea218414e Fill in the uncompressed size during revlog.addgroup mason@suse.com parents: 2077 diff changeset	533 """
441ea218414e Fill in the uncompressed size during revlog.addgroup mason@suse.com parents: 2077 diff changeset	534 if self.cache and self.cache[1] == rev:
441ea218414e Fill in the uncompressed size during revlog.addgroup mason@suse.com parents: 2077 diff changeset	535 return len(self.cache[2])
441ea218414e Fill in the uncompressed size during revlog.addgroup mason@suse.com parents: 2077 diff changeset	536
441ea218414e Fill in the uncompressed size during revlog.addgroup mason@suse.com parents: 2077 diff changeset	537 base = self.base(rev)
441ea218414e Fill in the uncompressed size during revlog.addgroup mason@suse.com parents: 2077 diff changeset	538 if self.cache and self.cache[1] >= base and self.cache[1] < rev:
441ea218414e Fill in the uncompressed size during revlog.addgroup mason@suse.com parents: 2077 diff changeset	539 base = self.cache[1]
441ea218414e Fill in the uncompressed size during revlog.addgroup mason@suse.com parents: 2077 diff changeset	540 text = self.cache[2]
441ea218414e Fill in the uncompressed size during revlog.addgroup mason@suse.com parents: 2077 diff changeset	541 else:
441ea218414e Fill in the uncompressed size during revlog.addgroup mason@suse.com parents: 2077 diff changeset	542 text = self.revision(self.node(base))
441ea218414e Fill in the uncompressed size during revlog.addgroup mason@suse.com parents: 2077 diff changeset	543
441ea218414e Fill in the uncompressed size during revlog.addgroup mason@suse.com parents: 2077 diff changeset	544 l = len(text)
441ea218414e Fill in the uncompressed size during revlog.addgroup mason@suse.com parents: 2077 diff changeset	545 for x in xrange(base + 1, rev + 1):
441ea218414e Fill in the uncompressed size during revlog.addgroup mason@suse.com parents: 2077 diff changeset	546 l = mdiff.patchedsize(l, self.chunk(x))
441ea218414e Fill in the uncompressed size during revlog.addgroup mason@suse.com parents: 2077 diff changeset	547 return l
441ea218414e Fill in the uncompressed size during revlog.addgroup mason@suse.com parents: 2077 diff changeset	548 """
441ea218414e Fill in the uncompressed size during revlog.addgroup mason@suse.com parents: 2077 diff changeset	549
3630 508036290b00 revlog: reachable actually takes a node Matt Mackall <mpm@selenic.com> parents: 3585 diff changeset	550 def reachable(self, node, stop=None):
3683 b0fd43effdb3 add docstring to reachable Matt Mackall <mpm@selenic.com> parents: 3680 diff changeset	551 """return a hash of all nodes ancestral to a given node, including
b0fd43effdb3 add docstring to reachable Matt Mackall <mpm@selenic.com> parents: 3680 diff changeset	552 the node itself, stopping when stop is matched"""
1074 55bf5cfde69e Add revlog.reachable to find a graph of ancestors for a given rev mason@suse.com parents: 1073 diff changeset	553 reachable = {}
3630 508036290b00 revlog: reachable actually takes a node Matt Mackall <mpm@selenic.com> parents: 3585 diff changeset	554 visit = [node]
508036290b00 revlog: reachable actually takes a node Matt Mackall <mpm@selenic.com> parents: 3585 diff changeset	555 reachable[node] = 1
1074 55bf5cfde69e Add revlog.reachable to find a graph of ancestors for a given rev mason@suse.com parents: 1073 diff changeset	556 if stop:
55bf5cfde69e Add revlog.reachable to find a graph of ancestors for a given rev mason@suse.com parents: 1073 diff changeset	557 stopn = self.rev(stop)
55bf5cfde69e Add revlog.reachable to find a graph of ancestors for a given rev mason@suse.com parents: 1073 diff changeset	558 else:
55bf5cfde69e Add revlog.reachable to find a graph of ancestors for a given rev mason@suse.com parents: 1073 diff changeset	559 stopn = 0
55bf5cfde69e Add revlog.reachable to find a graph of ancestors for a given rev mason@suse.com parents: 1073 diff changeset	560 while visit:
55bf5cfde69e Add revlog.reachable to find a graph of ancestors for a given rev mason@suse.com parents: 1073 diff changeset	561 n = visit.pop(0)
55bf5cfde69e Add revlog.reachable to find a graph of ancestors for a given rev mason@suse.com parents: 1073 diff changeset	562 if n == stop:
55bf5cfde69e Add revlog.reachable to find a graph of ancestors for a given rev mason@suse.com parents: 1073 diff changeset	563 continue
55bf5cfde69e Add revlog.reachable to find a graph of ancestors for a given rev mason@suse.com parents: 1073 diff changeset	564 if n == nullid:
55bf5cfde69e Add revlog.reachable to find a graph of ancestors for a given rev mason@suse.com parents: 1073 diff changeset	565 continue
55bf5cfde69e Add revlog.reachable to find a graph of ancestors for a given rev mason@suse.com parents: 1073 diff changeset	566 for p in self.parents(n):
55bf5cfde69e Add revlog.reachable to find a graph of ancestors for a given rev mason@suse.com parents: 1073 diff changeset	567 if self.rev(p) < stopn:
55bf5cfde69e Add revlog.reachable to find a graph of ancestors for a given rev mason@suse.com parents: 1073 diff changeset	568 continue
55bf5cfde69e Add revlog.reachable to find a graph of ancestors for a given rev mason@suse.com parents: 1073 diff changeset	569 if p not in reachable:
55bf5cfde69e Add revlog.reachable to find a graph of ancestors for a given rev mason@suse.com parents: 1073 diff changeset	570 reachable[p] = 1
55bf5cfde69e Add revlog.reachable to find a graph of ancestors for a given rev mason@suse.com parents: 1073 diff changeset	571 visit.append(p)
55bf5cfde69e Add revlog.reachable to find a graph of ancestors for a given rev mason@suse.com parents: 1073 diff changeset	572 return reachable
55bf5cfde69e Add revlog.reachable to find a graph of ancestors for a given rev mason@suse.com parents: 1073 diff changeset	573
6872 c7cc40fd74f6 Add ancestors and descendants to revlog Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6750 diff changeset	574 def ancestors(self, *revs):
c7cc40fd74f6 Add ancestors and descendants to revlog Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6750 diff changeset	575 'Generate the ancestors of revs using a breadth-first visit'
c7cc40fd74f6 Add ancestors and descendants to revlog Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6750 diff changeset	576 visit = list(revs)
8150 bbc24c0753a0 util: use built-in set and frozenset Martin Geisler <mg@lazybytes.net> parents: 8073 diff changeset	577 seen = set([nullrev])
6872 c7cc40fd74f6 Add ancestors and descendants to revlog Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6750 diff changeset	578 while visit:
c7cc40fd74f6 Add ancestors and descendants to revlog Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6750 diff changeset	579 for parent in self.parentrevs(visit.pop(0)):
c7cc40fd74f6 Add ancestors and descendants to revlog Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6750 diff changeset	580 if parent not in seen:
c7cc40fd74f6 Add ancestors and descendants to revlog Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6750 diff changeset	581 visit.append(parent)
c7cc40fd74f6 Add ancestors and descendants to revlog Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6750 diff changeset	582 seen.add(parent)
c7cc40fd74f6 Add ancestors and descendants to revlog Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6750 diff changeset	583 yield parent
c7cc40fd74f6 Add ancestors and descendants to revlog Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6750 diff changeset	584
c7cc40fd74f6 Add ancestors and descendants to revlog Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6750 diff changeset	585 def descendants(self, *revs):
c7cc40fd74f6 Add ancestors and descendants to revlog Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6750 diff changeset	586 'Generate the descendants of revs in topological order'
8150 bbc24c0753a0 util: use built-in set and frozenset Martin Geisler <mg@lazybytes.net> parents: 8073 diff changeset	587 seen = set(revs)
6872 c7cc40fd74f6 Add ancestors and descendants to revlog Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6750 diff changeset	588 for i in xrange(min(revs) + 1, len(self)):
c7cc40fd74f6 Add ancestors and descendants to revlog Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6750 diff changeset	589 for x in self.parentrevs(i):
c7cc40fd74f6 Add ancestors and descendants to revlog Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6750 diff changeset	590 if x != nullrev and x in seen:
c7cc40fd74f6 Add ancestors and descendants to revlog Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6750 diff changeset	591 seen.add(i)
c7cc40fd74f6 Add ancestors and descendants to revlog Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6750 diff changeset	592 yield i
c7cc40fd74f6 Add ancestors and descendants to revlog Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6750 diff changeset	593 break
c7cc40fd74f6 Add ancestors and descendants to revlog Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6750 diff changeset	594
7233 9f0e52e1df77 fix pull racing with push/commit (issue1320) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7109 diff changeset	595 def findmissing(self, common=None, heads=None):
9f0e52e1df77 fix pull racing with push/commit (issue1320) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7109 diff changeset	596 '''
9f0e52e1df77 fix pull racing with push/commit (issue1320) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7109 diff changeset	597 returns the topologically sorted list of nodes from the set:
9f0e52e1df77 fix pull racing with push/commit (issue1320) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7109 diff changeset	598 missing = (ancestors(heads) \ ancestors(common))
9f0e52e1df77 fix pull racing with push/commit (issue1320) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7109 diff changeset	599
9f0e52e1df77 fix pull racing with push/commit (issue1320) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7109 diff changeset	600 where ancestors() is the set of ancestors from heads, heads included
9f0e52e1df77 fix pull racing with push/commit (issue1320) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7109 diff changeset	601
9f0e52e1df77 fix pull racing with push/commit (issue1320) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7109 diff changeset	602 if heads is None, the heads of the revlog are used
9f0e52e1df77 fix pull racing with push/commit (issue1320) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7109 diff changeset	603 if common is None, nullid is assumed to be a common node
9f0e52e1df77 fix pull racing with push/commit (issue1320) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7109 diff changeset	604 '''
9f0e52e1df77 fix pull racing with push/commit (issue1320) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7109 diff changeset	605 if common is None:
9f0e52e1df77 fix pull racing with push/commit (issue1320) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7109 diff changeset	606 common = [nullid]
9f0e52e1df77 fix pull racing with push/commit (issue1320) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7109 diff changeset	607 if heads is None:
9f0e52e1df77 fix pull racing with push/commit (issue1320) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7109 diff changeset	608 heads = self.heads()
9f0e52e1df77 fix pull racing with push/commit (issue1320) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7109 diff changeset	609
9f0e52e1df77 fix pull racing with push/commit (issue1320) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7109 diff changeset	610 common = [self.rev(n) for n in common]
9f0e52e1df77 fix pull racing with push/commit (issue1320) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7109 diff changeset	611 heads = [self.rev(n) for n in heads]
9f0e52e1df77 fix pull racing with push/commit (issue1320) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7109 diff changeset	612
9f0e52e1df77 fix pull racing with push/commit (issue1320) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7109 diff changeset	613 # we want the ancestors, but inclusive
8152 08e1baf924ca replace set-like dictionaries with real sets Martin Geisler <mg@lazybytes.net> parents: 8150 diff changeset	614 has = set(self.ancestors(*common))
08e1baf924ca replace set-like dictionaries with real sets Martin Geisler <mg@lazybytes.net> parents: 8150 diff changeset	615 has.add(nullrev)
08e1baf924ca replace set-like dictionaries with real sets Martin Geisler <mg@lazybytes.net> parents: 8150 diff changeset	616 has.update(common)
7233 9f0e52e1df77 fix pull racing with push/commit (issue1320) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7109 diff changeset	617
9f0e52e1df77 fix pull racing with push/commit (issue1320) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7109 diff changeset	618 # take all ancestors from heads that aren't in has
9f0e52e1df77 fix pull racing with push/commit (issue1320) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7109 diff changeset	619 missing = {}
9f0e52e1df77 fix pull racing with push/commit (issue1320) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7109 diff changeset	620 visit = [r for r in heads if r not in has]
9f0e52e1df77 fix pull racing with push/commit (issue1320) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7109 diff changeset	621 while visit:
9f0e52e1df77 fix pull racing with push/commit (issue1320) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7109 diff changeset	622 r = visit.pop(0)
9f0e52e1df77 fix pull racing with push/commit (issue1320) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7109 diff changeset	623 if r in missing:
9f0e52e1df77 fix pull racing with push/commit (issue1320) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7109 diff changeset	624 continue
9f0e52e1df77 fix pull racing with push/commit (issue1320) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7109 diff changeset	625 else:
9f0e52e1df77 fix pull racing with push/commit (issue1320) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7109 diff changeset	626 missing[r] = None
9f0e52e1df77 fix pull racing with push/commit (issue1320) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7109 diff changeset	627 for p in self.parentrevs(r):
9f0e52e1df77 fix pull racing with push/commit (issue1320) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7109 diff changeset	628 if p not in has:
9f0e52e1df77 fix pull racing with push/commit (issue1320) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7109 diff changeset	629 visit.append(p)
9f0e52e1df77 fix pull racing with push/commit (issue1320) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7109 diff changeset	630 missing = missing.keys()
9f0e52e1df77 fix pull racing with push/commit (issue1320) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7109 diff changeset	631 missing.sort()
9f0e52e1df77 fix pull racing with push/commit (issue1320) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7109 diff changeset	632 return [self.node(r) for r in missing]
9f0e52e1df77 fix pull racing with push/commit (issue1320) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 7109 diff changeset	633
1457 518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	634 def nodesbetween(self, roots=None, heads=None):
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	635 """Return a tuple containing three elements. Elements 1 and 2 contain
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	636 a final list bases and heads after all the unreachable ones have been
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	637 pruned. Element 0 contains a topologically sorted list of all
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	638
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	639 nodes that satisfy these constraints:
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	640 1. All nodes must be descended from a node in roots (the nodes on
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	641 roots are considered descended from themselves).
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	642 2. All nodes must also be ancestors of a node in heads (the nodes in
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	643 heads are considered to be their own ancestors).
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	644
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	645 If roots is unspecified, nullid is assumed as the only root.
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	646 If heads is unspecified, it is taken to be the output of the
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	647 heads method (i.e. a list of all nodes in the repository that
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	648 have no children)."""
1463 26e73acc0cdf Fix to handle case of empty list for roots or heads in nodesbetween. Eric Hopper <hopper@omnifarious.org> parents: 1459 diff changeset	649 nonodes = ([], [], [])
1457 518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	650 if roots is not None:
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	651 roots = list(roots)
1463 26e73acc0cdf Fix to handle case of empty list for roots or heads in nodesbetween. Eric Hopper <hopper@omnifarious.org> parents: 1459 diff changeset	652 if not roots:
26e73acc0cdf Fix to handle case of empty list for roots or heads in nodesbetween. Eric Hopper <hopper@omnifarious.org> parents: 1459 diff changeset	653 return nonodes
1457 518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	654 lowestrev = min([self.rev(n) for n in roots])
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	655 else:
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	656 roots = [nullid] # Everybody's a descendent of nullid
3578 3b4e00cba57a Define and use nullrev (revision of nullid) instead of -1. Thomas Arendsen Hein <thomas@intevation.de> parents: 3508 diff changeset	657 lowestrev = nullrev
3b4e00cba57a Define and use nullrev (revision of nullid) instead of -1. Thomas Arendsen Hein <thomas@intevation.de> parents: 3508 diff changeset	658 if (lowestrev == nullrev) and (heads is None):
1457 518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	659 # We want _all_ the nodes!
6750 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6703 diff changeset	660 return ([self.node(r) for r in self], [nullid], list(self.heads()))
1457 518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	661 if heads is None:
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	662 # All nodes are ancestors, so the latest ancestor is the last
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	663 # node.
6750 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6703 diff changeset	664 highestrev = len(self) - 1
1457 518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	665 # Set ancestors to None to signal that every node is an ancestor.
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	666 ancestors = None
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	667 # Set heads to an empty dictionary for later discovery of heads
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	668 heads = {}
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	669 else:
1463 26e73acc0cdf Fix to handle case of empty list for roots or heads in nodesbetween. Eric Hopper <hopper@omnifarious.org> parents: 1459 diff changeset	670 heads = list(heads)
26e73acc0cdf Fix to handle case of empty list for roots or heads in nodesbetween. Eric Hopper <hopper@omnifarious.org> parents: 1459 diff changeset	671 if not heads:
26e73acc0cdf Fix to handle case of empty list for roots or heads in nodesbetween. Eric Hopper <hopper@omnifarious.org> parents: 1459 diff changeset	672 return nonodes
1457 518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	673 ancestors = {}
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	674 # Turn heads into a dictionary so we can remove 'fake' heads.
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	675 # Also, later we will be using it to filter out the heads we can't
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	676 # find from roots.
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	677 heads = dict.fromkeys(heads, 0)
3360 ef8307585b41 nodesbetween: fix a bug with duplicate heads Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3335 diff changeset	678 # Start at the top and keep marking parents until we're done.
8163 62d7287fe6b0 rebase, revlog: use set(x) instead of set(x.keys()) Martin Geisler <mg@lazybytes.net> parents: 8153 diff changeset	679 nodestotag = set(heads)
1457 518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	680 # Remember where the top was so we can use it as a limit later.
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	681 highestrev = max([self.rev(n) for n in nodestotag])
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	682 while nodestotag:
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	683 # grab a node to tag
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	684 n = nodestotag.pop()
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	685 # Never tag nullid
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	686 if n == nullid:
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	687 continue
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	688 # A node's revision number represents its place in a
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	689 # topologically sorted list of nodes.
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	690 r = self.rev(n)
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	691 if r >= lowestrev:
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	692 if n not in ancestors:
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	693 # If we are possibly a descendent of one of the roots
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	694 # and we haven't already been marked as an ancestor
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	695 ancestors[n] = 1 # Mark as ancestor
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	696 # Add non-nullid parents to list of nodes to tag.
8153 616f20e1004a revlog: let nodestotag be a set instead of a list Martin Geisler <mg@lazybytes.net> parents: 8152 diff changeset	697 nodestotag.update([p for p in self.parents(n) if
1457 518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	698 p != nullid])
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	699 elif n in heads: # We've seen it before, is it a fake head?
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	700 # So it is, real heads should not be the ancestors of
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	701 # any other heads.
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	702 heads.pop(n)
1459 106fdec8e1fb Fix small bug in nodesbetween if heads is [nullid]. Eric Hopper <hopper@omnifarious.org> parents: 1458 diff changeset	703 if not ancestors:
1463 26e73acc0cdf Fix to handle case of empty list for roots or heads in nodesbetween. Eric Hopper <hopper@omnifarious.org> parents: 1459 diff changeset	704 return nonodes
1457 518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	705 # Now that we have our set of ancestors, we want to remove any
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	706 # roots that are not ancestors.
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	707
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	708 # If one of the roots was nullid, everything is included anyway.
3578 3b4e00cba57a Define and use nullrev (revision of nullid) instead of -1. Thomas Arendsen Hein <thomas@intevation.de> parents: 3508 diff changeset	709 if lowestrev > nullrev:
1457 518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	710 # But, since we weren't, let's recompute the lowest rev to not
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	711 # include roots that aren't ancestors.
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	712
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	713 # Filter out roots that aren't ancestors of heads
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	714 roots = [n for n in roots if n in ancestors]
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	715 # Recompute the lowest revision
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	716 if roots:
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	717 lowestrev = min([self.rev(n) for n in roots])
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	718 else:
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	719 # No more roots? Return empty list
1463 26e73acc0cdf Fix to handle case of empty list for roots or heads in nodesbetween. Eric Hopper <hopper@omnifarious.org> parents: 1459 diff changeset	720 return nonodes
1457 518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	721 else:
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	722 # We are descending from nullid, and don't need to care about
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	723 # any other roots.
3578 3b4e00cba57a Define and use nullrev (revision of nullid) instead of -1. Thomas Arendsen Hein <thomas@intevation.de> parents: 3508 diff changeset	724 lowestrev = nullrev
1457 518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	725 roots = [nullid]
8152 08e1baf924ca replace set-like dictionaries with real sets Martin Geisler <mg@lazybytes.net> parents: 8150 diff changeset	726 # Transform our roots list into a set.
08e1baf924ca replace set-like dictionaries with real sets Martin Geisler <mg@lazybytes.net> parents: 8150 diff changeset	727 descendents = set(roots)
1457 518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	728 # Also, keep the original roots so we can filter out roots that aren't
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	729 # 'real' roots (i.e. are descended from other roots).
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	730 roots = descendents.copy()
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	731 # Our topologically sorted list of output nodes.
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	732 orderedout = []
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	733 # Don't start at nullid since we don't want nullid in our output list,
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	734 # and if nullid shows up in descedents, empty parents will look like
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	735 # they're descendents.
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	736 for r in xrange(max(lowestrev, 0), highestrev + 1):
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	737 n = self.node(r)
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	738 isdescendent = False
3578 3b4e00cba57a Define and use nullrev (revision of nullid) instead of -1. Thomas Arendsen Hein <thomas@intevation.de> parents: 3508 diff changeset	739 if lowestrev == nullrev: # Everybody is a descendent of nullid
1457 518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	740 isdescendent = True
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	741 elif n in descendents:
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	742 # n is already a descendent
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	743 isdescendent = True
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	744 # This check only needs to be done here because all the roots
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	745 # will start being marked is descendents before the loop.
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	746 if n in roots:
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	747 # If n was a root, check if it's a 'real' root.
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	748 p = tuple(self.parents(n))
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	749 # If any of its parents are descendents, it's not a root.
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	750 if (p[0] in descendents) or (p[1] in descendents):
8152 08e1baf924ca replace set-like dictionaries with real sets Martin Geisler <mg@lazybytes.net> parents: 8150 diff changeset	751 roots.remove(n)
1457 518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	752 else:
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	753 p = tuple(self.parents(n))
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	754 # A node is a descendent if either of its parents are
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	755 # descendents. (We seeded the dependents list with the roots
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	756 # up there, remember?)
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	757 if (p[0] in descendents) or (p[1] in descendents):
8152 08e1baf924ca replace set-like dictionaries with real sets Martin Geisler <mg@lazybytes.net> parents: 8150 diff changeset	758 descendents.add(n)
1457 518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	759 isdescendent = True
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	760 if isdescendent and ((ancestors is None) or (n in ancestors)):
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	761 # Only include nodes that are both descendents and ancestors.
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	762 orderedout.append(n)
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	763 if (ancestors is not None) and (n in heads):
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	764 # We're trying to figure out which heads are reachable
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	765 # from roots.
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	766 # Mark this head as having been reached
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	767 heads[n] = 1
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	768 elif ancestors is None:
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	769 # Otherwise, we're trying to discover the heads.
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	770 # Assume this is a head because if it isn't, the next step
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	771 # will eventually remove it.
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	772 heads[n] = 1
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	773 # But, obviously its parents aren't.
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	774 for p in self.parents(n):
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	775 heads.pop(p, None)
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	776 heads = [n for n in heads.iterkeys() if heads[n] != 0]
8152 08e1baf924ca replace set-like dictionaries with real sets Martin Geisler <mg@lazybytes.net> parents: 8150 diff changeset	777 roots = list(roots)
1457 518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	778 assert orderedout
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	779 assert roots
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	780 assert heads
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	781 return (orderedout, roots, heads)
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	782
3923 27230c29bfec fix calculation of new heads added during push with -r Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3755 diff changeset	783 def heads(self, start=None, stop=None):
1550 ccb9b62de892 add a -r/--rev option to heads to show only heads descendant from rev Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1535 diff changeset	784 """return the list of all nodes that have no children
1551 e793cbc8be00 Fixes to "hg heads -r FOO": Thomas Arendsen Hein <thomas@intevation.de> parents: 1550 diff changeset	785
e793cbc8be00 Fixes to "hg heads -r FOO": Thomas Arendsen Hein <thomas@intevation.de> parents: 1550 diff changeset	786 if start is specified, only heads that are descendants of
e793cbc8be00 Fixes to "hg heads -r FOO": Thomas Arendsen Hein <thomas@intevation.de> parents: 1550 diff changeset	787 start will be returned
3923 27230c29bfec fix calculation of new heads added during push with -r Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3755 diff changeset	788 if stop is specified, it will consider all the revs from stop
27230c29bfec fix calculation of new heads added during push with -r Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3755 diff changeset	789 as if they had no children
1551 e793cbc8be00 Fixes to "hg heads -r FOO": Thomas Arendsen Hein <thomas@intevation.de> parents: 1550 diff changeset	790 """
4991 9c8c42bcf17a revlog: implement a fast path for heads Matt Mackall <mpm@selenic.com> parents: 4990 diff changeset	791 if start is None and stop is None:
6750 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6703 diff changeset	792 count = len(self)
4991 9c8c42bcf17a revlog: implement a fast path for heads Matt Mackall <mpm@selenic.com> parents: 4990 diff changeset	793 if not count:
9c8c42bcf17a revlog: implement a fast path for heads Matt Mackall <mpm@selenic.com> parents: 4990 diff changeset	794 return [nullid]
9c8c42bcf17a revlog: implement a fast path for heads Matt Mackall <mpm@selenic.com> parents: 4990 diff changeset	795 ishead = [1] * (count + 1)
9c8c42bcf17a revlog: implement a fast path for heads Matt Mackall <mpm@selenic.com> parents: 4990 diff changeset	796 index = self.index
7089 c57b30f1bc15 revlog: fix heads performance regression Matt Mackall <mpm@selenic.com> parents: 7062 diff changeset	797 for r in xrange(count):
4991 9c8c42bcf17a revlog: implement a fast path for heads Matt Mackall <mpm@selenic.com> parents: 4990 diff changeset	798 e = index[r]
9c8c42bcf17a revlog: implement a fast path for heads Matt Mackall <mpm@selenic.com> parents: 4990 diff changeset	799 ishead[e[5]] = ishead[e[6]] = 0
7089 c57b30f1bc15 revlog: fix heads performance regression Matt Mackall <mpm@selenic.com> parents: 7062 diff changeset	800 return [self.node(r) for r in xrange(count) if ishead[r]]
4991 9c8c42bcf17a revlog: implement a fast path for heads Matt Mackall <mpm@selenic.com> parents: 4990 diff changeset	801
1551 e793cbc8be00 Fixes to "hg heads -r FOO": Thomas Arendsen Hein <thomas@intevation.de> parents: 1550 diff changeset	802 if start is None:
e793cbc8be00 Fixes to "hg heads -r FOO": Thomas Arendsen Hein <thomas@intevation.de> parents: 1550 diff changeset	803 start = nullid
3923 27230c29bfec fix calculation of new heads added during push with -r Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3755 diff changeset	804 if stop is None:
27230c29bfec fix calculation of new heads added during push with -r Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3755 diff changeset	805 stop = []
8152 08e1baf924ca replace set-like dictionaries with real sets Martin Geisler <mg@lazybytes.net> parents: 8150 diff changeset	806 stoprevs = set([self.rev(n) for n in stop])
1550 ccb9b62de892 add a -r/--rev option to heads to show only heads descendant from rev Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1535 diff changeset	807 startrev = self.rev(start)
2490 6ff82ec1f4b8 Change revlog.heads to walk the revision graph using revision numbers Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2489 diff changeset	808 reachable = {startrev: 1}
6ff82ec1f4b8 Change revlog.heads to walk the revision graph using revision numbers Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2489 diff changeset	809 heads = {startrev: 1}
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	810
2490 6ff82ec1f4b8 Change revlog.heads to walk the revision graph using revision numbers Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2489 diff changeset	811 parentrevs = self.parentrevs
6750 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6703 diff changeset	812 for r in xrange(startrev + 1, len(self)):
2490 6ff82ec1f4b8 Change revlog.heads to walk the revision graph using revision numbers Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2489 diff changeset	813 for p in parentrevs(r):
6ff82ec1f4b8 Change revlog.heads to walk the revision graph using revision numbers Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2489 diff changeset	814 if p in reachable:
3923 27230c29bfec fix calculation of new heads added during push with -r Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3755 diff changeset	815 if r not in stoprevs:
27230c29bfec fix calculation of new heads added during push with -r Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3755 diff changeset	816 reachable[r] = 1
2490 6ff82ec1f4b8 Change revlog.heads to walk the revision graph using revision numbers Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2489 diff changeset	817 heads[r] = 1
3923 27230c29bfec fix calculation of new heads added during push with -r Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3755 diff changeset	818 if p in heads and p not in stoprevs:
2490 6ff82ec1f4b8 Change revlog.heads to walk the revision graph using revision numbers Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2489 diff changeset	819 del heads[p]
3923 27230c29bfec fix calculation of new heads added during push with -r Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3755 diff changeset	820
2490 6ff82ec1f4b8 Change revlog.heads to walk the revision graph using revision numbers Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2489 diff changeset	821 return [self.node(r) for r in heads]
370 c90385d82aec revlog: add a children function mpm@selenic.com parents: 330 diff changeset	822
c90385d82aec revlog: add a children function mpm@selenic.com parents: 330 diff changeset	823 def children(self, node):
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	824 """find the children of a given node"""
370 c90385d82aec revlog: add a children function mpm@selenic.com parents: 330 diff changeset	825 c = []
c90385d82aec revlog: add a children function mpm@selenic.com parents: 330 diff changeset	826 p = self.rev(node)
6750 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6703 diff changeset	827 for r in range(p + 1, len(self)):
4746 62c56d8f368b Fix revlog.children so the real children of the null revision can be calculated. Thomas Arendsen Hein <thomas@intevation.de> parents: 4635 diff changeset	828 prevs = [pr for pr in self.parentrevs(r) if pr != nullrev]
62c56d8f368b Fix revlog.children so the real children of the null revision can be calculated. Thomas Arendsen Hein <thomas@intevation.de> parents: 4635 diff changeset	829 if prevs:
62c56d8f368b Fix revlog.children so the real children of the null revision can be calculated. Thomas Arendsen Hein <thomas@intevation.de> parents: 4635 diff changeset	830 for pr in prevs:
62c56d8f368b Fix revlog.children so the real children of the null revision can be calculated. Thomas Arendsen Hein <thomas@intevation.de> parents: 4635 diff changeset	831 if pr == p:
62c56d8f368b Fix revlog.children so the real children of the null revision can be calculated. Thomas Arendsen Hein <thomas@intevation.de> parents: 4635 diff changeset	832 c.append(self.node(r))
62c56d8f368b Fix revlog.children so the real children of the null revision can be calculated. Thomas Arendsen Hein <thomas@intevation.de> parents: 4635 diff changeset	833 elif p == nullrev:
62c56d8f368b Fix revlog.children so the real children of the null revision can be calculated. Thomas Arendsen Hein <thomas@intevation.de> parents: 4635 diff changeset	834 c.append(self.node(r))
370 c90385d82aec revlog: add a children function mpm@selenic.com parents: 330 diff changeset	835 return c
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 484 diff changeset	836
3453 dba3cadef789 Only look up tags and branches as a last resort Matt Mackall <mpm@selenic.com> parents: 3438 diff changeset	837 def _match(self, id):
3210 7240f9e47144 correctly find the type of 'id' in revlog.lookup Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3157 diff changeset	838 if isinstance(id, (long, int)):
3156 d01e4cb2f5f2 cleanups in revlog.lookup Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3139 diff changeset	839 # rev
2641 156fb1feab62 lookup should allow -1 to represent nullid (if passed an int as arg) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2600 diff changeset	840 return self.node(id)
3438 b17f9d3eda74 revlog.lookup tweaks Matt Mackall <mpm@selenic.com> parents: 3390 diff changeset	841 if len(id) == 20:
b17f9d3eda74 revlog.lookup tweaks Matt Mackall <mpm@selenic.com> parents: 3390 diff changeset	842 # possibly a binary node
b17f9d3eda74 revlog.lookup tweaks Matt Mackall <mpm@selenic.com> parents: 3390 diff changeset	843 # odds of a binary node being all hex in ASCII are 1 in 10**25
b17f9d3eda74 revlog.lookup tweaks Matt Mackall <mpm@selenic.com> parents: 3390 diff changeset	844 try:
b17f9d3eda74 revlog.lookup tweaks Matt Mackall <mpm@selenic.com> parents: 3390 diff changeset	845 node = id
7874 d812029cda85 cleanup: drop variables for unused return values Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 7873 diff changeset	846 self.rev(node) # quick search the index
3438 b17f9d3eda74 revlog.lookup tweaks Matt Mackall <mpm@selenic.com> parents: 3390 diff changeset	847 return node
3930 01d98d68d697 Add revlog.LookupError exception, and use it instead of RevlogError. Brendan Cully <brendan@kublai.com> parents: 3928 diff changeset	848 except LookupError:
3438 b17f9d3eda74 revlog.lookup tweaks Matt Mackall <mpm@selenic.com> parents: 3390 diff changeset	849 pass # may be partial hex id
36 da28286bf6b7 Add smart node lookup by substring or by rev number mpm@selenic.com parents: 26 diff changeset	850 try:
3156 d01e4cb2f5f2 cleanups in revlog.lookup Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3139 diff changeset	851 # str(rev)
36 da28286bf6b7 Add smart node lookup by substring or by rev number mpm@selenic.com parents: 26 diff changeset	852 rev = int(id)
4980 fc44c8df9d99 revlog: some codingstyle cleanups Matt Mackall <mpm@selenic.com> parents: 4979 diff changeset	853 if str(rev) != id:
fc44c8df9d99 revlog: some codingstyle cleanups Matt Mackall <mpm@selenic.com> parents: 4979 diff changeset	854 raise ValueError
fc44c8df9d99 revlog: some codingstyle cleanups Matt Mackall <mpm@selenic.com> parents: 4979 diff changeset	855 if rev < 0:
6750 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6703 diff changeset	856 rev = len(self) + rev
fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6703 diff changeset	857 if rev < 0 or rev >= len(self):
4980 fc44c8df9d99 revlog: some codingstyle cleanups Matt Mackall <mpm@selenic.com> parents: 4979 diff changeset	858 raise ValueError
36 da28286bf6b7 Add smart node lookup by substring or by rev number mpm@selenic.com parents: 26 diff changeset	859 return self.node(rev)
469 e205194ca7ef Various node id lookup tweaks mpm@selenic.com parents: 451 diff changeset	860 except (ValueError, OverflowError):
3156 d01e4cb2f5f2 cleanups in revlog.lookup Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3139 diff changeset	861 pass
3453 dba3cadef789 Only look up tags and branches as a last resort Matt Mackall <mpm@selenic.com> parents: 3438 diff changeset	862 if len(id) == 40:
dba3cadef789 Only look up tags and branches as a last resort Matt Mackall <mpm@selenic.com> parents: 3438 diff changeset	863 try:
3438 b17f9d3eda74 revlog.lookup tweaks Matt Mackall <mpm@selenic.com> parents: 3390 diff changeset	864 # a full hex nodeid?
b17f9d3eda74 revlog.lookup tweaks Matt Mackall <mpm@selenic.com> parents: 3390 diff changeset	865 node = bin(id)
7874 d812029cda85 cleanup: drop variables for unused return values Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 7873 diff changeset	866 self.rev(node)
3157 4fe41a9e4591 optimize revlog.lookup when passed hex(node)[:...] Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3156 diff changeset	867 return node
7062 efc579fdaf69 provide nicer feedback when an unknown node id is passed to a command Sune Foldager <cryo@cyanite.org> parents: 6912 diff changeset	868 except (TypeError, LookupError):
3453 dba3cadef789 Only look up tags and branches as a last resort Matt Mackall <mpm@selenic.com> parents: 3438 diff changeset	869 pass
dba3cadef789 Only look up tags and branches as a last resort Matt Mackall <mpm@selenic.com> parents: 3438 diff changeset	870
dba3cadef789 Only look up tags and branches as a last resort Matt Mackall <mpm@selenic.com> parents: 3438 diff changeset	871 def _partialmatch(self, id):
dba3cadef789 Only look up tags and branches as a last resort Matt Mackall <mpm@selenic.com> parents: 3438 diff changeset	872 if len(id) < 40:
dba3cadef789 Only look up tags and branches as a last resort Matt Mackall <mpm@selenic.com> parents: 3438 diff changeset	873 try:
3438 b17f9d3eda74 revlog.lookup tweaks Matt Mackall <mpm@selenic.com> parents: 3390 diff changeset	874 # hex(node)[:...]
7365 ec3aafa84d44 lookup: speed up partial lookup Matt Mackall <mpm@selenic.com> parents: 7363 diff changeset	875 l = len(id) / 2 # grab an even number of digits
ec3aafa84d44 lookup: speed up partial lookup Matt Mackall <mpm@selenic.com> parents: 7363 diff changeset	876 bin_id = bin(id[:l*2])
ec3aafa84d44 lookup: speed up partial lookup Matt Mackall <mpm@selenic.com> parents: 7363 diff changeset	877 nl = [n for n in self.nodemap if n[:l] == bin_id]
ec3aafa84d44 lookup: speed up partial lookup Matt Mackall <mpm@selenic.com> parents: 7363 diff changeset	878 nl = [n for n in nl if hex(n).startswith(id)]
ec3aafa84d44 lookup: speed up partial lookup Matt Mackall <mpm@selenic.com> parents: 7363 diff changeset	879 if len(nl) > 0:
ec3aafa84d44 lookup: speed up partial lookup Matt Mackall <mpm@selenic.com> parents: 7363 diff changeset	880 if len(nl) == 1:
ec3aafa84d44 lookup: speed up partial lookup Matt Mackall <mpm@selenic.com> parents: 7363 diff changeset	881 return nl[0]
ec3aafa84d44 lookup: speed up partial lookup Matt Mackall <mpm@selenic.com> parents: 7363 diff changeset	882 raise LookupError(id, self.indexfile,
ec3aafa84d44 lookup: speed up partial lookup Matt Mackall <mpm@selenic.com> parents: 7363 diff changeset	883 _('ambiguous identifier'))
ec3aafa84d44 lookup: speed up partial lookup Matt Mackall <mpm@selenic.com> parents: 7363 diff changeset	884 return None
3453 dba3cadef789 Only look up tags and branches as a last resort Matt Mackall <mpm@selenic.com> parents: 3438 diff changeset	885 except TypeError:
dba3cadef789 Only look up tags and branches as a last resort Matt Mackall <mpm@selenic.com> parents: 3438 diff changeset	886 pass
dba3cadef789 Only look up tags and branches as a last resort Matt Mackall <mpm@selenic.com> parents: 3438 diff changeset	887
dba3cadef789 Only look up tags and branches as a last resort Matt Mackall <mpm@selenic.com> parents: 3438 diff changeset	888 def lookup(self, id):
dba3cadef789 Only look up tags and branches as a last resort Matt Mackall <mpm@selenic.com> parents: 3438 diff changeset	889 """locate a node based on:
dba3cadef789 Only look up tags and branches as a last resort Matt Mackall <mpm@selenic.com> parents: 3438 diff changeset	890 - revision number or str(revision number)
dba3cadef789 Only look up tags and branches as a last resort Matt Mackall <mpm@selenic.com> parents: 3438 diff changeset	891 - nodeid or subset of hex nodeid
dba3cadef789 Only look up tags and branches as a last resort Matt Mackall <mpm@selenic.com> parents: 3438 diff changeset	892 """
dba3cadef789 Only look up tags and branches as a last resort Matt Mackall <mpm@selenic.com> parents: 3438 diff changeset	893 n = self._match(id)
dba3cadef789 Only look up tags and branches as a last resort Matt Mackall <mpm@selenic.com> parents: 3438 diff changeset	894 if n is not None:
dba3cadef789 Only look up tags and branches as a last resort Matt Mackall <mpm@selenic.com> parents: 3438 diff changeset	895 return n
dba3cadef789 Only look up tags and branches as a last resort Matt Mackall <mpm@selenic.com> parents: 3438 diff changeset	896 n = self._partialmatch(id)
dba3cadef789 Only look up tags and branches as a last resort Matt Mackall <mpm@selenic.com> parents: 3438 diff changeset	897 if n:
dba3cadef789 Only look up tags and branches as a last resort Matt Mackall <mpm@selenic.com> parents: 3438 diff changeset	898 return n
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 484 diff changeset	899
6228 c0c4c7b1e8d3 revlog: report node and file when lookup fails Matt Mackall <mpm@selenic.com> parents: 6212 diff changeset	900 raise LookupError(id, self.indexfile, _('no match found'))
36 da28286bf6b7 Add smart node lookup by substring or by rev number mpm@selenic.com parents: 26 diff changeset	901
2890 5df3e5cf16bc Move cmp bits from filelog to revlog Matt Mackall <mpm@selenic.com> parents: 2859 diff changeset	902 def cmp(self, node, text):
5df3e5cf16bc Move cmp bits from filelog to revlog Matt Mackall <mpm@selenic.com> parents: 2859 diff changeset	903 """compare text with a given file revision"""
5df3e5cf16bc Move cmp bits from filelog to revlog Matt Mackall <mpm@selenic.com> parents: 2859 diff changeset	904 p1, p2 = self.parents(node)
5df3e5cf16bc Move cmp bits from filelog to revlog Matt Mackall <mpm@selenic.com> parents: 2859 diff changeset	905 return hash(text, p1, p2) != node
5df3e5cf16bc Move cmp bits from filelog to revlog Matt Mackall <mpm@selenic.com> parents: 2859 diff changeset	906
4988 14486eea8e7a revlog: speed up chunkcache Matt Mackall <mpm@selenic.com> parents: 4987 diff changeset	907 def chunk(self, rev, df=None):
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	908 def loadcache(df):
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	909 if not df:
4988 14486eea8e7a revlog: speed up chunkcache Matt Mackall <mpm@selenic.com> parents: 4987 diff changeset	910 if self._inline:
2073 1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	911 df = self.opener(self.indexfile)
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	912 else:
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	913 df = self.opener(self.datafile)
1598 14d1f1868bf6 cleanup of revlog.group when repository is local Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	914 df.seek(start)
4983 4dbcfc6e359e revlog: pull chunkcache back into revlog Matt Mackall <mpm@selenic.com> parents: 4982 diff changeset	915 self._chunkcache = (start, df.read(cache_length))
1598 14d1f1868bf6 cleanup of revlog.group when repository is local Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	916
5006 c2febf5420e9 revlog: minor chunk speed-up Matt Mackall <mpm@selenic.com> parents: 5005 diff changeset	917 start, length = self.start(rev), self.length(rev)
c2febf5420e9 revlog: minor chunk speed-up Matt Mackall <mpm@selenic.com> parents: 5005 diff changeset	918 if self._inline:
c2febf5420e9 revlog: minor chunk speed-up Matt Mackall <mpm@selenic.com> parents: 5005 diff changeset	919 start += (rev + 1) * self._io.size
c2febf5420e9 revlog: minor chunk speed-up Matt Mackall <mpm@selenic.com> parents: 5005 diff changeset	920 end = start + length
1598 14d1f1868bf6 cleanup of revlog.group when repository is local Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	921
5006 c2febf5420e9 revlog: minor chunk speed-up Matt Mackall <mpm@selenic.com> parents: 5005 diff changeset	922 offset = 0
c2febf5420e9 revlog: minor chunk speed-up Matt Mackall <mpm@selenic.com> parents: 5005 diff changeset	923 if not self._chunkcache:
c2febf5420e9 revlog: minor chunk speed-up Matt Mackall <mpm@selenic.com> parents: 5005 diff changeset	924 cache_length = max(65536, length)
c2febf5420e9 revlog: minor chunk speed-up Matt Mackall <mpm@selenic.com> parents: 5005 diff changeset	925 loadcache(df)
1598 14d1f1868bf6 cleanup of revlog.group when repository is local Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	926 else:
5006 c2febf5420e9 revlog: minor chunk speed-up Matt Mackall <mpm@selenic.com> parents: 5005 diff changeset	927 cache_start = self._chunkcache[0]
c2febf5420e9 revlog: minor chunk speed-up Matt Mackall <mpm@selenic.com> parents: 5005 diff changeset	928 cache_length = len(self._chunkcache[1])
c2febf5420e9 revlog: minor chunk speed-up Matt Mackall <mpm@selenic.com> parents: 5005 diff changeset	929 cache_end = cache_start + cache_length
c2febf5420e9 revlog: minor chunk speed-up Matt Mackall <mpm@selenic.com> parents: 5005 diff changeset	930 if start >= cache_start and end <= cache_end:
c2febf5420e9 revlog: minor chunk speed-up Matt Mackall <mpm@selenic.com> parents: 5005 diff changeset	931 # it is cached
c2febf5420e9 revlog: minor chunk speed-up Matt Mackall <mpm@selenic.com> parents: 5005 diff changeset	932 offset = start - cache_start
c2febf5420e9 revlog: minor chunk speed-up Matt Mackall <mpm@selenic.com> parents: 5005 diff changeset	933 else:
c2febf5420e9 revlog: minor chunk speed-up Matt Mackall <mpm@selenic.com> parents: 5005 diff changeset	934 cache_length = max(65536, length)
c2febf5420e9 revlog: minor chunk speed-up Matt Mackall <mpm@selenic.com> parents: 5005 diff changeset	935 loadcache(df)
1598 14d1f1868bf6 cleanup of revlog.group when repository is local Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	936
4988 14486eea8e7a revlog: speed up chunkcache Matt Mackall <mpm@selenic.com> parents: 4987 diff changeset	937 # avoid copying large chunks
14486eea8e7a revlog: speed up chunkcache Matt Mackall <mpm@selenic.com> parents: 4987 diff changeset	938 c = self._chunkcache[1]
5006 c2febf5420e9 revlog: minor chunk speed-up Matt Mackall <mpm@selenic.com> parents: 5005 diff changeset	939 if cache_length != length:
4988 14486eea8e7a revlog: speed up chunkcache Matt Mackall <mpm@selenic.com> parents: 4987 diff changeset	940 c = c[offset:offset + length]
14486eea8e7a revlog: speed up chunkcache Matt Mackall <mpm@selenic.com> parents: 4987 diff changeset	941
14486eea8e7a revlog: speed up chunkcache Matt Mackall <mpm@selenic.com> parents: 4987 diff changeset	942 return decompress(c)
1598 14d1f1868bf6 cleanup of revlog.group when repository is local Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	943
1941 7518823709a2 revlog.py: factorization and fixes for rev < 0 (nullid) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1853 diff changeset	944 def revdiff(self, rev1, rev2):
7518823709a2 revlog.py: factorization and fixes for rev < 0 (nullid) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1853 diff changeset	945 """return or calculate a delta between two revisions"""
5005 72082bfced9a revlog: minor revdiff reorganization Matt Mackall <mpm@selenic.com> parents: 5004 diff changeset	946 if rev1 + 1 == rev2 and self.base(rev1) == self.base(rev2):
1941 7518823709a2 revlog.py: factorization and fixes for rev < 0 (nullid) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1853 diff changeset	947 return self.chunk(rev2)
5005 72082bfced9a revlog: minor revdiff reorganization Matt Mackall <mpm@selenic.com> parents: 5004 diff changeset	948
72082bfced9a revlog: minor revdiff reorganization Matt Mackall <mpm@selenic.com> parents: 5004 diff changeset	949 return mdiff.textdiff(self.revision(self.node(rev1)),
72082bfced9a revlog: minor revdiff reorganization Matt Mackall <mpm@selenic.com> parents: 5004 diff changeset	950 self.revision(self.node(rev2)))
119 c7a66f9752a4 Add code to retrieve or construct a revlog delta mpm@selenic.com parents: 117 diff changeset	951
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	952 def revision(self, node):
6912 b92baef99ebf Fixed docstring typos Martin Geisler <mg@daimi.au.dk> parents: 6891 diff changeset	953 """return an uncompressed revision of a given node"""
4980 fc44c8df9d99 revlog: some codingstyle cleanups Matt Mackall <mpm@selenic.com> parents: 4979 diff changeset	954 if node == nullid:
fc44c8df9d99 revlog: some codingstyle cleanups Matt Mackall <mpm@selenic.com> parents: 4979 diff changeset	955 return ""
4984 b4066fcbd6ba revlog: mark cache private Matt Mackall <mpm@selenic.com> parents: 4983 diff changeset	956 if self._cache and self._cache[0] == node:
5450 c728424d44c6 revlog: fix caching of buffer objects Matt Mackall <mpm@selenic.com> parents: 5448 diff changeset	957 return str(self._cache[2])
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	958
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	959 # look up what we need to read
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	960 text = None
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	961 rev = self.rev(node)
1598 14d1f1868bf6 cleanup of revlog.group when repository is local Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	962 base = self.base(rev)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	963
5004 825516d16b25 revlog: move flag checking out of the offset fastpath Matt Mackall <mpm@selenic.com> parents: 4996 diff changeset	964 # check rev flags
825516d16b25 revlog: move flag checking out of the offset fastpath Matt Mackall <mpm@selenic.com> parents: 4996 diff changeset	965 if self.index[rev][0] & 0xFFFF:
5312 fb070713ff36 revlog: more robust for damaged indexes Matt Mackall <mpm@selenic.com> parents: 5007 diff changeset	966 raise RevlogError(_('incompatible revision flag %x') %
fb070713ff36 revlog: more robust for damaged indexes Matt Mackall <mpm@selenic.com> parents: 5007 diff changeset	967 (self.index[rev][0] & 0xFFFF))
5004 825516d16b25 revlog: move flag checking out of the offset fastpath Matt Mackall <mpm@selenic.com> parents: 4996 diff changeset	968
6144 08e0825b8106 revlog.revision: avoid opening the datafile without need. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5910 diff changeset	969 df = None
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	970
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	971 # do we have useful data cached?
4984 b4066fcbd6ba revlog: mark cache private Matt Mackall <mpm@selenic.com> parents: 4983 diff changeset	972 if self._cache and self._cache[1] >= base and self._cache[1] < rev:
b4066fcbd6ba revlog: mark cache private Matt Mackall <mpm@selenic.com> parents: 4983 diff changeset	973 base = self._cache[1]
5450 c728424d44c6 revlog: fix caching of buffer objects Matt Mackall <mpm@selenic.com> parents: 5448 diff changeset	974 text = str(self._cache[2])
4920 ee983d0dbea8 revlog: privatize some methods Matt Mackall <mpm@selenic.com> parents: 4919 diff changeset	975 self._loadindex(base, rev + 1)
6144 08e0825b8106 revlog.revision: avoid opening the datafile without need. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5910 diff changeset	976 if not self._inline and rev > base + 1:
08e0825b8106 revlog.revision: avoid opening the datafile without need. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5910 diff changeset	977 df = self.opener(self.datafile)
1598 14d1f1868bf6 cleanup of revlog.group when repository is local Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	978 else:
4920 ee983d0dbea8 revlog: privatize some methods Matt Mackall <mpm@selenic.com> parents: 4919 diff changeset	979 self._loadindex(base, rev + 1)
6144 08e0825b8106 revlog.revision: avoid opening the datafile without need. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5910 diff changeset	980 if not self._inline and rev > base:
08e0825b8106 revlog.revision: avoid opening the datafile without need. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5910 diff changeset	981 df = self.opener(self.datafile)
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	982 text = self.chunk(base, df=df)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	983
4989 1aaed3d69772 revlog: eliminate diff and patches functions Matt Mackall <mpm@selenic.com> parents: 4988 diff changeset	984 bins = [self.chunk(r, df) for r in xrange(base + 1, rev + 1)]
1aaed3d69772 revlog: eliminate diff and patches functions Matt Mackall <mpm@selenic.com> parents: 4988 diff changeset	985 text = mdiff.patches(text, bins)
1598 14d1f1868bf6 cleanup of revlog.group when repository is local Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	986 p1, p2 = self.parents(node)
26 9cf83bf9ad38 Simplify integrity checking mpm@selenic.com parents: 14 diff changeset	987 if node != hash(text, p1, p2):
1402 9d2c2e6b32b5 i18n part2: use '_' for all strings who are part of the user interface Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1400 diff changeset	988 raise RevlogError(_("integrity check failed on %s:%d")
3680 69cf255a55a1 Indentation cleanups for 2956948b81f3. Thomas Arendsen Hein <thomas@intevation.de> parents: 3679 diff changeset	989 % (self.datafile, rev))
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	990
4984 b4066fcbd6ba revlog: mark cache private Matt Mackall <mpm@selenic.com> parents: 4983 diff changeset	991 self._cache = (node, rev, text)
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 484 diff changeset	992 return text
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	993
2075 343aeefb553b Make the appendfile class inline-data index friendly mason@suse.com parents: 2073 diff changeset	994 def checkinlinesize(self, tr, fp=None):
4982 9672e3c42b0c revlog: change _inline from a function to a variable Matt Mackall <mpm@selenic.com> parents: 4981 diff changeset	995 if not self._inline:
2073 1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	996 return
2075 343aeefb553b Make the appendfile class inline-data index friendly mason@suse.com parents: 2073 diff changeset	997 if not fp:
343aeefb553b Make the appendfile class inline-data index friendly mason@suse.com parents: 2073 diff changeset	998 fp = self.opener(self.indexfile, 'r')
2082 856f0ba200bc Additional appendfile fixes for interleaved data/index files mason@suse.com parents: 2081 diff changeset	999 fp.seek(0, 2)
2073 1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	1000 size = fp.tell()
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	1001 if size < 131072:
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	1002 return
2084 d66278012853 Chris Mason <mason@suse.com> parents: 2082 diff changeset	1003 trinfo = tr.find(self.indexfile)
d66278012853 Chris Mason <mason@suse.com> parents: 2082 diff changeset	1004 if trinfo == None:
3680 69cf255a55a1 Indentation cleanups for 2956948b81f3. Thomas Arendsen Hein <thomas@intevation.de> parents: 3679 diff changeset	1005 raise RevlogError(_("%s not found in the transaction")
69cf255a55a1 Indentation cleanups for 2956948b81f3. Thomas Arendsen Hein <thomas@intevation.de> parents: 3679 diff changeset	1006 % self.indexfile)
2084 d66278012853 Chris Mason <mason@suse.com> parents: 2082 diff changeset	1007
d66278012853 Chris Mason <mason@suse.com> parents: 2082 diff changeset	1008 trindex = trinfo[2]
d66278012853 Chris Mason <mason@suse.com> parents: 2082 diff changeset	1009 dataoff = self.start(trindex)
d66278012853 Chris Mason <mason@suse.com> parents: 2082 diff changeset	1010
d66278012853 Chris Mason <mason@suse.com> parents: 2082 diff changeset	1011 tr.add(self.datafile, dataoff)
2073 1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	1012 df = self.opener(self.datafile, 'w')
6261 7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1013 try:
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1014 calc = self._io.size
6750 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6703 diff changeset	1015 for r in self:
6261 7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1016 start = self.start(r) + (r + 1) * calc
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1017 length = self.length(r)
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1018 fp.seek(start)
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1019 d = fp.read(length)
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1020 df.write(d)
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1021 finally:
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1022 df.close()
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1023
2073 1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	1024 fp.close()
2076 d007df6daf8e Create an atomic opener that does not automatically rename on close mason@suse.com parents: 2075 diff changeset	1025 fp = self.opener(self.indexfile, 'w', atomictemp=True)
2073 1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	1026 self.version &= ~(REVLOGNGINLINEDATA)
4982 9672e3c42b0c revlog: change _inline from a function to a variable Matt Mackall <mpm@selenic.com> parents: 4981 diff changeset	1027 self._inline = False
6750 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6703 diff changeset	1028 for i in self:
5338 f87685355c9c revlog: fix revlogio.packentry corner case Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5325 diff changeset	1029 e = self._io.packentry(self.index[i], self.node, self.version, i)
2073 1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	1030 fp.write(e)
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	1031
2076 d007df6daf8e Create an atomic opener that does not automatically rename on close mason@suse.com parents: 2075 diff changeset	1032 # if we don't call rename, the temp file will never replace the
d007df6daf8e Create an atomic opener that does not automatically rename on close mason@suse.com parents: 2075 diff changeset	1033 # real index
d007df6daf8e Create an atomic opener that does not automatically rename on close mason@suse.com parents: 2075 diff changeset	1034 fp.rename()
2084 d66278012853 Chris Mason <mason@suse.com> parents: 2082 diff changeset	1035
d66278012853 Chris Mason <mason@suse.com> parents: 2082 diff changeset	1036 tr.replace(self.indexfile, trindex * calc)
4983 4dbcfc6e359e revlog: pull chunkcache back into revlog Matt Mackall <mpm@selenic.com> parents: 4982 diff changeset	1037 self._chunkcache = None
2073 1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	1038
4981 e7131935fbb3 revlog: simplify addrevision Matt Mackall <mpm@selenic.com> parents: 4980 diff changeset	1039 def addrevision(self, text, transaction, link, p1, p2, d=None):
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	1040 """add a revision to the log
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	1041
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	1042 text - the revision data to add
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	1043 transaction - the transaction object used for rollback
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	1044 link - the linkrev data to add
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	1045 p1, p2 - the parent nodeids of the revision
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	1046 d - an optional precomputed delta
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	1047 """
4981 e7131935fbb3 revlog: simplify addrevision Matt Mackall <mpm@selenic.com> parents: 4980 diff changeset	1048 dfh = None
4982 9672e3c42b0c revlog: change _inline from a function to a variable Matt Mackall <mpm@selenic.com> parents: 4981 diff changeset	1049 if not self._inline:
3390 a74addddd092 make revlog.addgroup pass its file handles to addrevision Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3360 diff changeset	1050 dfh = self.opener(self.datafile, "a")
a74addddd092 make revlog.addgroup pass its file handles to addrevision Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3360 diff changeset	1051 ifh = self.opener(self.indexfile, "a+")
6261 7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1052 try:
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1053 return self._addrevision(text, transaction, link, p1, p2, d, ifh, dfh)
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1054 finally:
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1055 if dfh:
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1056 dfh.close()
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1057 ifh.close()
3390 a74addddd092 make revlog.addgroup pass its file handles to addrevision Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3360 diff changeset	1058
a74addddd092 make revlog.addgroup pass its file handles to addrevision Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3360 diff changeset	1059 def _addrevision(self, text, transaction, link, p1, p2, d, ifh, dfh):
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	1060 node = hash(text, p1, p2)
301 5add718d92db revlog: allow duplicates mpm@selenic.com parents: 243 diff changeset	1061 if node in self.nodemap:
5add718d92db revlog: allow duplicates mpm@selenic.com parents: 243 diff changeset	1062 return node
5add718d92db revlog: allow duplicates mpm@selenic.com parents: 243 diff changeset	1063
6750 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6703 diff changeset	1064 curr = len(self)
4981 e7131935fbb3 revlog: simplify addrevision Matt Mackall <mpm@selenic.com> parents: 4980 diff changeset	1065 prev = curr - 1
e7131935fbb3 revlog: simplify addrevision Matt Mackall <mpm@selenic.com> parents: 4980 diff changeset	1066 base = self.base(prev)
e7131935fbb3 revlog: simplify addrevision Matt Mackall <mpm@selenic.com> parents: 4980 diff changeset	1067 offset = self.end(prev)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	1068
4981 e7131935fbb3 revlog: simplify addrevision Matt Mackall <mpm@selenic.com> parents: 4980 diff changeset	1069 if curr:
644 6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 547 diff changeset	1070 if not d:
4981 e7131935fbb3 revlog: simplify addrevision Matt Mackall <mpm@selenic.com> parents: 4980 diff changeset	1071 ptext = self.revision(self.node(prev))
4989 1aaed3d69772 revlog: eliminate diff and patches functions Matt Mackall <mpm@selenic.com> parents: 4988 diff changeset	1072 d = mdiff.textdiff(ptext, text)
98 3dde7c87e36d Add paranoia to diff code mpm@selenic.com parents: 97 diff changeset	1073 data = compress(d)
1533 3d11f81c9145 Reduce string duplication in compression code mason@suse.com parents: 1509 diff changeset	1074 l = len(data[1]) + len(data[0])
4981 e7131935fbb3 revlog: simplify addrevision Matt Mackall <mpm@selenic.com> parents: 4980 diff changeset	1075 dist = l + offset - self.start(base)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	1076
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	1077 # full versions are inserted when the needed deltas
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	1078 # become comparable to the uncompressed text
4981 e7131935fbb3 revlog: simplify addrevision Matt Mackall <mpm@selenic.com> parents: 4980 diff changeset	1079 if not curr or dist > len(text) * 2:
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	1080 data = compress(text)
1533 3d11f81c9145 Reduce string duplication in compression code mason@suse.com parents: 1509 diff changeset	1081 l = len(data[1]) + len(data[0])
4981 e7131935fbb3 revlog: simplify addrevision Matt Mackall <mpm@selenic.com> parents: 4980 diff changeset	1082 base = curr
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	1083
4977 6cb30bc4ca32 revlog: parse revlogv0 indexes into v1 internally Matt Mackall <mpm@selenic.com> parents: 4976 diff changeset	1084 e = (offset_type(offset, 0), l, len(text),
6cb30bc4ca32 revlog: parse revlogv0 indexes into v1 internally Matt Mackall <mpm@selenic.com> parents: 4976 diff changeset	1085 base, link, self.rev(p1), self.rev(p2), node)
4979 06abdaf78788 revlog: add a magic null revision to our index Matt Mackall <mpm@selenic.com> parents: 4978 diff changeset	1086 self.index.insert(-1, e)
4981 e7131935fbb3 revlog: simplify addrevision Matt Mackall <mpm@selenic.com> parents: 4980 diff changeset	1087 self.nodemap[node] = curr
4977 6cb30bc4ca32 revlog: parse revlogv0 indexes into v1 internally Matt Mackall <mpm@selenic.com> parents: 4976 diff changeset	1088
5338 f87685355c9c revlog: fix revlogio.packentry corner case Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5325 diff changeset	1089 entry = self._io.packentry(e, self.node, self.version, curr)
4982 9672e3c42b0c revlog: change _inline from a function to a variable Matt Mackall <mpm@selenic.com> parents: 4981 diff changeset	1090 if not self._inline:
2073 1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	1091 transaction.add(self.datafile, offset)
4981 e7131935fbb3 revlog: simplify addrevision Matt Mackall <mpm@selenic.com> parents: 4980 diff changeset	1092 transaction.add(self.indexfile, curr * len(entry))
2073 1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	1093 if data[0]:
3390 a74addddd092 make revlog.addgroup pass its file handles to addrevision Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3360 diff changeset	1094 dfh.write(data[0])
a74addddd092 make revlog.addgroup pass its file handles to addrevision Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3360 diff changeset	1095 dfh.write(data[1])
a74addddd092 make revlog.addgroup pass its file handles to addrevision Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3360 diff changeset	1096 dfh.flush()
4981 e7131935fbb3 revlog: simplify addrevision Matt Mackall <mpm@selenic.com> parents: 4980 diff changeset	1097 ifh.write(entry)
2073 1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	1098 else:
4996 a0d37976cd5b revlog: avoid some unnecessary seek/tell syscalls Matt Mackall <mpm@selenic.com> parents: 4994 diff changeset	1099 offset += curr * self._io.size
5324 8409a2e3a78d revlog: fix inlined revision transaction extra data (issue 749) Patrick Mezard <pmezard@gmail.com> parents: 5007 diff changeset	1100 transaction.add(self.indexfile, offset, curr)
4981 e7131935fbb3 revlog: simplify addrevision Matt Mackall <mpm@selenic.com> parents: 4980 diff changeset	1101 ifh.write(entry)
3390 a74addddd092 make revlog.addgroup pass its file handles to addrevision Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3360 diff changeset	1102 ifh.write(data[0])
a74addddd092 make revlog.addgroup pass its file handles to addrevision Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3360 diff changeset	1103 ifh.write(data[1])
a74addddd092 make revlog.addgroup pass its file handles to addrevision Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3360 diff changeset	1104 self.checkinlinesize(transaction, ifh)
2073 1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	1105
4984 b4066fcbd6ba revlog: mark cache private Matt Mackall <mpm@selenic.com> parents: 4983 diff changeset	1106 self._cache = (node, curr, text)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	1107 return node
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	1108
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	1109 def ancestor(self, a, b):
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	1110 """calculate the least common ancestor of nodes a and b"""
2081 416d8b2a75b8 Speedup revlog.ancestors for the linear case Chris Mason <mason@suse.com> parents: 2080 diff changeset	1111
3139 1fd1cdcc4200 Switch revlog.ancestor to use revisions rather than nodeids Matt Mackall <mpm@selenic.com> parents: 3135 diff changeset	1112 def parents(rev):
3578 3b4e00cba57a Define and use nullrev (revision of nullid) instead of -1. Thomas Arendsen Hein <thomas@intevation.de> parents: 3508 diff changeset	1113 return [p for p in self.parentrevs(rev) if p != nullrev]
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 484 diff changeset	1114
3139 1fd1cdcc4200 Switch revlog.ancestor to use revisions rather than nodeids Matt Mackall <mpm@selenic.com> parents: 3135 diff changeset	1115 c = ancestor.ancestor(self.rev(a), self.rev(b), parents)
1fd1cdcc4200 Switch revlog.ancestor to use revisions rather than nodeids Matt Mackall <mpm@selenic.com> parents: 3135 diff changeset	1116 if c is None:
1fd1cdcc4200 Switch revlog.ancestor to use revisions rather than nodeids Matt Mackall <mpm@selenic.com> parents: 3135 diff changeset	1117 return nullid
1fd1cdcc4200 Switch revlog.ancestor to use revisions rather than nodeids Matt Mackall <mpm@selenic.com> parents: 3135 diff changeset	1118
1fd1cdcc4200 Switch revlog.ancestor to use revisions rather than nodeids Matt Mackall <mpm@selenic.com> parents: 3135 diff changeset	1119 return self.node(c)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	1120
1598 14d1f1868bf6 cleanup of revlog.group when repository is local Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	1121 def group(self, nodelist, lookup, infocollect=None):
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	1122 """calculate a delta group
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	1123
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	1124 Given a list of changeset revs, return a set of deltas and
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	1125 metadata corresponding to nodes. the first delta is
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	1126 parent(nodes[0]) -> nodes[0] the receiver is guaranteed to
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	1127 have this parent as it has all history before these
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	1128 changesets. parent is parent[0]
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	1129 """
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1130 revs = [self.rev(n) for n in nodelist]
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	1131
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	1132 # if we don't have any revisions touched by these changesets, bail
192 5d8553352d2e Changes to network protocol mpm@selenic.com parents: 155 diff changeset	1133 if not revs:
1981 736b6c96bbbc make incoming work via ssh (issue139); move chunk code into separate module. Thomas Arendsen Hein <thomas@intevation.de> parents: 1941 diff changeset	1134 yield changegroup.closechunk()
192 5d8553352d2e Changes to network protocol mpm@selenic.com parents: 155 diff changeset	1135 return
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	1136
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	1137 # add the parent of the first rev
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	1138 p = self.parents(self.node(revs[0]))[0]
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	1139 revs.insert(0, self.rev(p))
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	1140
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	1141 # build deltas
71 47c9a869adee Add mdiff.patches to speed up applying thousands of patches to the manifest mpm@selenic.com parents: 67 diff changeset	1142 for d in xrange(0, len(revs) - 1):
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	1143 a, b = revs[d], revs[d + 1]
1598 14d1f1868bf6 cleanup of revlog.group when repository is local Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	1144 nb = self.node(b)
192 5d8553352d2e Changes to network protocol mpm@selenic.com parents: 155 diff changeset	1145
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1146 if infocollect is not None:
1598 14d1f1868bf6 cleanup of revlog.group when repository is local Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	1147 infocollect(nb)
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1148
1598 14d1f1868bf6 cleanup of revlog.group when repository is local Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	1149 p = self.parents(nb)
14d1f1868bf6 cleanup of revlog.group when repository is local Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	1150 meta = nb + p[0] + p[1] + lookup(nb)
5367 7530334bf301 revlog: generate trivial deltas against null revision Matt Mackall <mpm@selenic.com> parents: 5338 diff changeset	1151 if a == -1:
7530334bf301 revlog: generate trivial deltas against null revision Matt Mackall <mpm@selenic.com> parents: 5338 diff changeset	1152 d = self.revision(nb)
7530334bf301 revlog: generate trivial deltas against null revision Matt Mackall <mpm@selenic.com> parents: 5338 diff changeset	1153 meta += mdiff.trivialdiffheader(len(d))
7530334bf301 revlog: generate trivial deltas against null revision Matt Mackall <mpm@selenic.com> parents: 5338 diff changeset	1154 else:
7530334bf301 revlog: generate trivial deltas against null revision Matt Mackall <mpm@selenic.com> parents: 5338 diff changeset	1155 d = self.revdiff(a, b)
5368 61462e7d62ed changegroup: avoid large copies Matt Mackall <mpm@selenic.com> parents: 5367 diff changeset	1156 yield changegroup.chunkheader(len(meta) + len(d))
61462e7d62ed changegroup: avoid large copies Matt Mackall <mpm@selenic.com> parents: 5367 diff changeset	1157 yield meta
5448 e038738714fd revlog: avoid large yields in group() Matt Mackall <mpm@selenic.com> parents: 5445 diff changeset	1158 if len(d) > 2**20:
e038738714fd revlog: avoid large yields in group() Matt Mackall <mpm@selenic.com> parents: 5445 diff changeset	1159 pos = 0
e038738714fd revlog: avoid large yields in group() Matt Mackall <mpm@selenic.com> parents: 5445 diff changeset	1160 while pos < len(d):
e038738714fd revlog: avoid large yields in group() Matt Mackall <mpm@selenic.com> parents: 5445 diff changeset	1161 pos2 = pos + 2 ** 18
e038738714fd revlog: avoid large yields in group() Matt Mackall <mpm@selenic.com> parents: 5445 diff changeset	1162 yield d[pos:pos2]
e038738714fd revlog: avoid large yields in group() Matt Mackall <mpm@selenic.com> parents: 5445 diff changeset	1163 pos = pos2
e038738714fd revlog: avoid large yields in group() Matt Mackall <mpm@selenic.com> parents: 5445 diff changeset	1164 else:
e038738714fd revlog: avoid large yields in group() Matt Mackall <mpm@selenic.com> parents: 5445 diff changeset	1165 yield d
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	1166
1981 736b6c96bbbc make incoming work via ssh (issue139); move chunk code into separate module. Thomas Arendsen Hein <thomas@intevation.de> parents: 1941 diff changeset	1167 yield changegroup.closechunk()
192 5d8553352d2e Changes to network protocol mpm@selenic.com parents: 155 diff changeset	1168
6647 602f7c1ab954 drop superfluous param from revlog.addgroup() Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 6470 diff changeset	1169 def addgroup(self, revs, linkmapper, transaction):
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	1170 """
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	1171 add a delta group
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	1172
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	1173 given a set of deltas, add them to the revision log. the
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	1174 first delta is against its parent, which should be in our
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	1175 log, the rest are against the previous delta.
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	1176 """
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	1177
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	1178 #track the base of the current delta log
6750 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6703 diff changeset	1179 r = len(self)
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	1180 t = r - 1
2002 4aab906517c6 Calling revlog.addgroup with an empty changegroup now raises RevlogError. Thomas Arendsen Hein <thomas@intevation.de> parents: 1981 diff changeset	1181 node = None
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 484 diff changeset	1182
3578 3b4e00cba57a Define and use nullrev (revision of nullid) instead of -1. Thomas Arendsen Hein <thomas@intevation.de> parents: 3508 diff changeset	1183 base = prev = nullrev
2078 441ea218414e Fill in the uncompressed size during revlog.addgroup mason@suse.com parents: 2077 diff changeset	1184 start = end = textlen = 0
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	1185 if r:
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	1186 end = self.end(t)
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	1187
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	1188 ifh = self.opener(self.indexfile, "a+")
4996 a0d37976cd5b revlog: avoid some unnecessary seek/tell syscalls Matt Mackall <mpm@selenic.com> parents: 4994 diff changeset	1189 isize = r * self._io.size
4982 9672e3c42b0c revlog: change _inline from a function to a variable Matt Mackall <mpm@selenic.com> parents: 4981 diff changeset	1190 if self._inline:
4996 a0d37976cd5b revlog: avoid some unnecessary seek/tell syscalls Matt Mackall <mpm@selenic.com> parents: 4994 diff changeset	1191 transaction.add(self.indexfile, end + isize, r)
2073 1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	1192 dfh = None
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	1193 else:
4996 a0d37976cd5b revlog: avoid some unnecessary seek/tell syscalls Matt Mackall <mpm@selenic.com> parents: 4994 diff changeset	1194 transaction.add(self.indexfile, isize, r)
2073 1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	1195 transaction.add(self.datafile, end)
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	1196 dfh = self.opener(self.datafile, "a")
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	1197
6261 7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1198 try:
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1199 # loop through our set of deltas
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1200 chain = None
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1201 for chunk in revs:
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1202 node, p1, p2, cs = struct.unpack("20s20s20s20s", chunk[:80])
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1203 link = linkmapper(cs)
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1204 if node in self.nodemap:
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1205 # this can happen if two branches make the same change
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1206 chain = node
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1207 continue
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1208 delta = buffer(chunk, 80)
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1209 del chunk
192 5d8553352d2e Changes to network protocol mpm@selenic.com parents: 155 diff changeset	1210
6261 7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1211 for p in (p1, p2):
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1212 if not p in self.nodemap:
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1213 raise LookupError(p, self.indexfile, _('unknown parent'))
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	1214
6261 7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1215 if not chain:
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1216 # retrieve the parent revision of the delta chain
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1217 chain = p1
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1218 if not chain in self.nodemap:
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1219 raise LookupError(chain, self.indexfile, _('unknown base'))
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	1220
6261 7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1221 # full versions are inserted when the needed deltas become
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1222 # comparable to the uncompressed text or when the previous
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1223 # version is not the one we have a delta against. We use
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1224 # the size of the previous full rev as a proxy for the
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1225 # current size.
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1226
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1227 if chain == prev:
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1228 cdelta = compress(delta)
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1229 cdeltalen = len(cdelta[0]) + len(cdelta[1])
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1230 textlen = mdiff.patchedsize(textlen, delta)
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1231
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1232 if chain != prev or (end - start + cdeltalen) > textlen * 2:
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1233 # flush our writes here so we can read it in revision
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1234 if dfh:
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1235 dfh.flush()
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1236 ifh.flush()
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1237 text = self.revision(chain)
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1238 if len(text) == 0:
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1239 # skip over trivial delta header
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1240 text = buffer(delta, 12)
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1241 else:
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1242 text = mdiff.patches(text, [delta])
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1243 del delta
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1244 chk = self._addrevision(text, transaction, link, p1, p2, None,
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1245 ifh, dfh)
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1246 if not dfh and not self._inline:
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1247 # addrevision switched from inline to conventional
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1248 # reopen the index
2073 1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	1249 dfh = self.opener(self.datafile, "a")
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	1250 ifh = self.opener(self.indexfile, "a")
6261 7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1251 if chk != node:
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1252 raise RevlogError(_("consistency error adding group"))
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1253 textlen = len(text)
2073 1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	1254 else:
6261 7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1255 e = (offset_type(end, 0), cdeltalen, textlen, base,
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1256 link, self.rev(p1), self.rev(p2), node)
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1257 self.index.insert(-1, e)
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1258 self.nodemap[node] = r
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1259 entry = self._io.packentry(e, self.node, self.version, r)
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1260 if self._inline:
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1261 ifh.write(entry)
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1262 ifh.write(cdelta[0])
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1263 ifh.write(cdelta[1])
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1264 self.checkinlinesize(transaction, ifh)
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1265 if not self._inline:
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1266 dfh = self.opener(self.datafile, "a")
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1267 ifh = self.opener(self.indexfile, "a")
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1268 else:
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1269 dfh.write(cdelta[0])
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1270 dfh.write(cdelta[1])
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1271 ifh.write(entry)
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	1272
6261 7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1273 t, r, chain, prev = r, r + 1, node, node
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1274 base = self.base(t)
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1275 start = self.start(base)
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1276 end = self.end(t)
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1277 finally:
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1278 if dfh:
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1279 dfh.close()
7c8101b5ceb1 revlog: make sure the files are closed after an exception happens Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 6228 diff changeset	1280 ifh.close()
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	1281
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	1282 return node
1493 1a216cb4ee64 verify: add check for mismatch of index and data length Matt Mackall <mpm@selenic.com> parents: 1469 diff changeset	1283
8073 e8a28556a0a8 strip: make repair.strip transactional to avoid repository corruption Henrik Stuart <henrik.stuart@edlund.dk> parents: 8017 diff changeset	1284 def strip(self, minlink, transaction):
5910 b9a830fa10f6 simplify revlog.strip interface and callers; add docstring Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5909 diff changeset	1285 """truncate the revlog on the first revision with a linkrev >= minlink
b9a830fa10f6 simplify revlog.strip interface and callers; add docstring Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5909 diff changeset	1286
b9a830fa10f6 simplify revlog.strip interface and callers; add docstring Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5909 diff changeset	1287 This function is called when we're stripping revision minlink and
b9a830fa10f6 simplify revlog.strip interface and callers; add docstring Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5909 diff changeset	1288 its descendants from the repository.
b9a830fa10f6 simplify revlog.strip interface and callers; add docstring Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5909 diff changeset	1289
b9a830fa10f6 simplify revlog.strip interface and callers; add docstring Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5909 diff changeset	1290 We have to remove all revisions with linkrev >= minlink, because
b9a830fa10f6 simplify revlog.strip interface and callers; add docstring Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5909 diff changeset	1291 the equivalent changelog revisions will be renumbered after the
b9a830fa10f6 simplify revlog.strip interface and callers; add docstring Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5909 diff changeset	1292 strip.
b9a830fa10f6 simplify revlog.strip interface and callers; add docstring Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5909 diff changeset	1293
b9a830fa10f6 simplify revlog.strip interface and callers; add docstring Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5909 diff changeset	1294 So we truncate the revlog on the first of these revisions, and
b9a830fa10f6 simplify revlog.strip interface and callers; add docstring Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5909 diff changeset	1295 trust that the caller has saved the revisions that shouldn't be
b9a830fa10f6 simplify revlog.strip interface and callers; add docstring Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5909 diff changeset	1296 removed and that it'll readd them after this truncation.
b9a830fa10f6 simplify revlog.strip interface and callers; add docstring Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5909 diff changeset	1297 """
6750 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6703 diff changeset	1298 if len(self) == 0:
1535 7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	1299 return
7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	1300
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	1301 if isinstance(self.index, lazyindex):
4920 ee983d0dbea8 revlog: privatize some methods Matt Mackall <mpm@selenic.com> parents: 4919 diff changeset	1302 self._loadindexmap()
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	1303
6750 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6703 diff changeset	1304 for rev in self:
5909 f45f7390c1c5 strip: calculate list of extra nodes to save and pass it to changegroupsubset Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5659 diff changeset	1305 if self.index[rev][4] >= minlink:
f45f7390c1c5 strip: calculate list of extra nodes to save and pass it to changegroupsubset Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5659 diff changeset	1306 break
f45f7390c1c5 strip: calculate list of extra nodes to save and pass it to changegroupsubset Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5659 diff changeset	1307 else:
f45f7390c1c5 strip: calculate list of extra nodes to save and pass it to changegroupsubset Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5659 diff changeset	1308 return
1535 7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	1309
7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	1310 # first truncate the files on disk
7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	1311 end = self.start(rev)
4982 9672e3c42b0c revlog: change _inline from a function to a variable Matt Mackall <mpm@selenic.com> parents: 4981 diff changeset	1312 if not self._inline:
8073 e8a28556a0a8 strip: make repair.strip transactional to avoid repository corruption Henrik Stuart <henrik.stuart@edlund.dk> parents: 8017 diff changeset	1313 transaction.add(self.datafile, end)
4977 6cb30bc4ca32 revlog: parse revlogv0 indexes into v1 internally Matt Mackall <mpm@selenic.com> parents: 4976 diff changeset	1314 end = rev * self._io.size
2073 1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	1315 else:
4977 6cb30bc4ca32 revlog: parse revlogv0 indexes into v1 internally Matt Mackall <mpm@selenic.com> parents: 4976 diff changeset	1316 end += rev * self._io.size
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	1317
8073 e8a28556a0a8 strip: make repair.strip transactional to avoid repository corruption Henrik Stuart <henrik.stuart@edlund.dk> parents: 8017 diff changeset	1318 transaction.add(self.indexfile, end)
1535 7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	1319
7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	1320 # then reset internal state in memory to forget those revisions
4984 b4066fcbd6ba revlog: mark cache private Matt Mackall <mpm@selenic.com> parents: 4983 diff changeset	1321 self._cache = None
4983 4dbcfc6e359e revlog: pull chunkcache back into revlog Matt Mackall <mpm@selenic.com> parents: 4982 diff changeset	1322 self._chunkcache = None
6750 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6703 diff changeset	1323 for x in xrange(rev, len(self)):
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	1324 del self.nodemap[self.node(x)]
1535 7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	1325
4979 06abdaf78788 revlog: add a magic null revision to our index Matt Mackall <mpm@selenic.com> parents: 4978 diff changeset	1326 del self.index[rev:-1]
1535 7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	1327
1493 1a216cb4ee64 verify: add check for mismatch of index and data length Matt Mackall <mpm@selenic.com> parents: 1469 diff changeset	1328 def checksize(self):
1a216cb4ee64 verify: add check for mismatch of index and data length Matt Mackall <mpm@selenic.com> parents: 1469 diff changeset	1329 expected = 0
6750 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6703 diff changeset	1330 if len(self):
fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6703 diff changeset	1331 expected = max(0, self.end(len(self) - 1))
1667 daff3ef0de8d verify: notice extra data in indices Matt Mackall <mpm@selenic.com> parents: 1660 diff changeset	1332
1494 249ca10d37f4 Handle empty logs in repo.checksize Matt Mackall <mpm@selenic.com> parents: 1493 diff changeset	1333 try:
249ca10d37f4 Handle empty logs in repo.checksize Matt Mackall <mpm@selenic.com> parents: 1493 diff changeset	1334 f = self.opener(self.datafile)
249ca10d37f4 Handle empty logs in repo.checksize Matt Mackall <mpm@selenic.com> parents: 1493 diff changeset	1335 f.seek(0, 2)
249ca10d37f4 Handle empty logs in repo.checksize Matt Mackall <mpm@selenic.com> parents: 1493 diff changeset	1336 actual = f.tell()
1667 daff3ef0de8d verify: notice extra data in indices Matt Mackall <mpm@selenic.com> parents: 1660 diff changeset	1337 dd = actual - expected
1494 249ca10d37f4 Handle empty logs in repo.checksize Matt Mackall <mpm@selenic.com> parents: 1493 diff changeset	1338 except IOError, inst:
1667 daff3ef0de8d verify: notice extra data in indices Matt Mackall <mpm@selenic.com> parents: 1660 diff changeset	1339 if inst.errno != errno.ENOENT:
daff3ef0de8d verify: notice extra data in indices Matt Mackall <mpm@selenic.com> parents: 1660 diff changeset	1340 raise
daff3ef0de8d verify: notice extra data in indices Matt Mackall <mpm@selenic.com> parents: 1660 diff changeset	1341 dd = 0
daff3ef0de8d verify: notice extra data in indices Matt Mackall <mpm@selenic.com> parents: 1660 diff changeset	1342
daff3ef0de8d verify: notice extra data in indices Matt Mackall <mpm@selenic.com> parents: 1660 diff changeset	1343 try:
daff3ef0de8d verify: notice extra data in indices Matt Mackall <mpm@selenic.com> parents: 1660 diff changeset	1344 f = self.opener(self.indexfile)
daff3ef0de8d verify: notice extra data in indices Matt Mackall <mpm@selenic.com> parents: 1660 diff changeset	1345 f.seek(0, 2)
daff3ef0de8d verify: notice extra data in indices Matt Mackall <mpm@selenic.com> parents: 1660 diff changeset	1346 actual = f.tell()
4977 6cb30bc4ca32 revlog: parse revlogv0 indexes into v1 internally Matt Mackall <mpm@selenic.com> parents: 4976 diff changeset	1347 s = self._io.size
5312 fb070713ff36 revlog: more robust for damaged indexes Matt Mackall <mpm@selenic.com> parents: 5007 diff changeset	1348 i = max(0, actual / s)
1667 daff3ef0de8d verify: notice extra data in indices Matt Mackall <mpm@selenic.com> parents: 1660 diff changeset	1349 di = actual - (i * s)
4982 9672e3c42b0c revlog: change _inline from a function to a variable Matt Mackall <mpm@selenic.com> parents: 4981 diff changeset	1350 if self._inline:
2073 1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	1351 databytes = 0
6750 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6703 diff changeset	1352 for r in self:
5312 fb070713ff36 revlog: more robust for damaged indexes Matt Mackall <mpm@selenic.com> parents: 5007 diff changeset	1353 databytes += max(0, self.length(r))
2073 1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	1354 dd = 0
6750 fb42030d79d6 add __len__ and __iter__ methods to repo and revlog Matt Mackall <mpm@selenic.com> parents: 6703 diff changeset	1355 di = actual - len(self) * s - databytes
1667 daff3ef0de8d verify: notice extra data in indices Matt Mackall <mpm@selenic.com> parents: 1660 diff changeset	1356 except IOError, inst:
daff3ef0de8d verify: notice extra data in indices Matt Mackall <mpm@selenic.com> parents: 1660 diff changeset	1357 if inst.errno != errno.ENOENT:
daff3ef0de8d verify: notice extra data in indices Matt Mackall <mpm@selenic.com> parents: 1660 diff changeset	1358 raise
daff3ef0de8d verify: notice extra data in indices Matt Mackall <mpm@selenic.com> parents: 1660 diff changeset	1359 di = 0
daff3ef0de8d verify: notice extra data in indices Matt Mackall <mpm@selenic.com> parents: 1660 diff changeset	1360
daff3ef0de8d verify: notice extra data in indices Matt Mackall <mpm@selenic.com> parents: 1660 diff changeset	1361 return (dd, di)
6891 22cb82433842 revlog: add files method Adrian Buehlmann <adrian@cadifra.com> parents: 6872 diff changeset	1362
22cb82433842 revlog: add files method Adrian Buehlmann <adrian@cadifra.com> parents: 6872 diff changeset	1363 def files(self):
22cb82433842 revlog: add files method Adrian Buehlmann <adrian@cadifra.com> parents: 6872 diff changeset	1364 res = [ self.indexfile ]
22cb82433842 revlog: add files method Adrian Buehlmann <adrian@cadifra.com> parents: 6872 diff changeset	1365 if not self._inline:
22cb82433842 revlog: add files method Adrian Buehlmann <adrian@cadifra.com> parents: 6872 diff changeset	1366 res.append(self.datafile)
22cb82433842 revlog: add files method Adrian Buehlmann <adrian@cadifra.com> parents: 6872 diff changeset	1367 return res

Mercurial > public > mercurial-scm > hg-stable

annotate mercurial/revlog.py @ 8226:8b2cd04a6e97