mercurial-crew-with-dirclash: mercurial/revlog.py annotate

annotate mercurial/revlog.py @ 3086:e7fc04dc6349

Avoid negative block sizes in lazyparser. This fixes a bug introduced by changeset baa3873eb387 .

author	Alexis S. L. Carvalho <alexis@cecm.usp.br>
date	Wed, 13 Sep 2006 14:37:51 -0300
parents	baa3873eb387
children	cff3c58a5766

rev	line source
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	1 """
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	2 revlog.py - storage back-end for mercurial
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	3
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	4 This provides efficient delta storage with O(1) retrieve and append
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	5 and O(changes) merge between branches
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	6
2858 345bac2bc4ec update copyrights. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2801 diff changeset	7 Copyright 2005, 2006 Matt Mackall <mpm@selenic.com>
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	8
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	9 This software may be used and distributed according to the terms
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	10 of the GNU General Public License, incorporated herein by reference.
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	11 """
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	12
1089 142b5d5ec9cc Break apart hg.py mpm@selenic.com parents: 1083 diff changeset	13 from node import *
1400 cf9a1233738a i18n first part: make '_' available for files who need it Benoit Boissinot <benoit.boissinot@ens-lyon.org parents: 1393 diff changeset	14 from i18n import gettext as _
1322 b3d44e9b3092 Make revlog constructor more discerning in its treatment of errors. Bryan O'Sullivan <bos@serpentine.com> parents: 1232 diff changeset	15 from demandload import demandload
1981 736b6c96bbbc make incoming work via ssh (issue139); move chunk code into separate module. Thomas Arendsen Hein <thomas@intevation.de> parents: 1941 diff changeset	16 demandload(globals(), "binascii changegroup errno heapq mdiff os")
2176 9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2089 diff changeset	17 demandload(globals(), "sha struct util zlib")
36 da28286bf6b7 Add smart node lookup by substring or by rev number mpm@selenic.com parents: 26 diff changeset	18
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	19 # revlog version strings
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	20 REVLOGV0 = 0
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	21 REVLOGNG = 1
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	22
2073 1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	23 # revlog flags
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	24 REVLOGNGINLINEDATA = (1 << 16)
2222 c9e264b115e6 Use revlogng and inlined data files by default mason@suse.com parents: 2177 diff changeset	25 REVLOG_DEFAULT_FLAGS = REVLOGNGINLINEDATA
c9e264b115e6 Use revlogng and inlined data files by default mason@suse.com parents: 2177 diff changeset	26
c9e264b115e6 Use revlogng and inlined data files by default mason@suse.com parents: 2177 diff changeset	27 REVLOG_DEFAULT_FORMAT = REVLOGNG
c9e264b115e6 Use revlogng and inlined data files by default mason@suse.com parents: 2177 diff changeset	28 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	29
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	30 def flagstr(flag):
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	31 if flag == "inline":
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	32 return REVLOGNGINLINEDATA
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	33 raise RevlogError(_("unknown revlog flag %s" % flag))
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	34
1091 d62130f99a73 Move hash function back to revlog from node mpm@selenic.com parents: 1089 diff changeset	35 def hash(text, p1, p2):
d62130f99a73 Move hash function back to revlog from node mpm@selenic.com parents: 1089 diff changeset	36 """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	37
d62130f99a73 Move hash function back to revlog from node mpm@selenic.com parents: 1089 diff changeset	38 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	39 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	40 content in the revision graph.
d62130f99a73 Move hash function back to revlog from node mpm@selenic.com parents: 1089 diff changeset	41 """
d62130f99a73 Move hash function back to revlog from node mpm@selenic.com parents: 1089 diff changeset	42 l = [p1, p2]
d62130f99a73 Move hash function back to revlog from node mpm@selenic.com parents: 1089 diff changeset	43 l.sort()
d62130f99a73 Move hash function back to revlog from node mpm@selenic.com parents: 1089 diff changeset	44 s = sha.new(l[0])
d62130f99a73 Move hash function back to revlog from node mpm@selenic.com parents: 1089 diff changeset	45 s.update(l[1])
d62130f99a73 Move hash function back to revlog from node mpm@selenic.com parents: 1089 diff changeset	46 s.update(text)
d62130f99a73 Move hash function back to revlog from node mpm@selenic.com parents: 1089 diff changeset	47 return s.digest()
d62130f99a73 Move hash function back to revlog from node mpm@selenic.com parents: 1089 diff changeset	48
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	49 def compress(text):
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	50 """ generate a possibly-compressed representation of text """
1533 3d11f81c9145 Reduce string duplication in compression code mason@suse.com parents: 1509 diff changeset	51 if not text: return ("", text)
112 aea6562add6c Make compression more intelligent: mpm@selenic.com parents: 98 diff changeset	52 if len(text) < 44:
1533 3d11f81c9145 Reduce string duplication in compression code mason@suse.com parents: 1509 diff changeset	53 if text[0] == '\0': return ("", text)
3d11f81c9145 Reduce string duplication in compression code mason@suse.com parents: 1509 diff changeset	54 return ('u', text)
112 aea6562add6c Make compression more intelligent: mpm@selenic.com parents: 98 diff changeset	55 bin = zlib.compress(text)
aea6562add6c Make compression more intelligent: mpm@selenic.com parents: 98 diff changeset	56 if len(bin) > len(text):
1533 3d11f81c9145 Reduce string duplication in compression code mason@suse.com parents: 1509 diff changeset	57 if text[0] == '\0': return ("", text)
3d11f81c9145 Reduce string duplication in compression code mason@suse.com parents: 1509 diff changeset	58 return ('u', text)
3d11f81c9145 Reduce string duplication in compression code mason@suse.com parents: 1509 diff changeset	59 return ("", bin)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	60
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	61 def decompress(bin):
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	62 """ decompress the given input """
112 aea6562add6c Make compression more intelligent: mpm@selenic.com parents: 98 diff changeset	63 if not bin: return bin
aea6562add6c Make compression more intelligent: mpm@selenic.com parents: 98 diff changeset	64 t = bin[0]
aea6562add6c Make compression more intelligent: mpm@selenic.com parents: 98 diff changeset	65 if t == '\0': return bin
aea6562add6c Make compression more intelligent: mpm@selenic.com parents: 98 diff changeset	66 if t == 'x': return zlib.decompress(bin)
aea6562add6c Make compression more intelligent: mpm@selenic.com parents: 98 diff changeset	67 if t == 'u': return bin[1:]
1853 5ac811b720de Fix some problems when working on broken repositories: Thomas Arendsen Hein <thomas@intevation.de> parents: 1784 diff changeset	68 raise RevlogError(_("unknown compression type %r") % t)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	69
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	70 indexformatv0 = ">4l20s20s20s"
2079 ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	71 v0shaoffset = 56
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	72 # index ng:
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	73 # 6 bytes offset
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	74 # 2 bytes flags
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	75 # 4 bytes compressed length
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	76 # 4 bytes uncompressed length
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	77 # 4 bytes: base rev
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	78 # 4 bytes link rev
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	79 # 4 bytes parent 1 rev
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	80 # 4 bytes parent 2 rev
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	81 # 32 bytes: nodeid
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	82 indexformatng = ">Qiiiiii20s12x"
2079 ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	83 ngshaoffset = 32
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	84 versionformat = ">i"
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	85
1559 59b3639df0a9 Convert all classes to new-style classes by deriving them from object. Eric Hopper <hopper@omnifarious.org> parents: 1551 diff changeset	86 class lazyparser(object):
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	87 """
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	88 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	89 """
2250 45aef5ddcdbe windows: revlog.lazyparser not always safe to use. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2222 diff changeset	90
45aef5ddcdbe windows: revlog.lazyparser not always safe to use. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2222 diff changeset	91 # 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	92 # 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	93 # 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	94 safe_to_use = os.name != 'nt' or (not util.is_win_9x() and
45aef5ddcdbe windows: revlog.lazyparser not always safe to use. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2222 diff changeset	95 hasattr(util, 'win32api'))
45aef5ddcdbe windows: revlog.lazyparser not always safe to use. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2222 diff changeset	96
2079 ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	97 def __init__(self, dataf, size, indexformat, shaoffset):
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	98 self.dataf = dataf
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	99 self.format = indexformat
76 d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	100 self.s = struct.calcsize(indexformat)
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	101 self.indexformat = indexformat
2079 ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	102 self.datasize = size
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	103 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	104 self.index = [None] * self.l
d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	105 self.map = {nullid: -1}
2079 ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	106 self.allmap = 0
323 c6f0673ab7e9 lazyparser speed ups mpm@selenic.com parents: 306 diff changeset	107 self.all = 0
2079 ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	108 self.mapfind_count = 0
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	109 self.shaoffset = shaoffset
76 d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	110
2079 ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	111 def loadmap(self):
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	112 """
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	113 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	114 not a duplicate. This requires loading the entire index,
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	115 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	116 which takes much less time.
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	117 """
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	118 if self.allmap: return
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	119 start = 0
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	120 end = self.datasize
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	121 self.allmap = 1
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	122 cur = 0
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	123 count = 0
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	124 blocksize = self.s * 256
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	125 self.dataf.seek(0)
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	126 while cur < end:
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	127 data = self.dataf.read(blocksize)
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	128 off = 0
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	129 for x in xrange(256):
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	130 n = data[off + self.shaoffset:off + self.shaoffset + 20]
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	131 self.map[n] = count
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	132 count += 1
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	133 if count >= self.l:
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	134 break
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	135 off += self.s
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	136 cur += blocksize
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	137
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	138 def loadblock(self, blockstart, blocksize, data=None):
323 c6f0673ab7e9 lazyparser speed ups mpm@selenic.com parents: 306 diff changeset	139 if self.all: return
2079 ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	140 if data is None:
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	141 self.dataf.seek(blockstart)
3075 baa3873eb387 don't let lazyparser read more data than it can handle Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2910 diff changeset	142 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: 2910 diff changeset	143 # 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: 2910 diff changeset	144 # 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: 2910 diff changeset	145 # limit blocksize so that we don't get too much data.
3086 e7fc04dc6349 Avoid negative block sizes in lazyparser. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3075 diff changeset	146 blocksize = max(self.datasize - blockstart, 0)
2079 ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	147 data = self.dataf.read(blocksize)
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	148 lend = len(data) / self.s
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	149 i = blockstart / self.s
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	150 off = 0
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	151 for x in xrange(lend):
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	152 if self.index[i + x] == None:
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	153 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	154 self.index[i + x] = b
1cbb14c048cb Reduce index memory usage by storing the bare string instead of tuples mason@suse.com parents: 2079 diff changeset	155 n = b[self.shaoffset:self.shaoffset + 20]
1cbb14c048cb Reduce index memory usage by storing the bare string instead of tuples mason@suse.com parents: 2079 diff changeset	156 self.map[n] = i + x
2079 ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	157 off += self.s
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	158
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	159 def findnode(self, node):
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	160 """search backwards through the index file for a specific node"""
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	161 if self.allmap: return None
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	162
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	163 # hg log will cause many many searches for the manifest
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	164 # 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	165 # thing.
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	166 if self.mapfind_count > 8:
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	167 self.loadmap()
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	168 if node in self.map:
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	169 return node
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	170 return None
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	171 self.mapfind_count += 1
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	172 last = self.l - 1
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	173 while self.index[last] != None:
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	174 if last == 0:
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	175 self.all = 1
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	176 self.allmap = 1
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	177 return None
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	178 last -= 1
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	179 end = (last + 1) * self.s
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	180 blocksize = self.s * 256
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	181 while end >= 0:
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	182 start = max(end - blocksize, 0)
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	183 self.dataf.seek(start)
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	184 data = self.dataf.read(end - start)
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	185 findend = end - start
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	186 while True:
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	187 # we're searching backwards, so weh have to make sure
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	188 # we don't find a changeset where this node is a parent
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	189 off = data.rfind(node, 0, findend)
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	190 findend = off
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	191 if off >= 0:
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	192 i = off / self.s
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	193 off = i * self.s
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	194 n = data[off + self.shaoffset:off + self.shaoffset + 20]
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	195 if n == node:
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	196 self.map[n] = i + start / self.s
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	197 return node
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	198 else:
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	199 break
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	200 end -= blocksize
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	201 return None
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	202
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	203 def loadindex(self, i=None, end=None):
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	204 if self.all: return
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	205 all = False
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	206 if i == None:
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	207 blockstart = 0
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	208 blocksize = (512 / self.s) * self.s
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	209 end = self.datasize
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	210 all = True
323 c6f0673ab7e9 lazyparser speed ups mpm@selenic.com parents: 306 diff changeset	211 else:
2079 ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	212 if end:
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	213 blockstart = i * self.s
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	214 end = end * self.s
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	215 blocksize = end - blockstart
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	216 else:
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	217 blockstart = (i & ~(32)) * self.s
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	218 blocksize = self.s * 64
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	219 end = blockstart + blocksize
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	220 while blockstart < end:
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	221 self.loadblock(blockstart, blocksize)
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	222 blockstart += blocksize
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	223 if all: self.all = True
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 484 diff changeset	224
1559 59b3639df0a9 Convert all classes to new-style classes by deriving them from object. Eric Hopper <hopper@omnifarious.org> parents: 1551 diff changeset	225 class lazyindex(object):
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	226 """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	227 def __init__(self, parser):
d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	228 self.p = parser
d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	229 def __len__(self):
d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	230 return len(self.p.index)
115 39b438eeb25a Make lazyindex load slightly faster mpm@selenic.com parents: 112 diff changeset	231 def load(self, pos):
1403 bc3e66edb04c lazyindex fix, make load handle negative indexes properly. Eric Hopper <hopper@omnifarious.org> parents: 1402 diff changeset	232 if pos < 0:
bc3e66edb04c lazyindex fix, make load handle negative indexes properly. Eric Hopper <hopper@omnifarious.org> parents: 1402 diff changeset	233 pos += len(self.p.index)
2079 ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	234 self.p.loadindex(pos)
115 39b438eeb25a Make lazyindex load slightly faster mpm@selenic.com parents: 112 diff changeset	235 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	236 def __getitem__(self, pos):
2080 1cbb14c048cb Reduce index memory usage by storing the bare string instead of tuples mason@suse.com parents: 2079 diff changeset	237 ret = self.p.index[pos] or self.load(pos)
1cbb14c048cb Reduce index memory usage by storing the bare string instead of tuples mason@suse.com parents: 2079 diff changeset	238 if isinstance(ret, str):
1cbb14c048cb Reduce index memory usage by storing the bare string instead of tuples mason@suse.com parents: 2079 diff changeset	239 ret = struct.unpack(self.p.indexformat, ret)
1cbb14c048cb Reduce index memory usage by storing the bare string instead of tuples mason@suse.com parents: 2079 diff changeset	240 return ret
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	241 def __setitem__(self, pos, item):
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	242 self.p.index[pos] = item
1535 7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	243 def __delitem__(self, pos):
7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	244 del 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	245 def append(self, e):
d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	246 self.p.index.append(e)
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 484 diff changeset	247
1559 59b3639df0a9 Convert all classes to new-style classes by deriving them from object. Eric Hopper <hopper@omnifarious.org> parents: 1551 diff changeset	248 class lazymap(object):
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	249 """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	250 def __init__(self, parser):
d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	251 self.p = parser
d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	252 def load(self, key):
2079 ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	253 n = self.p.findnode(key)
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	254 if n == None:
1214 34706a835d4a Smarter handling of revlog key errors mpm@selenic.com parents: 1201 diff changeset	255 raise KeyError(key)
76 d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	256 def __contains__(self, key):
2079 ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	257 if key in self.p.map:
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	258 return True
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	259 self.p.loadmap()
323 c6f0673ab7e9 lazyparser speed ups mpm@selenic.com parents: 306 diff changeset	260 return key in self.p.map
97 7a2abee6b0c2 Add iterator to the lazymap code mpm@selenic.com parents: 94 diff changeset	261 def __iter__(self):
469 e205194ca7ef Various node id lookup tweaks mpm@selenic.com parents: 451 diff changeset	262 yield nullid
97 7a2abee6b0c2 Add iterator to the lazymap code mpm@selenic.com parents: 94 diff changeset	263 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	264 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	265 if not ret:
2079 ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	266 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	267 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	268 if isinstance(ret, str):
1cbb14c048cb Reduce index memory usage by storing the bare string instead of tuples mason@suse.com parents: 2079 diff changeset	269 ret = struct.unpack(self.p.indexformat, ret)
1cbb14c048cb Reduce index memory usage by storing the bare string instead of tuples mason@suse.com parents: 2079 diff changeset	270 yield ret[-1]
76 d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	271 def __getitem__(self, key):
d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	272 try:
d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	273 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	274 except KeyError:
86 1b945e8ba67b Friendlier exceptions for unknown node errors mpm@selenic.com parents: 84 diff changeset	275 try:
1b945e8ba67b Friendlier exceptions for unknown node errors mpm@selenic.com parents: 84 diff changeset	276 self.load(key)
1b945e8ba67b Friendlier exceptions for unknown node errors mpm@selenic.com parents: 84 diff changeset	277 return self.p.map[key]
1b945e8ba67b Friendlier exceptions for unknown node errors mpm@selenic.com parents: 84 diff changeset	278 except KeyError:
1b945e8ba67b Friendlier exceptions for unknown node errors mpm@selenic.com parents: 84 diff changeset	279 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	280 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	281 self.p.map[key] = val
1535 7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	282 def __delitem__(self, key):
7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	283 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	284
1073 7b35a980b982 [PATCH] raise exceptions with Exception subclasses Bart Trojanowski <bart@jukie.net> parents: 1062 diff changeset	285 class RevlogError(Exception): pass
7b35a980b982 [PATCH] raise exceptions with Exception subclasses Bart Trojanowski <bart@jukie.net> parents: 1062 diff changeset	286
1559 59b3639df0a9 Convert all classes to new-style classes by deriving them from object. Eric Hopper <hopper@omnifarious.org> parents: 1551 diff changeset	287 class revlog(object):
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	288 """
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	289 the underlying revision storage object
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	290
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	291 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	292
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	293 The index is a file with a fixed record size containing
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	294 information on each revision, includings its nodeid (hash), the
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	295 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	296 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	297 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	298 data.
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	299
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	300 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	301 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	302 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	303 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	304 version data. This makes retrieval of a version proportional to
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	305 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	306
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	307 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	308 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	309 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	310 for locking while reading.
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	311 """
2222 c9e264b115e6 Use revlogng and inlined data files by default mason@suse.com parents: 2177 diff changeset	312 def __init__(self, opener, indexfile, datafile,
c9e264b115e6 Use revlogng and inlined data files by default mason@suse.com parents: 2177 diff changeset	313 defversion=REVLOG_DEFAULT_VERSION):
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	314 """
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	315 create a revlog object
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	316
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	317 opener is a function that abstracts the file opening operation
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	318 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	319 """
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	320 self.indexfile = indexfile
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	321 self.datafile = datafile
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	322 self.opener = opener
1784 2e0a288ca93e revalidate revlog data after locking the repo (issue132) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1749 diff changeset	323
2e0a288ca93e revalidate revlog data after locking the repo (issue132) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1749 diff changeset	324 self.indexstat = None
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	325 self.cache = None
1598 14d1f1868bf6 cleanup of revlog.group when repository is local Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	326 self.chunkcache = None
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	327 self.defversion = defversion
1784 2e0a288ca93e revalidate revlog data after locking the repo (issue132) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1749 diff changeset	328 self.load()
116 e484cd5ec282 Only use lazy indexing for big indices and avoid the overhead of the mpm@selenic.com parents: 115 diff changeset	329
1784 2e0a288ca93e revalidate revlog data after locking the repo (issue132) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1749 diff changeset	330 def load(self):
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	331 v = self.defversion
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	332 try:
1784 2e0a288ca93e revalidate revlog data after locking the repo (issue132) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1749 diff changeset	333 f = self.opener(self.indexfile)
2079 ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	334 i = f.read(4)
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	335 f.seek(0)
1322 b3d44e9b3092 Make revlog constructor more discerning in its treatment of errors. Bryan O'Sullivan <bos@serpentine.com> parents: 1232 diff changeset	336 except IOError, inst:
b3d44e9b3092 Make revlog constructor more discerning in its treatment of errors. Bryan O'Sullivan <bos@serpentine.com> parents: 1232 diff changeset	337 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	338 raise
76 d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	339 i = ""
1784 2e0a288ca93e revalidate revlog data after locking the repo (issue132) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1749 diff changeset	340 else:
2e0a288ca93e revalidate revlog data after locking the repo (issue132) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1749 diff changeset	341 try:
2176 9b42304d9896 fix file handling bugs on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2089 diff changeset	342 st = util.fstat(f)
1784 2e0a288ca93e revalidate revlog data after locking the repo (issue132) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1749 diff changeset	343 except AttributeError, inst:
2e0a288ca93e revalidate revlog data after locking the repo (issue132) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1749 diff changeset	344 st = None
2e0a288ca93e revalidate revlog data after locking the repo (issue132) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1749 diff changeset	345 else:
2e0a288ca93e revalidate revlog data after locking the repo (issue132) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1749 diff changeset	346 oldst = self.indexstat
2e0a288ca93e revalidate revlog data after locking the repo (issue132) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1749 diff changeset	347 if (oldst and st.st_dev == oldst.st_dev
2e0a288ca93e revalidate revlog data after locking the repo (issue132) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1749 diff changeset	348 and st.st_ino == oldst.st_ino
2e0a288ca93e revalidate revlog data after locking the repo (issue132) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1749 diff changeset	349 and st.st_mtime == oldst.st_mtime
2e0a288ca93e revalidate revlog data after locking the repo (issue132) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1749 diff changeset	350 and st.st_ctime == oldst.st_ctime):
2e0a288ca93e revalidate revlog data after locking the repo (issue132) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1749 diff changeset	351 return
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	352 self.indexstat = st
2138 f5046cab9e2e Fix revlog-ng interaction with old-http. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2089 diff changeset	353 if len(i) > 0:
f5046cab9e2e Fix revlog-ng interaction with old-http. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2089 diff changeset	354 v = struct.unpack(versionformat, i)[0]
2073 1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	355 flags = v & ~0xFFFF
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	356 fmt = v & 0xFFFF
2142 8a1e2a9c7013 Replaced 0 with REVLOGV0 where this meaning is used. Thomas Arendsen Hein <thomas@intevation.de> parents: 2141 diff changeset	357 if fmt == REVLOGV0:
2073 1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	358 if flags:
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	359 raise RevlogError(_("index %s invalid flags %x for format v0" %
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	360 (self.indexfile, flags)))
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	361 elif fmt == REVLOGNG:
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	362 if flags & ~REVLOGNGINLINEDATA:
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	363 raise RevlogError(_("index %s invalid flags %x for revlogng" %
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	364 (self.indexfile, flags)))
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	365 else:
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	366 raise RevlogError(_("index %s invalid format %d" %
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	367 (self.indexfile, fmt)))
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	368 self.version = v
2142 8a1e2a9c7013 Replaced 0 with REVLOGV0 where this meaning is used. Thomas Arendsen Hein <thomas@intevation.de> parents: 2141 diff changeset	369 if v == REVLOGV0:
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	370 self.indexformat = indexformatv0
2079 ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	371 shaoffset = v0shaoffset
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	372 else:
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	373 self.indexformat = indexformatng
2079 ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	374 shaoffset = ngshaoffset
116 e484cd5ec282 Only use lazy indexing for big indices and avoid the overhead of the mpm@selenic.com parents: 115 diff changeset	375
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	376 if i:
2250 45aef5ddcdbe windows: revlog.lazyparser not always safe to use. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2222 diff changeset	377 if (lazyparser.safe_to_use and not self.inlinedata() and
45aef5ddcdbe windows: revlog.lazyparser not always safe to use. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2222 diff changeset	378 st and st.st_size > 10000):
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	379 # big index, let's parse it on demand
2079 ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	380 parser = lazyparser(f, st.st_size, self.indexformat, shaoffset)
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	381 self.index = lazyindex(parser)
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	382 self.nodemap = lazymap(parser)
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	383 else:
2255 3f38e872f39a Reduce ram used for very large inlined index files mason@suse.com parents: 2250 diff changeset	384 self.parseindex(f, st)
2142 8a1e2a9c7013 Replaced 0 with REVLOGV0 where this meaning is used. Thomas Arendsen Hein <thomas@intevation.de> parents: 2141 diff changeset	385 if self.version != REVLOGV0:
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	386 e = list(self.index[0])
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	387 type = self.ngtype(e[0])
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	388 e[0] = self.offset_type(0, type)
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	389 self.index[0] = e
116 e484cd5ec282 Only use lazy indexing for big indices and avoid the overhead of the mpm@selenic.com parents: 115 diff changeset	390 else:
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	391 self.nodemap = { nullid: -1}
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	392 self.index = []
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	393
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	394
2255 3f38e872f39a Reduce ram used for very large inlined index files mason@suse.com parents: 2250 diff changeset	395 def parseindex(self, fp, st):
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	396 s = struct.calcsize(self.indexformat)
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	397 self.index = []
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	398 self.nodemap = {nullid: -1}
2073 1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	399 inline = self.inlinedata()
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	400 n = 0
2255 3f38e872f39a Reduce ram used for very large inlined index files mason@suse.com parents: 2250 diff changeset	401 leftover = None
3f38e872f39a Reduce ram used for very large inlined index files mason@suse.com parents: 2250 diff changeset	402 while True:
3f38e872f39a Reduce ram used for very large inlined index files mason@suse.com parents: 2250 diff changeset	403 if st:
3f38e872f39a Reduce ram used for very large inlined index files mason@suse.com parents: 2250 diff changeset	404 data = fp.read(65536)
3f38e872f39a Reduce ram used for very large inlined index files mason@suse.com parents: 2250 diff changeset	405 else:
3f38e872f39a Reduce ram used for very large inlined index files mason@suse.com parents: 2250 diff changeset	406 # hack for httprangereader, it doesn't do partial reads well
3f38e872f39a Reduce ram used for very large inlined index files mason@suse.com parents: 2250 diff changeset	407 data = fp.read()
3f38e872f39a Reduce ram used for very large inlined index files mason@suse.com parents: 2250 diff changeset	408 if not data:
3f38e872f39a Reduce ram used for very large inlined index files mason@suse.com parents: 2250 diff changeset	409 break
3f38e872f39a Reduce ram used for very large inlined index files mason@suse.com parents: 2250 diff changeset	410 if n == 0 and self.inlinedata():
3f38e872f39a Reduce ram used for very large inlined index files mason@suse.com parents: 2250 diff changeset	411 # cache the first chunk
3f38e872f39a Reduce ram used for very large inlined index files mason@suse.com parents: 2250 diff changeset	412 self.chunkcache = (0, data)
2289 854954fd410a Fix revlog.parseindex Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2255 diff changeset	413 if leftover:
854954fd410a Fix revlog.parseindex Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2255 diff changeset	414 data = leftover + data
854954fd410a Fix revlog.parseindex Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2255 diff changeset	415 leftover = None
2255 3f38e872f39a Reduce ram used for very large inlined index files mason@suse.com parents: 2250 diff changeset	416 off = 0
3f38e872f39a Reduce ram used for very large inlined index files mason@suse.com parents: 2250 diff changeset	417 l = len(data)
3f38e872f39a Reduce ram used for very large inlined index files mason@suse.com parents: 2250 diff changeset	418 while off < l:
3f38e872f39a Reduce ram used for very large inlined index files mason@suse.com parents: 2250 diff changeset	419 if l - off < s:
3f38e872f39a Reduce ram used for very large inlined index files mason@suse.com parents: 2250 diff changeset	420 leftover = data[off:]
3f38e872f39a Reduce ram used for very large inlined index files mason@suse.com parents: 2250 diff changeset	421 break
2289 854954fd410a Fix revlog.parseindex Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2255 diff changeset	422 cur = data[off:off + s]
854954fd410a Fix revlog.parseindex Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2255 diff changeset	423 off += s
2255 3f38e872f39a Reduce ram used for very large inlined index files mason@suse.com parents: 2250 diff changeset	424 e = struct.unpack(self.indexformat, cur)
3f38e872f39a Reduce ram used for very large inlined index files mason@suse.com parents: 2250 diff changeset	425 self.index.append(e)
3f38e872f39a Reduce ram used for very large inlined index files mason@suse.com parents: 2250 diff changeset	426 self.nodemap[e[-1]] = n
3f38e872f39a Reduce ram used for very large inlined index files mason@suse.com parents: 2250 diff changeset	427 n += 1
3f38e872f39a Reduce ram used for very large inlined index files mason@suse.com parents: 2250 diff changeset	428 if inline:
3f38e872f39a Reduce ram used for very large inlined index files mason@suse.com parents: 2250 diff changeset	429 off += e[1]
3f38e872f39a Reduce ram used for very large inlined index files mason@suse.com parents: 2250 diff changeset	430 if off > l:
3f38e872f39a Reduce ram used for very large inlined index files mason@suse.com parents: 2250 diff changeset	431 # some things don't seek well, just read it
3f38e872f39a Reduce ram used for very large inlined index files mason@suse.com parents: 2250 diff changeset	432 fp.read(off - l)
3f38e872f39a Reduce ram used for very large inlined index files mason@suse.com parents: 2250 diff changeset	433 if not st:
3f38e872f39a Reduce ram used for very large inlined index files mason@suse.com parents: 2250 diff changeset	434 break
2600 c4325f0a9b91 clean up trailing white space. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2561 diff changeset	435
116 e484cd5ec282 Only use lazy indexing for big indices and avoid the overhead of the mpm@selenic.com parents: 115 diff changeset	436
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	437 def ngoffset(self, q):
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	438 if q & 0xFFFF:
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	439 raise RevlogError(_('%s: incompatible revision flag %x') %
2141 ed631e83fa06 Corrected error message for incompatible revision flags. Thomas Arendsen Hein <thomas@intevation.de> parents: 2138 diff changeset	440 (self.indexfile, q))
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	441 return long(q >> 16)
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	442
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	443 def ngtype(self, q):
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	444 return int(q & 0xFFFF)
116 e484cd5ec282 Only use lazy indexing for big indices and avoid the overhead of the mpm@selenic.com parents: 115 diff changeset	445
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	446 def offset_type(self, offset, type):
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	447 return long(long(offset) << 16 \| type)
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	448
2079 ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	449 def loadindex(self, start, end):
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	450 """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	451 if isinstance(self.index, lazyindex):
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	452 self.index.p.loadindex(start, end)
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	453
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	454 def loadindexmap(self):
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	455 """loads both the map and the index from the lazy parser"""
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	456 if isinstance(self.index, lazyindex):
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	457 p = self.index.p
2079 ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	458 p.loadindex()
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	459 self.nodemap = p.map
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	460
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	461 def loadmap(self):
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	462 """loads the map from the lazy parser"""
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	463 if isinstance(self.nodemap, lazymap):
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	464 self.nodemap.p.loadmap()
ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	465 self.nodemap = self.nodemap.p.map
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	466
2073 1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	467 def inlinedata(self): return self.version & REVLOGNGINLINEDATA
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	468 def tip(self): return self.node(len(self.index) - 1)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	469 def count(self): return len(self.index)
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	470 def node(self, rev):
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	471 return (rev < 0) and nullid or self.index[rev][-1]
1201 59bfbdbc38f6 revlog: raise informative exception if file is missing. Bryan O'Sullivan <bos@serpentine.com> parents: 1099 diff changeset	472 def rev(self, node):
59bfbdbc38f6 revlog: raise informative exception if file is missing. Bryan O'Sullivan <bos@serpentine.com> parents: 1099 diff changeset	473 try:
59bfbdbc38f6 revlog: raise informative exception if file is missing. Bryan O'Sullivan <bos@serpentine.com> parents: 1099 diff changeset	474 return self.nodemap[node]
59bfbdbc38f6 revlog: raise informative exception if file is missing. Bryan O'Sullivan <bos@serpentine.com> parents: 1099 diff changeset	475 except KeyError:
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	476 raise RevlogError(_('%s: no node %s') % (self.indexfile, hex(node)))
2651 6414ee2eb688 correct the handling of linkrev with nullid Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2650 diff changeset	477 def linkrev(self, node):
6414ee2eb688 correct the handling of linkrev with nullid Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2650 diff changeset	478 return (node == nullid) and -1 or self.index[self.rev(node)][-4]
2 ecf3fd948051 Handle nullid better for ancestor mpm@selenic.com parents: 0 diff changeset	479 def parents(self, node):
ecf3fd948051 Handle nullid better for ancestor mpm@selenic.com parents: 0 diff changeset	480 if node == nullid: return (nullid, nullid)
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	481 r = self.rev(node)
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	482 d = self.index[r][-3:-1]
2142 8a1e2a9c7013 Replaced 0 with REVLOGV0 where this meaning is used. Thomas Arendsen Hein <thomas@intevation.de> parents: 2141 diff changeset	483 if self.version == REVLOGV0:
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	484 return d
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	485 return [ self.node(x) for x in d ]
2489 568e58eed096 Add revlog.parentrevs function. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2354 diff changeset	486 def parentrevs(self, rev):
568e58eed096 Add revlog.parentrevs function. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2354 diff changeset	487 if rev == -1:
568e58eed096 Add revlog.parentrevs function. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2354 diff changeset	488 return (-1, -1)
568e58eed096 Add revlog.parentrevs function. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2354 diff changeset	489 d = self.index[rev][-3:-1]
568e58eed096 Add revlog.parentrevs function. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2354 diff changeset	490 if self.version == REVLOGV0:
568e58eed096 Add revlog.parentrevs function. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2354 diff changeset	491 return [ self.rev(x) for x in d ]
568e58eed096 Add revlog.parentrevs function. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2354 diff changeset	492 return d
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	493 def start(self, rev):
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	494 if rev < 0:
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	495 return -1
2142 8a1e2a9c7013 Replaced 0 with REVLOGV0 where this meaning is used. Thomas Arendsen Hein <thomas@intevation.de> parents: 2141 diff changeset	496 if self.version != REVLOGV0:
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	497 return self.ngoffset(self.index[rev][0])
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	498 return self.index[rev][0]
2078 441ea218414e Fill in the uncompressed size during revlog.addgroup mason@suse.com parents: 2077 diff changeset	499
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	500 def end(self, rev): return self.start(rev) + self.length(rev)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	501
2078 441ea218414e Fill in the uncompressed size during revlog.addgroup mason@suse.com parents: 2077 diff changeset	502 def size(self, rev):
441ea218414e Fill in the uncompressed size during revlog.addgroup mason@suse.com parents: 2077 diff changeset	503 """return the length of the uncompressed text for a given revision"""
441ea218414e Fill in the uncompressed size during revlog.addgroup mason@suse.com parents: 2077 diff changeset	504 l = -1
2142 8a1e2a9c7013 Replaced 0 with REVLOGV0 where this meaning is used. Thomas Arendsen Hein <thomas@intevation.de> parents: 2141 diff changeset	505 if self.version != REVLOGV0:
2078 441ea218414e Fill in the uncompressed size during revlog.addgroup mason@suse.com parents: 2077 diff changeset	506 l = self.index[rev][2]
441ea218414e Fill in the uncompressed size during revlog.addgroup mason@suse.com parents: 2077 diff changeset	507 if l >= 0:
441ea218414e Fill in the uncompressed size during revlog.addgroup mason@suse.com parents: 2077 diff changeset	508 return l
441ea218414e Fill in the uncompressed size during revlog.addgroup mason@suse.com parents: 2077 diff changeset	509
441ea218414e Fill in the uncompressed size during revlog.addgroup mason@suse.com parents: 2077 diff changeset	510 t = self.revision(self.node(rev))
441ea218414e Fill in the uncompressed size during revlog.addgroup mason@suse.com parents: 2077 diff changeset	511 return len(t)
441ea218414e Fill in the uncompressed size during revlog.addgroup mason@suse.com parents: 2077 diff changeset	512
441ea218414e Fill in the uncompressed size during revlog.addgroup mason@suse.com parents: 2077 diff changeset	513 # 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	514 # 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	515 # 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	516 """
441ea218414e Fill in the uncompressed size during revlog.addgroup mason@suse.com parents: 2077 diff changeset	517 if self.cache and self.cache[1] == rev:
441ea218414e Fill in the uncompressed size during revlog.addgroup mason@suse.com parents: 2077 diff changeset	518 return len(self.cache[2])
441ea218414e Fill in the uncompressed size during revlog.addgroup mason@suse.com parents: 2077 diff changeset	519
441ea218414e Fill in the uncompressed size during revlog.addgroup mason@suse.com parents: 2077 diff changeset	520 base = self.base(rev)
441ea218414e Fill in the uncompressed size during revlog.addgroup mason@suse.com parents: 2077 diff changeset	521 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	522 base = self.cache[1]
441ea218414e Fill in the uncompressed size during revlog.addgroup mason@suse.com parents: 2077 diff changeset	523 text = self.cache[2]
441ea218414e Fill in the uncompressed size during revlog.addgroup mason@suse.com parents: 2077 diff changeset	524 else:
441ea218414e Fill in the uncompressed size during revlog.addgroup mason@suse.com parents: 2077 diff changeset	525 text = self.revision(self.node(base))
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 l = len(text)
441ea218414e Fill in the uncompressed size during revlog.addgroup mason@suse.com parents: 2077 diff changeset	528 for x in xrange(base + 1, rev + 1):
441ea218414e Fill in the uncompressed size during revlog.addgroup mason@suse.com parents: 2077 diff changeset	529 l = mdiff.patchedsize(l, self.chunk(x))
441ea218414e Fill in the uncompressed size during revlog.addgroup mason@suse.com parents: 2077 diff changeset	530 return l
441ea218414e Fill in the uncompressed size during revlog.addgroup mason@suse.com parents: 2077 diff changeset	531 """
441ea218414e Fill in the uncompressed size during revlog.addgroup mason@suse.com parents: 2077 diff changeset	532
1941 7518823709a2 revlog.py: factorization and fixes for rev < 0 (nullid) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1853 diff changeset	533 def length(self, rev):
7518823709a2 revlog.py: factorization and fixes for rev < 0 (nullid) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1853 diff changeset	534 if rev < 0:
7518823709a2 revlog.py: factorization and fixes for rev < 0 (nullid) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1853 diff changeset	535 return 0
7518823709a2 revlog.py: factorization and fixes for rev < 0 (nullid) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1853 diff changeset	536 else:
7518823709a2 revlog.py: factorization and fixes for rev < 0 (nullid) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1853 diff changeset	537 return self.index[rev][1]
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	538 def base(self, rev): return (rev < 0) and rev or self.index[rev][-5]
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	539
1074 55bf5cfde69e Add revlog.reachable to find a graph of ancestors for a given rev mason@suse.com parents: 1073 diff changeset	540 def reachable(self, rev, stop=None):
55bf5cfde69e Add revlog.reachable to find a graph of ancestors for a given rev mason@suse.com parents: 1073 diff changeset	541 reachable = {}
55bf5cfde69e Add revlog.reachable to find a graph of ancestors for a given rev mason@suse.com parents: 1073 diff changeset	542 visit = [rev]
55bf5cfde69e Add revlog.reachable to find a graph of ancestors for a given rev mason@suse.com parents: 1073 diff changeset	543 reachable[rev] = 1
55bf5cfde69e Add revlog.reachable to find a graph of ancestors for a given rev mason@suse.com parents: 1073 diff changeset	544 if stop:
55bf5cfde69e Add revlog.reachable to find a graph of ancestors for a given rev mason@suse.com parents: 1073 diff changeset	545 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	546 else:
55bf5cfde69e Add revlog.reachable to find a graph of ancestors for a given rev mason@suse.com parents: 1073 diff changeset	547 stopn = 0
55bf5cfde69e Add revlog.reachable to find a graph of ancestors for a given rev mason@suse.com parents: 1073 diff changeset	548 while visit:
55bf5cfde69e Add revlog.reachable to find a graph of ancestors for a given rev mason@suse.com parents: 1073 diff changeset	549 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	550 if n == stop:
55bf5cfde69e Add revlog.reachable to find a graph of ancestors for a given rev mason@suse.com parents: 1073 diff changeset	551 continue
55bf5cfde69e Add revlog.reachable to find a graph of ancestors for a given rev mason@suse.com parents: 1073 diff changeset	552 if n == nullid:
55bf5cfde69e Add revlog.reachable to find a graph of ancestors for a given rev mason@suse.com parents: 1073 diff changeset	553 continue
55bf5cfde69e Add revlog.reachable to find a graph of ancestors for a given rev mason@suse.com parents: 1073 diff changeset	554 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	555 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	556 continue
55bf5cfde69e Add revlog.reachable to find a graph of ancestors for a given rev mason@suse.com parents: 1073 diff changeset	557 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	558 reachable[p] = 1
55bf5cfde69e Add revlog.reachable to find a graph of ancestors for a given rev mason@suse.com parents: 1073 diff changeset	559 visit.append(p)
55bf5cfde69e Add revlog.reachable to find a graph of ancestors for a given rev mason@suse.com parents: 1073 diff changeset	560 return reachable
55bf5cfde69e Add revlog.reachable to find a graph of ancestors for a given rev mason@suse.com parents: 1073 diff changeset	561
1457 518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	562 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	563 """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	564 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	565 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	566
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	567 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	568 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	569 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	570 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	571 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	572
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	573 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	574 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	575 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	576 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	577 nonodes = ([], [], [])
1457 518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	578 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	579 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	580 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	581 return nonodes
1457 518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	582 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	583 else:
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	584 roots = [nullid] # Everybody's a descendent of nullid
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	585 lowestrev = -1
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	586 if (lowestrev == -1) and (heads is None):
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	587 # We want _all_ the nodes!
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	588 return ([self.node(r) for r in xrange(0, self.count())],
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	589 [nullid], list(self.heads()))
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	590 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	591 # 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	592 # node.
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	593 highestrev = self.count() - 1
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	594 # 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	595 ancestors = None
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	596 # 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	597 heads = {}
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	598 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	599 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	600 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	601 return nonodes
1457 518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	602 ancestors = {}
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	603 # Start at the top and keep marking parents until we're done.
1463 26e73acc0cdf Fix to handle case of empty list for roots or heads in nodesbetween. Eric Hopper <hopper@omnifarious.org> parents: 1459 diff changeset	604 nodestotag = heads[:]
1457 518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	605 # 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	606 # 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	607 # find from roots.
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	608 heads = dict.fromkeys(heads, 0)
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	609 # 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	610 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	611 while nodestotag:
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	612 # 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	613 n = nodestotag.pop()
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	614 # Never tag nullid
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	615 if n == nullid:
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	616 continue
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	617 # 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	618 # 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	619 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	620 if r >= lowestrev:
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	621 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	622 # 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	623 # 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	624 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	625 # Add non-nullid parents to list of nodes to tag.
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	626 nodestotag.extend([p for p in self.parents(n) if
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	627 p != nullid])
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	628 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	629 # 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	630 # any other heads.
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	631 heads.pop(n)
1459 106fdec8e1fb Fix small bug in nodesbetween if heads is [nullid]. Eric Hopper <hopper@omnifarious.org> parents: 1458 diff changeset	632 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	633 return nonodes
1457 518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	634 # 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	635 # 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	636
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	637 # If one of the roots was nullid, everything is included anyway.
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	638 if lowestrev > -1:
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	639 # 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	640 # 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	641
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	642 # 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	643 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	644 # 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	645 if roots:
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	646 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	647 else:
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	648 # 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	649 return nonodes
1457 518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	650 else:
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	651 # 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	652 # any other roots.
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	653 lowestrev = -1
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	654 roots = [nullid]
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	655 # Transform our roots list into a 'set' (i.e. a dictionary where the
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	656 # values don't matter.
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	657 descendents = dict.fromkeys(roots, 1)
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	658 # 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	659 # '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	660 roots = descendents.copy()
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	661 # 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	662 orderedout = []
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	663 # 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	664 # 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	665 # they're descendents.
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	666 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	667 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	668 isdescendent = False
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	669 if lowestrev == -1: # Everybody is a descendent of nullid
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	670 isdescendent = True
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	671 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	672 # 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	673 isdescendent = True
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	674 # 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	675 # 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	676 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	677 # 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	678 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	679 # 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	680 if (p[0] in descendents) or (p[1] in descendents):
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	681 roots.pop(n)
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	682 else:
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	683 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	684 # 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	685 # 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	686 # up there, remember?)
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	687 if (p[0] in descendents) or (p[1] in descendents):
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	688 descendents[n] = 1
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	689 isdescendent = True
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	690 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	691 # 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	692 orderedout.append(n)
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	693 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	694 # 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	695 # from roots.
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	696 # 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	697 heads[n] = 1
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	698 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	699 # 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	700 # 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	701 # 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	702 heads[n] = 1
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	703 # 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	704 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	705 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	706 heads = [n for n in heads.iterkeys() if heads[n] != 0]
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	707 roots = roots.keys()
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	708 assert orderedout
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	709 assert roots
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	710 assert heads
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	711 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	712
1551 e793cbc8be00 Fixes to "hg heads -r FOO": Thomas Arendsen Hein <thomas@intevation.de> parents: 1550 diff changeset	713 def heads(self, start=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	714 """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	715
e793cbc8be00 Fixes to "hg heads -r FOO": Thomas Arendsen Hein <thomas@intevation.de> parents: 1550 diff changeset	716 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	717 start will be returned
e793cbc8be00 Fixes to "hg heads -r FOO": Thomas Arendsen Hein <thomas@intevation.de> parents: 1550 diff changeset	718
e793cbc8be00 Fixes to "hg heads -r FOO": Thomas Arendsen Hein <thomas@intevation.de> parents: 1550 diff changeset	719 """
e793cbc8be00 Fixes to "hg heads -r FOO": Thomas Arendsen Hein <thomas@intevation.de> parents: 1550 diff changeset	720 if start is None:
e793cbc8be00 Fixes to "hg heads -r FOO": Thomas Arendsen Hein <thomas@intevation.de> parents: 1550 diff changeset	721 start = nullid
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	722 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	723 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	724 heads = {startrev: 1}
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	725
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	726 parentrevs = self.parentrevs
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	727 for r in xrange(startrev + 1, self.count()):
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	728 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	729 if p in reachable:
6ff82ec1f4b8 Change revlog.heads to walk the revision graph using revision numbers Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2489 diff changeset	730 reachable[r] = 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	731 heads[r] = 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	732 if p in heads:
6ff82ec1f4b8 Change revlog.heads to walk the revision graph using revision numbers Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2489 diff changeset	733 del heads[p]
6ff82ec1f4b8 Change revlog.heads to walk the revision graph using revision numbers Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 2489 diff changeset	734 return [self.node(r) for r in heads]
370 c90385d82aec revlog: add a children function mpm@selenic.com parents: 330 diff changeset	735
c90385d82aec revlog: add a children function mpm@selenic.com parents: 330 diff changeset	736 def children(self, node):
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	737 """find the children of a given node"""
370 c90385d82aec revlog: add a children function mpm@selenic.com parents: 330 diff changeset	738 c = []
c90385d82aec revlog: add a children function mpm@selenic.com parents: 330 diff changeset	739 p = self.rev(node)
c90385d82aec revlog: add a children function mpm@selenic.com parents: 330 diff changeset	740 for r in range(p + 1, self.count()):
c90385d82aec revlog: add a children function mpm@selenic.com parents: 330 diff changeset	741 n = self.node(r)
c90385d82aec revlog: add a children function mpm@selenic.com parents: 330 diff changeset	742 for pn in self.parents(n):
854 473c030d34a6 Fixed revlog.children. Tristan Wibberley <tristan@wibberley.org> parents: 655 diff changeset	743 if pn == node:
473c030d34a6 Fixed revlog.children. Tristan Wibberley <tristan@wibberley.org> parents: 655 diff changeset	744 c.append(n)
370 c90385d82aec revlog: add a children function mpm@selenic.com parents: 330 diff changeset	745 continue
c90385d82aec revlog: add a children function mpm@selenic.com parents: 330 diff changeset	746 elif pn == nullid:
c90385d82aec revlog: add a children function mpm@selenic.com parents: 330 diff changeset	747 continue
c90385d82aec revlog: add a children function mpm@selenic.com parents: 330 diff changeset	748 return c
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 484 diff changeset	749
36 da28286bf6b7 Add smart node lookup by substring or by rev number mpm@selenic.com parents: 26 diff changeset	750 def lookup(self, id):
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	751 """locate a node based on revision number or subset of hex nodeid"""
2560 c35694df7b13 revlog: handle integer arguments to lookup Matt Mackall <mpm@selenic.com> parents: 2490 diff changeset	752 if type(id) == type(0):
2650 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	753 return self.node(id)
36 da28286bf6b7 Add smart node lookup by substring or by rev number mpm@selenic.com parents: 26 diff changeset	754 try:
da28286bf6b7 Add smart node lookup by substring or by rev number mpm@selenic.com parents: 26 diff changeset	755 rev = int(id)
469 e205194ca7ef Various node id lookup tweaks mpm@selenic.com parents: 451 diff changeset	756 if str(rev) != id: raise ValueError
e205194ca7ef Various node id lookup tweaks mpm@selenic.com parents: 451 diff changeset	757 if rev < 0: rev = self.count() + rev
476 0a338d506268 Really _call_ method revlog.count in revlog.lookup() Thomas Arendsen Hein <thomas@intevation.de> parents: 469 diff changeset	758 if rev < 0 or rev >= self.count(): raise ValueError
36 da28286bf6b7 Add smart node lookup by substring or by rev number mpm@selenic.com parents: 26 diff changeset	759 return self.node(rev)
469 e205194ca7ef Various node id lookup tweaks mpm@selenic.com parents: 451 diff changeset	760 except (ValueError, OverflowError):
36 da28286bf6b7 Add smart node lookup by substring or by rev number mpm@selenic.com parents: 26 diff changeset	761 c = []
da28286bf6b7 Add smart node lookup by substring or by rev number mpm@selenic.com parents: 26 diff changeset	762 for n in self.nodemap:
469 e205194ca7ef Various node id lookup tweaks mpm@selenic.com parents: 451 diff changeset	763 if hex(n).startswith(id):
36 da28286bf6b7 Add smart node lookup by substring or by rev number mpm@selenic.com parents: 26 diff changeset	764 c.append(n)
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	765 if len(c) > 1: raise RevlogError(_("Ambiguous identifier"))
2801 81d7db1aa0fb revlog.lookup optimization Matt Mackall <mpm@selenic.com> parents: 2652 diff changeset	766 if len(c) == 1: return c[0]
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 484 diff changeset	767
2801 81d7db1aa0fb revlog.lookup optimization Matt Mackall <mpm@selenic.com> parents: 2652 diff changeset	768 # might need fixing if we change hash lengths
81d7db1aa0fb revlog.lookup optimization Matt Mackall <mpm@selenic.com> parents: 2652 diff changeset	769 if len(id) == 20 and id in self.nodemap:
81d7db1aa0fb revlog.lookup optimization Matt Mackall <mpm@selenic.com> parents: 2652 diff changeset	770 return id
81d7db1aa0fb revlog.lookup optimization Matt Mackall <mpm@selenic.com> parents: 2652 diff changeset	771
81d7db1aa0fb revlog.lookup optimization Matt Mackall <mpm@selenic.com> parents: 2652 diff changeset	772 raise RevlogError(_("No match found"))
36 da28286bf6b7 Add smart node lookup by substring or by rev number mpm@selenic.com parents: 26 diff changeset	773
2910 5df3e5cf16bc Move cmp bits from filelog to revlog Matt Mackall <mpm@selenic.com> parents: 2858 diff changeset	774 def cmp(self, node, text):
5df3e5cf16bc Move cmp bits from filelog to revlog Matt Mackall <mpm@selenic.com> parents: 2858 diff changeset	775 """compare text with a given file revision"""
5df3e5cf16bc Move cmp bits from filelog to revlog Matt Mackall <mpm@selenic.com> parents: 2858 diff changeset	776 p1, p2 = self.parents(node)
5df3e5cf16bc Move cmp bits from filelog to revlog Matt Mackall <mpm@selenic.com> parents: 2858 diff changeset	777 return hash(text, p1, p2) != node
5df3e5cf16bc Move cmp bits from filelog to revlog Matt Mackall <mpm@selenic.com> parents: 2858 diff changeset	778
5df3e5cf16bc Move cmp bits from filelog to revlog Matt Mackall <mpm@selenic.com> parents: 2858 diff changeset	779 def makenode(self, node, text):
5df3e5cf16bc Move cmp bits from filelog to revlog Matt Mackall <mpm@selenic.com> parents: 2858 diff changeset	780 """calculate a file nodeid for text, descended or possibly
5df3e5cf16bc Move cmp bits from filelog to revlog Matt Mackall <mpm@selenic.com> parents: 2858 diff changeset	781 unchanged from node"""
5df3e5cf16bc Move cmp bits from filelog to revlog Matt Mackall <mpm@selenic.com> parents: 2858 diff changeset	782
5df3e5cf16bc Move cmp bits from filelog to revlog Matt Mackall <mpm@selenic.com> parents: 2858 diff changeset	783 if self.cmp(node, text):
5df3e5cf16bc Move cmp bits from filelog to revlog Matt Mackall <mpm@selenic.com> parents: 2858 diff changeset	784 return hash(text, node, nullid)
5df3e5cf16bc Move cmp bits from filelog to revlog Matt Mackall <mpm@selenic.com> parents: 2858 diff changeset	785 return node
5df3e5cf16bc Move cmp bits from filelog to revlog Matt Mackall <mpm@selenic.com> parents: 2858 diff changeset	786
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	787 def diff(self, a, b):
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	788 """return a delta between two revisions"""
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	789 return mdiff.textdiff(a, b)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	790
73 ee1cbe841e01 Change revlog to use new patch code mpm@selenic.com parents: 71 diff changeset	791 def patches(self, t, pl):
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	792 """apply a list of patches to a string"""
73 ee1cbe841e01 Change revlog to use new patch code mpm@selenic.com parents: 71 diff changeset	793 return mdiff.patches(t, pl)
ee1cbe841e01 Change revlog to use new patch code mpm@selenic.com parents: 71 diff changeset	794
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	795 def chunk(self, rev, df=None, cachelen=4096):
1598 14d1f1868bf6 cleanup of revlog.group when repository is local Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	796 start, length = self.start(rev), self.length(rev)
2073 1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	797 inline = self.inlinedata()
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	798 if inline:
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	799 start += (rev + 1) * struct.calcsize(self.indexformat)
1598 14d1f1868bf6 cleanup of revlog.group when repository is local Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	800 end = start + length
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	801 def loadcache(df):
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	802 cache_length = max(cachelen, length) # 4k
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	803 if not df:
2073 1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	804 if inline:
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	805 df = self.opener(self.indexfile)
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	806 else:
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	807 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	808 df.seek(start)
14d1f1868bf6 cleanup of revlog.group when repository is local Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	809 self.chunkcache = (start, df.read(cache_length))
14d1f1868bf6 cleanup of revlog.group when repository is local Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	810
14d1f1868bf6 cleanup of revlog.group when repository is local Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	811 if not self.chunkcache:
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	812 loadcache(df)
1598 14d1f1868bf6 cleanup of revlog.group when repository is local Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	813
14d1f1868bf6 cleanup of revlog.group when repository is local Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	814 cache_start = self.chunkcache[0]
14d1f1868bf6 cleanup of revlog.group when repository is local Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	815 cache_end = cache_start + len(self.chunkcache[1])
14d1f1868bf6 cleanup of revlog.group when repository is local Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	816 if start >= cache_start and end <= cache_end:
14d1f1868bf6 cleanup of revlog.group when repository is local Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	817 # it is cached
14d1f1868bf6 cleanup of revlog.group when repository is local Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	818 offset = start - cache_start
14d1f1868bf6 cleanup of revlog.group when repository is local Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	819 else:
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	820 loadcache(df)
1598 14d1f1868bf6 cleanup of revlog.group when repository is local Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	821 offset = 0
14d1f1868bf6 cleanup of revlog.group when repository is local Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	822
14d1f1868bf6 cleanup of revlog.group when repository is local Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	823 #def checkchunk():
14d1f1868bf6 cleanup of revlog.group when repository is local Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	824 # df = self.opener(self.datafile)
14d1f1868bf6 cleanup of revlog.group when repository is local Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	825 # df.seek(start)
14d1f1868bf6 cleanup of revlog.group when repository is local Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	826 # return df.read(length)
14d1f1868bf6 cleanup of revlog.group when repository is local Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	827 #assert s == checkchunk()
14d1f1868bf6 cleanup of revlog.group when repository is local Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	828 return decompress(self.chunkcache[1][offset:offset + length])
14d1f1868bf6 cleanup of revlog.group when repository is local Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	829
119 c7a66f9752a4 Add code to retrieve or construct a revlog delta mpm@selenic.com parents: 117 diff changeset	830 def delta(self, node):
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	831 """return or calculate a delta between a node and its predecessor"""
119 c7a66f9752a4 Add code to retrieve or construct a revlog delta mpm@selenic.com parents: 117 diff changeset	832 r = self.rev(node)
1941 7518823709a2 revlog.py: factorization and fixes for rev < 0 (nullid) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1853 diff changeset	833 return self.revdiff(r - 1, r)
7518823709a2 revlog.py: factorization and fixes for rev < 0 (nullid) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1853 diff changeset	834
7518823709a2 revlog.py: factorization and fixes for rev < 0 (nullid) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1853 diff changeset	835 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	836 """return or calculate a delta between two revisions"""
7518823709a2 revlog.py: factorization and fixes for rev < 0 (nullid) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1853 diff changeset	837 b1 = self.base(rev1)
7518823709a2 revlog.py: factorization and fixes for rev < 0 (nullid) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1853 diff changeset	838 b2 = self.base(rev2)
7518823709a2 revlog.py: factorization and fixes for rev < 0 (nullid) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1853 diff changeset	839 if b1 == b2 and rev1 + 1 == rev2:
7518823709a2 revlog.py: factorization and fixes for rev < 0 (nullid) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1853 diff changeset	840 return self.chunk(rev2)
119 c7a66f9752a4 Add code to retrieve or construct a revlog delta mpm@selenic.com parents: 117 diff changeset	841 else:
1941 7518823709a2 revlog.py: factorization and fixes for rev < 0 (nullid) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1853 diff changeset	842 return self.diff(self.revision(self.node(rev1)),
7518823709a2 revlog.py: factorization and fixes for rev < 0 (nullid) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1853 diff changeset	843 self.revision(self.node(rev2)))
119 c7a66f9752a4 Add code to retrieve or construct a revlog delta mpm@selenic.com parents: 117 diff changeset	844
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	845 def revision(self, node):
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	846 """return an uncompressed revision of a given"""
36 da28286bf6b7 Add smart node lookup by substring or by rev number mpm@selenic.com parents: 26 diff changeset	847 if node == nullid: return ""
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	848 if self.cache and self.cache[0] == node: return self.cache[2]
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	849
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	850 # look up what we need to read
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	851 text = None
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	852 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	853 base = self.base(rev)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	854
2073 1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	855 if self.inlinedata():
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	856 # we probably have the whole chunk cached
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	857 df = None
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	858 else:
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	859 df = self.opener(self.datafile)
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	860
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	861 # do we have useful data cached?
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	862 if self.cache and self.cache[1] >= base and self.cache[1] < rev:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	863 base = self.cache[1]
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	864 text = self.cache[2]
2079 ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	865 self.loadindex(base, rev + 1)
1598 14d1f1868bf6 cleanup of revlog.group when repository is local Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	866 else:
2079 ee96ca273f32 New lazy index code for revlogs. mason@suse.com parents: 2078 diff changeset	867 self.loadindex(base, rev + 1)
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	868 text = self.chunk(base, df=df)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	869
71 47c9a869adee Add mdiff.patches to speed up applying thousands of patches to the manifest mpm@selenic.com parents: 67 diff changeset	870 bins = []
64 b3e2ddff0159 Diff in subdirectories from Jake Edge mpm@selenic.com parents: 46 diff changeset	871 for r in xrange(base + 1, rev + 1):
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	872 bins.append(self.chunk(r, df=df))
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	873
1941 7518823709a2 revlog.py: factorization and fixes for rev < 0 (nullid) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1853 diff changeset	874 text = self.patches(text, bins)
71 47c9a869adee Add mdiff.patches to speed up applying thousands of patches to the manifest mpm@selenic.com parents: 67 diff changeset	875
1598 14d1f1868bf6 cleanup of revlog.group when repository is local Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	876 p1, p2 = self.parents(node)
26 9cf83bf9ad38 Simplify integrity checking mpm@selenic.com parents: 14 diff changeset	877 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	878 raise RevlogError(_("integrity check failed on %s:%d")
98 3dde7c87e36d Add paranoia to diff code mpm@selenic.com parents: 97 diff changeset	879 % (self.datafile, rev))
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	880
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	881 self.cache = (node, rev, text)
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 484 diff changeset	882 return text
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	883
2075 343aeefb553b Make the appendfile class inline-data index friendly mason@suse.com parents: 2073 diff changeset	884 def checkinlinesize(self, tr, fp=None):
2073 1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	885 if not self.inlinedata():
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	886 return
2075 343aeefb553b Make the appendfile class inline-data index friendly mason@suse.com parents: 2073 diff changeset	887 if not fp:
343aeefb553b Make the appendfile class inline-data index friendly mason@suse.com parents: 2073 diff changeset	888 fp = self.opener(self.indexfile, 'r')
2082 856f0ba200bc Additional appendfile fixes for interleaved data/index files mason@suse.com parents: 2081 diff changeset	889 fp.seek(0, 2)
2073 1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	890 size = fp.tell()
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	891 if size < 131072:
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	892 return
2084 d66278012853 Chris Mason <mason@suse.com> parents: 2082 diff changeset	893 trinfo = tr.find(self.indexfile)
d66278012853 Chris Mason <mason@suse.com> parents: 2082 diff changeset	894 if trinfo == None:
d66278012853 Chris Mason <mason@suse.com> parents: 2082 diff changeset	895 raise RevlogError(_("%s not found in the transaction" %
d66278012853 Chris Mason <mason@suse.com> parents: 2082 diff changeset	896 self.indexfile))
d66278012853 Chris Mason <mason@suse.com> parents: 2082 diff changeset	897
d66278012853 Chris Mason <mason@suse.com> parents: 2082 diff changeset	898 trindex = trinfo[2]
d66278012853 Chris Mason <mason@suse.com> parents: 2082 diff changeset	899 dataoff = self.start(trindex)
d66278012853 Chris Mason <mason@suse.com> parents: 2082 diff changeset	900
d66278012853 Chris Mason <mason@suse.com> parents: 2082 diff changeset	901 tr.add(self.datafile, dataoff)
2073 1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	902 df = self.opener(self.datafile, 'w')
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	903 calc = struct.calcsize(self.indexformat)
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	904 for r in xrange(self.count()):
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	905 start = self.start(r) + (r + 1) * calc
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	906 length = self.length(r)
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	907 fp.seek(start)
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	908 d = fp.read(length)
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	909 df.write(d)
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	910 fp.close()
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	911 df.close()
2076 d007df6daf8e Create an atomic opener that does not automatically rename on close mason@suse.com parents: 2075 diff changeset	912 fp = self.opener(self.indexfile, 'w', atomictemp=True)
2073 1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	913 self.version &= ~(REVLOGNGINLINEDATA)
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	914 if self.count():
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	915 x = self.index[0]
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	916 e = struct.pack(self.indexformat, *x)[4:]
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	917 l = struct.pack(versionformat, self.version)
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	918 fp.write(l)
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	919 fp.write(e)
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	920
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	921 for i in xrange(1, self.count()):
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	922 x = self.index[i]
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	923 e = struct.pack(self.indexformat, *x)
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	924 fp.write(e)
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	925
2076 d007df6daf8e Create an atomic opener that does not automatically rename on close mason@suse.com parents: 2075 diff changeset	926 # 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	927 # real index
d007df6daf8e Create an atomic opener that does not automatically rename on close mason@suse.com parents: 2075 diff changeset	928 fp.rename()
2084 d66278012853 Chris Mason <mason@suse.com> parents: 2082 diff changeset	929
d66278012853 Chris Mason <mason@suse.com> parents: 2082 diff changeset	930 tr.replace(self.indexfile, trindex * calc)
2073 1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	931 self.chunkcache = None
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	932
644 6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 547 diff changeset	933 def addrevision(self, text, transaction, link, p1=None, p2=None, d=None):
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	934 """add a revision to the log
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	935
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	936 text - the revision data to add
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	937 transaction - the transaction object used for rollback
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	938 link - the linkrev data to add
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	939 p1, p2 - the parent nodeids of the revision
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	940 d - an optional precomputed delta
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	941 """
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	942 if text is None: text = ""
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	943 if p1 is None: p1 = self.tip()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	944 if p2 is None: p2 = nullid
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	945
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	946 node = hash(text, p1, p2)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	947
301 5add718d92db revlog: allow duplicates mpm@selenic.com parents: 243 diff changeset	948 if node in self.nodemap:
5add718d92db revlog: allow duplicates mpm@selenic.com parents: 243 diff changeset	949 return node
5add718d92db revlog: allow duplicates mpm@selenic.com parents: 243 diff changeset	950
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	951 n = self.count()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	952 t = n - 1
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	953
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	954 if n:
64 b3e2ddff0159 Diff in subdirectories from Jake Edge mpm@selenic.com parents: 46 diff changeset	955 base = self.base(t)
b3e2ddff0159 Diff in subdirectories from Jake Edge mpm@selenic.com parents: 46 diff changeset	956 start = self.start(base)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	957 end = self.end(t)
644 6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 547 diff changeset	958 if not d:
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 547 diff changeset	959 prev = self.revision(self.tip())
1533 3d11f81c9145 Reduce string duplication in compression code mason@suse.com parents: 1509 diff changeset	960 d = self.diff(prev, str(text))
98 3dde7c87e36d Add paranoia to diff code mpm@selenic.com parents: 97 diff changeset	961 data = compress(d)
1533 3d11f81c9145 Reduce string duplication in compression code mason@suse.com parents: 1509 diff changeset	962 l = len(data[1]) + len(data[0])
3d11f81c9145 Reduce string duplication in compression code mason@suse.com parents: 1509 diff changeset	963 dist = end - start + l
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	964
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	965 # full versions are inserted when the needed deltas
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	966 # become comparable to the uncompressed text
64 b3e2ddff0159 Diff in subdirectories from Jake Edge mpm@selenic.com parents: 46 diff changeset	967 if not n or dist > len(text) * 2:
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	968 data = compress(text)
1533 3d11f81c9145 Reduce string duplication in compression code mason@suse.com parents: 1509 diff changeset	969 l = len(data[1]) + len(data[0])
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	970 base = n
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	971 else:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	972 base = self.base(t)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	973
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	974 offset = 0
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	975 if t >= 0:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	976 offset = self.end(t)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	977
2142 8a1e2a9c7013 Replaced 0 with REVLOGV0 where this meaning is used. Thomas Arendsen Hein <thomas@intevation.de> parents: 2141 diff changeset	978 if self.version == REVLOGV0:
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	979 e = (offset, l, base, link, p1, p2, node)
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	980 else:
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	981 e = (self.offset_type(offset, 0), l, len(text),
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	982 base, link, self.rev(p1), self.rev(p2), node)
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 484 diff changeset	983
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	984 self.index.append(e)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	985 self.nodemap[node] = n
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	986 entry = struct.pack(self.indexformat, *e)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	987
2073 1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	988 if not self.inlinedata():
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	989 transaction.add(self.datafile, offset)
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	990 transaction.add(self.indexfile, n * len(entry))
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	991 f = self.opener(self.datafile, "a")
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	992 if data[0]:
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	993 f.write(data[0])
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	994 f.write(data[1])
2089 cb99c711c59f make appendfile simpler so it does not break with revlogng on windows. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2084 diff changeset	995 f.close()
2073 1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	996 f = self.opener(self.indexfile, "a")
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	997 else:
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	998 f = self.opener(self.indexfile, "a+")
2077 4d0700ae0991 Fix inlined revlogs to seek to eof after opening "a+" mason@suse.com parents: 2076 diff changeset	999 f.seek(0, 2)
2084 d66278012853 Chris Mason <mason@suse.com> parents: 2082 diff changeset	1000 transaction.add(self.indexfile, f.tell(), self.count() - 1)
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	1001
2142 8a1e2a9c7013 Replaced 0 with REVLOGV0 where this meaning is used. Thomas Arendsen Hein <thomas@intevation.de> parents: 2141 diff changeset	1002 if len(self.index) == 1 and self.version != REVLOGV0:
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	1003 l = struct.pack(versionformat, self.version)
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	1004 f.write(l)
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	1005 entry = entry[4:]
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	1006
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	1007 f.write(entry)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	1008
2073 1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	1009 if self.inlinedata():
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	1010 f.write(data[0])
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	1011 f.write(data[1])
2075 343aeefb553b Make the appendfile class inline-data index friendly mason@suse.com parents: 2073 diff changeset	1012 self.checkinlinesize(transaction, f)
2073 1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	1013
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	1014 self.cache = (node, n, text)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	1015 return node
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	1016
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	1017 def ancestor(self, a, b):
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	1018 """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	1019
416d8b2a75b8 Speedup revlog.ancestors for the linear case Chris Mason <mason@suse.com> parents: 2080 diff changeset	1020 # start with some short cuts for the linear cases
416d8b2a75b8 Speedup revlog.ancestors for the linear case Chris Mason <mason@suse.com> parents: 2080 diff changeset	1021 if a == b:
416d8b2a75b8 Speedup revlog.ancestors for the linear case Chris Mason <mason@suse.com> parents: 2080 diff changeset	1022 return a
416d8b2a75b8 Speedup revlog.ancestors for the linear case Chris Mason <mason@suse.com> parents: 2080 diff changeset	1023 ra = self.rev(a)
416d8b2a75b8 Speedup revlog.ancestors for the linear case Chris Mason <mason@suse.com> parents: 2080 diff changeset	1024 rb = self.rev(b)
416d8b2a75b8 Speedup revlog.ancestors for the linear case Chris Mason <mason@suse.com> parents: 2080 diff changeset	1025 if ra < rb:
416d8b2a75b8 Speedup revlog.ancestors for the linear case Chris Mason <mason@suse.com> parents: 2080 diff changeset	1026 last = b
416d8b2a75b8 Speedup revlog.ancestors for the linear case Chris Mason <mason@suse.com> parents: 2080 diff changeset	1027 first = a
416d8b2a75b8 Speedup revlog.ancestors for the linear case Chris Mason <mason@suse.com> parents: 2080 diff changeset	1028 else:
416d8b2a75b8 Speedup revlog.ancestors for the linear case Chris Mason <mason@suse.com> parents: 2080 diff changeset	1029 last = a
416d8b2a75b8 Speedup revlog.ancestors for the linear case Chris Mason <mason@suse.com> parents: 2080 diff changeset	1030 first = b
416d8b2a75b8 Speedup revlog.ancestors for the linear case Chris Mason <mason@suse.com> parents: 2080 diff changeset	1031
416d8b2a75b8 Speedup revlog.ancestors for the linear case Chris Mason <mason@suse.com> parents: 2080 diff changeset	1032 # reachable won't include stop in the list, so we have to use a parent
416d8b2a75b8 Speedup revlog.ancestors for the linear case Chris Mason <mason@suse.com> parents: 2080 diff changeset	1033 reachable = self.reachable(last, stop=self.parents(first)[0])
416d8b2a75b8 Speedup revlog.ancestors for the linear case Chris Mason <mason@suse.com> parents: 2080 diff changeset	1034 if first in reachable:
416d8b2a75b8 Speedup revlog.ancestors for the linear case Chris Mason <mason@suse.com> parents: 2080 diff changeset	1035 return first
416d8b2a75b8 Speedup revlog.ancestors for the linear case Chris Mason <mason@suse.com> parents: 2080 diff changeset	1036
147 b6d8ed7aeba0 A new ancestor algorithm mpm@selenic.com parents: 126 diff changeset	1037 # calculate the distance of every node from root
b6d8ed7aeba0 A new ancestor algorithm mpm@selenic.com parents: 126 diff changeset	1038 dist = {nullid: 0}
b6d8ed7aeba0 A new ancestor algorithm mpm@selenic.com parents: 126 diff changeset	1039 for i in xrange(self.count()):
b6d8ed7aeba0 A new ancestor algorithm mpm@selenic.com parents: 126 diff changeset	1040 n = self.node(i)
b6d8ed7aeba0 A new ancestor algorithm mpm@selenic.com parents: 126 diff changeset	1041 p1, p2 = self.parents(n)
b6d8ed7aeba0 A new ancestor algorithm mpm@selenic.com parents: 126 diff changeset	1042 dist[n] = max(dist[p1], dist[p2]) + 1
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 484 diff changeset	1043
147 b6d8ed7aeba0 A new ancestor algorithm mpm@selenic.com parents: 126 diff changeset	1044 # traverse ancestors in order of decreasing distance from root
b6d8ed7aeba0 A new ancestor algorithm mpm@selenic.com parents: 126 diff changeset	1045 def ancestors(node):
b6d8ed7aeba0 A new ancestor algorithm mpm@selenic.com parents: 126 diff changeset	1046 # we store negative distances because heap returns smallest member
b6d8ed7aeba0 A new ancestor algorithm mpm@selenic.com parents: 126 diff changeset	1047 h = [(-dist[node], node)]
b6d8ed7aeba0 A new ancestor algorithm mpm@selenic.com parents: 126 diff changeset	1048 seen = {}
b6d8ed7aeba0 A new ancestor algorithm mpm@selenic.com parents: 126 diff changeset	1049 while h:
b6d8ed7aeba0 A new ancestor algorithm mpm@selenic.com parents: 126 diff changeset	1050 d, n = heapq.heappop(h)
b6d8ed7aeba0 A new ancestor algorithm mpm@selenic.com parents: 126 diff changeset	1051 if n not in seen:
b6d8ed7aeba0 A new ancestor algorithm mpm@selenic.com parents: 126 diff changeset	1052 seen[n] = 1
1351 0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	1053 yield (-d, n)
147 b6d8ed7aeba0 A new ancestor algorithm mpm@selenic.com parents: 126 diff changeset	1054 for p in self.parents(n):
b6d8ed7aeba0 A new ancestor algorithm mpm@selenic.com parents: 126 diff changeset	1055 heapq.heappush(h, (-dist[p], p))
45 f2b2d5daec30 Fix recursion depth trouble with ancestor algorithm mpm@selenic.com parents: 41 diff changeset	1056
1351 0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	1057 def generations(node):
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	1058 sg, s = None, {}
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	1059 for g,n in ancestors(node):
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	1060 if g != sg:
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	1061 if sg:
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	1062 yield sg, s
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	1063 sg, s = g, {n:1}
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	1064 else:
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	1065 s[n] = 1
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	1066 yield sg, s
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	1067
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	1068 x = generations(a)
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	1069 y = generations(b)
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	1070 gx = x.next()
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	1071 gy = y.next()
45 f2b2d5daec30 Fix recursion depth trouble with ancestor algorithm mpm@selenic.com parents: 41 diff changeset	1072
147 b6d8ed7aeba0 A new ancestor algorithm mpm@selenic.com parents: 126 diff changeset	1073 # increment each ancestor list until it is closer to root than
b6d8ed7aeba0 A new ancestor algorithm mpm@selenic.com parents: 126 diff changeset	1074 # the other, or they match
b6d8ed7aeba0 A new ancestor algorithm mpm@selenic.com parents: 126 diff changeset	1075 while 1:
1351 0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	1076 #print "ancestor gen %s %s" % (gx[0], gy[0])
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	1077 if gx[0] == gy[0]:
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	1078 # find the intersection
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	1079 i = [ n for n in gx[1] if n in gy[1] ]
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	1080 if i:
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	1081 return i[0]
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	1082 else:
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	1083 #print "next"
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	1084 gy = y.next()
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	1085 gx = x.next()
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	1086 elif gx[0] < gy[0]:
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	1087 #print "next y"
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	1088 gy = y.next()
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	1089 else:
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	1090 #print "next x"
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	1091 gx = x.next()
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	1092
1598 14d1f1868bf6 cleanup of revlog.group when repository is local Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	1093 def group(self, nodelist, lookup, infocollect=None):
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	1094 """calculate a delta group
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	1095
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	1096 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	1097 metadata corresponding to nodes. the first delta is
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	1098 parent(nodes[0]) -> nodes[0] the receiver is guaranteed to
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	1099 have this parent as it has all history before these
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	1100 changesets. parent is parent[0]
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	1101 """
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1102 revs = [self.rev(n) for n in nodelist]
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	1103
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	1104 # 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	1105 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	1106 yield changegroup.closechunk()
192 5d8553352d2e Changes to network protocol mpm@selenic.com parents: 155 diff changeset	1107 return
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	1108
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	1109 # add the parent of the first rev
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	1110 p = self.parents(self.node(revs[0]))[0]
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	1111 revs.insert(0, self.rev(p))
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	1112
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	1113 # build deltas
71 47c9a869adee Add mdiff.patches to speed up applying thousands of patches to the manifest mpm@selenic.com parents: 67 diff changeset	1114 for d in xrange(0, len(revs) - 1):
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	1115 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	1116 nb = self.node(b)
192 5d8553352d2e Changes to network protocol mpm@selenic.com parents: 155 diff changeset	1117
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1118 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	1119 infocollect(nb)
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	1120
1941 7518823709a2 revlog.py: factorization and fixes for rev < 0 (nullid) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1853 diff changeset	1121 d = self.revdiff(a, b)
1598 14d1f1868bf6 cleanup of revlog.group when repository is local Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	1122 p = self.parents(nb)
14d1f1868bf6 cleanup of revlog.group when repository is local Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	1123 meta = nb + p[0] + p[1] + lookup(nb)
1981 736b6c96bbbc make incoming work via ssh (issue139); move chunk code into separate module. Thomas Arendsen Hein <thomas@intevation.de> parents: 1941 diff changeset	1124 yield changegroup.genchunk("%s%s" % (meta, d))
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	1125
1981 736b6c96bbbc make incoming work via ssh (issue139); move chunk code into separate module. Thomas Arendsen Hein <thomas@intevation.de> parents: 1941 diff changeset	1126 yield changegroup.closechunk()
192 5d8553352d2e Changes to network protocol mpm@selenic.com parents: 155 diff changeset	1127
1062 6d5a62a549fa pep-0008 cleanup benoit.boissinot@ens-lyon.fr parents: 902 diff changeset	1128 def addgroup(self, revs, linkmapper, transaction, unique=0):
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	1129 """
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	1130 add a delta group
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	1131
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	1132 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	1133 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	1134 log, the rest are against the previous delta.
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	1135 """
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	1136
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	1137 #track the base of the current delta log
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	1138 r = self.count()
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	1139 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	1140 node = None
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 484 diff changeset	1141
655 b3bba126b04a Fix out of range regression Matt Mackall <mpm@selenic.com> parents: 653 diff changeset	1142 base = prev = -1
2078 441ea218414e Fill in the uncompressed size during revlog.addgroup mason@suse.com parents: 2077 diff changeset	1143 start = end = textlen = 0
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	1144 if r:
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	1145 end = self.end(t)
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	1146
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	1147 ifh = self.opener(self.indexfile, "a+")
2077 4d0700ae0991 Fix inlined revlogs to seek to eof after opening "a+" mason@suse.com parents: 2076 diff changeset	1148 ifh.seek(0, 2)
2084 d66278012853 Chris Mason <mason@suse.com> parents: 2082 diff changeset	1149 transaction.add(self.indexfile, ifh.tell(), self.count())
2073 1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	1150 if self.inlinedata():
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	1151 dfh = None
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	1152 else:
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	1153 transaction.add(self.datafile, end)
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	1154 dfh = self.opener(self.datafile, "a")
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	1155
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	1156 # loop through our set of deltas
192 5d8553352d2e Changes to network protocol mpm@selenic.com parents: 155 diff changeset	1157 chain = None
5d8553352d2e Changes to network protocol mpm@selenic.com parents: 155 diff changeset	1158 for chunk in revs:
5d8553352d2e Changes to network protocol mpm@selenic.com parents: 155 diff changeset	1159 node, p1, p2, cs = struct.unpack("20s20s20s20s", chunk[:80])
94 7daef883134f Refactor merge code mpm@selenic.com parents: 86 diff changeset	1160 link = linkmapper(cs)
77 bed15e766511 Fix bug in lazymap code mpm@selenic.com parents: 76 diff changeset	1161 if node in self.nodemap:
224 ccbcc4d76f81 fix bad assumption about uniqueness of file versions mpm@selenic.com parents: 221 diff changeset	1162 # this can happen if two branches make the same change
1218 cde6818e082a Add preliminary support for the bundle and unbundle commands mpm@selenic.com parents: 1214 diff changeset	1163 # if unique:
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	1164 # raise RevlogError(_("already have %s") % hex(node[:4]))
653 94cdd02792b5 Fix corruption resulting from skipping parts of a revision group Matt Mackall <mpm@selenic.com> parents: 651 diff changeset	1165 chain = node
224 ccbcc4d76f81 fix bad assumption about uniqueness of file versions mpm@selenic.com parents: 221 diff changeset	1166 continue
192 5d8553352d2e Changes to network protocol mpm@selenic.com parents: 155 diff changeset	1167 delta = chunk[80:]
5d8553352d2e Changes to network protocol mpm@selenic.com parents: 155 diff changeset	1168
1509 46a07392cf28 Add safety check for addgroup Matt Mackall <mpm@selenic.com> parents: 1494 diff changeset	1169 for p in (p1, p2):
46a07392cf28 Add safety check for addgroup Matt Mackall <mpm@selenic.com> parents: 1494 diff changeset	1170 if not p in self.nodemap:
2295 9c15f85e61b1 fix a typo in an error message Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2289 diff changeset	1171 raise RevlogError(_("unknown parent %s") % short(p))
1509 46a07392cf28 Add safety check for addgroup Matt Mackall <mpm@selenic.com> parents: 1494 diff changeset	1172
192 5d8553352d2e Changes to network protocol mpm@selenic.com parents: 155 diff changeset	1173 if not chain:
5d8553352d2e Changes to network protocol mpm@selenic.com parents: 155 diff changeset	1174 # retrieve the parent revision of the delta chain
5d8553352d2e Changes to network protocol mpm@selenic.com parents: 155 diff changeset	1175 chain = p1
5d8553352d2e Changes to network protocol mpm@selenic.com parents: 155 diff changeset	1176 if not chain in self.nodemap:
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	1177 raise RevlogError(_("unknown base %s") % short(chain[:4]))
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	1178
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	1179 # full versions are inserted when the needed deltas become
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	1180 # comparable to the uncompressed text or when the previous
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	1181 # version is not the one we have a delta against. We use
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	1182 # the size of the previous full rev as a proxy for the
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	1183 # current size.
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	1184
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	1185 if chain == prev:
1533 3d11f81c9145 Reduce string duplication in compression code mason@suse.com parents: 1509 diff changeset	1186 tempd = compress(delta)
3d11f81c9145 Reduce string duplication in compression code mason@suse.com parents: 1509 diff changeset	1187 cdelta = tempd[0] + tempd[1]
2078 441ea218414e Fill in the uncompressed size during revlog.addgroup mason@suse.com parents: 2077 diff changeset	1188 textlen = mdiff.patchedsize(textlen, delta)
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	1189
2078 441ea218414e Fill in the uncompressed size during revlog.addgroup mason@suse.com parents: 2077 diff changeset	1190 if chain != prev or (end - start + len(cdelta)) > textlen * 2:
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	1191 # flush our writes here so we can read it in revision
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	1192 if dfh:
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	1193 dfh.flush()
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	1194 ifh.flush()
65 d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	1195 text = self.revision(chain)
73 ee1cbe841e01 Change revlog to use new patch code mpm@selenic.com parents: 71 diff changeset	1196 text = self.patches(text, [delta])
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	1197 chk = self.addrevision(text, transaction, link, p1, p2)
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	1198 if chk != node:
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	1199 raise RevlogError(_("consistency error adding group"))
2078 441ea218414e Fill in the uncompressed size during revlog.addgroup mason@suse.com parents: 2077 diff changeset	1200 textlen = len(text)
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	1201 else:
2142 8a1e2a9c7013 Replaced 0 with REVLOGV0 where this meaning is used. Thomas Arendsen Hein <thomas@intevation.de> parents: 2141 diff changeset	1202 if self.version == REVLOGV0:
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	1203 e = (end, len(cdelta), base, link, p1, p2, node)
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	1204 else:
2078 441ea218414e Fill in the uncompressed size during revlog.addgroup mason@suse.com parents: 2077 diff changeset	1205 e = (self.offset_type(end, 0), len(cdelta), textlen, base,
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	1206 link, self.rev(p1), self.rev(p2), node)
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	1207 self.index.append(e)
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	1208 self.nodemap[node] = r
2073 1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	1209 if self.inlinedata():
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	1210 ifh.write(struct.pack(self.indexformat, *e))
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	1211 ifh.write(cdelta)
2075 343aeefb553b Make the appendfile class inline-data index friendly mason@suse.com parents: 2073 diff changeset	1212 self.checkinlinesize(transaction, ifh)
2073 1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	1213 if not self.inlinedata():
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	1214 dfh = self.opener(self.datafile, "a")
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	1215 ifh = self.opener(self.indexfile, "a")
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	1216 else:
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	1217 if not dfh:
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	1218 # addrevision switched from inline to conventional
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	1219 # reopen the index
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	1220 dfh = self.opener(self.datafile, "a")
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	1221 ifh = self.opener(self.indexfile, "a")
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	1222 dfh.write(cdelta)
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	1223 ifh.write(struct.pack(self.indexformat, *e))
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	1224
65 d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	1225 t, r, chain, prev = r, r + 1, node, node
1749 d457fec76ab0 fix warnings from pychecker (unused variables and shadowing) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1711 diff changeset	1226 base = self.base(t)
d457fec76ab0 fix warnings from pychecker (unused variables and shadowing) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1711 diff changeset	1227 start = self.start(base)
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	1228 end = self.end(t)
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	1229
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	1230 return node
1493 1a216cb4ee64 verify: add check for mismatch of index and data length Matt Mackall <mpm@selenic.com> parents: 1469 diff changeset	1231
1535 7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	1232 def strip(self, rev, minlink):
7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	1233 if self.count() == 0 or rev >= self.count():
7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	1234 return
7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	1235
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	1236 if isinstance(self.index, lazyindex):
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	1237 self.loadindexmap()
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	1238
1535 7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	1239 # When stripping away a revision, we need to make sure it
7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	1240 # does not actually belong to an older changeset.
7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	1241 # The minlink parameter defines the oldest revision
7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	1242 # we're allowed to strip away.
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	1243 while minlink > self.index[rev][-4]:
1535 7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	1244 rev += 1
7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	1245 if rev >= self.count():
7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	1246 return
7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	1247
7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	1248 # first truncate the files on disk
7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	1249 end = self.start(rev)
2073 1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	1250 if not self.inlinedata():
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	1251 df = self.opener(self.datafile, "a")
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	1252 df.truncate(end)
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	1253 end = rev * struct.calcsize(self.indexformat)
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	1254 else:
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	1255 end += rev * struct.calcsize(self.indexformat)
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	1256
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	1257 indexf = self.opener(self.indexfile, "a")
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	1258 indexf.truncate(end)
1535 7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	1259
7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	1260 # then reset internal state in memory to forget those revisions
7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	1261 self.cache = None
1711 8959700c2b19 revlog.strip should clear the chunkcache mason@suse.com parents: 1667 diff changeset	1262 self.chunkcache = None
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	1263 for x in xrange(rev, self.count()):
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	1264 del self.nodemap[self.node(x)]
1535 7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	1265
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	1266 del self.index[rev:]
1535 7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	1267
1493 1a216cb4ee64 verify: add check for mismatch of index and data length Matt Mackall <mpm@selenic.com> parents: 1469 diff changeset	1268 def checksize(self):
1a216cb4ee64 verify: add check for mismatch of index and data length Matt Mackall <mpm@selenic.com> parents: 1469 diff changeset	1269 expected = 0
1a216cb4ee64 verify: add check for mismatch of index and data length Matt Mackall <mpm@selenic.com> parents: 1469 diff changeset	1270 if self.count():
1a216cb4ee64 verify: add check for mismatch of index and data length Matt Mackall <mpm@selenic.com> parents: 1469 diff changeset	1271 expected = self.end(self.count() - 1)
1667 daff3ef0de8d verify: notice extra data in indices Matt Mackall <mpm@selenic.com> parents: 1660 diff changeset	1272
1494 249ca10d37f4 Handle empty logs in repo.checksize Matt Mackall <mpm@selenic.com> parents: 1493 diff changeset	1273 try:
249ca10d37f4 Handle empty logs in repo.checksize Matt Mackall <mpm@selenic.com> parents: 1493 diff changeset	1274 f = self.opener(self.datafile)
249ca10d37f4 Handle empty logs in repo.checksize Matt Mackall <mpm@selenic.com> parents: 1493 diff changeset	1275 f.seek(0, 2)
249ca10d37f4 Handle empty logs in repo.checksize Matt Mackall <mpm@selenic.com> parents: 1493 diff changeset	1276 actual = f.tell()
1667 daff3ef0de8d verify: notice extra data in indices Matt Mackall <mpm@selenic.com> parents: 1660 diff changeset	1277 dd = actual - expected
1494 249ca10d37f4 Handle empty logs in repo.checksize Matt Mackall <mpm@selenic.com> parents: 1493 diff changeset	1278 except IOError, inst:
1667 daff3ef0de8d verify: notice extra data in indices Matt Mackall <mpm@selenic.com> parents: 1660 diff changeset	1279 if inst.errno != errno.ENOENT:
daff3ef0de8d verify: notice extra data in indices Matt Mackall <mpm@selenic.com> parents: 1660 diff changeset	1280 raise
daff3ef0de8d verify: notice extra data in indices Matt Mackall <mpm@selenic.com> parents: 1660 diff changeset	1281 dd = 0
daff3ef0de8d verify: notice extra data in indices Matt Mackall <mpm@selenic.com> parents: 1660 diff changeset	1282
daff3ef0de8d verify: notice extra data in indices Matt Mackall <mpm@selenic.com> parents: 1660 diff changeset	1283 try:
daff3ef0de8d verify: notice extra data in indices Matt Mackall <mpm@selenic.com> parents: 1660 diff changeset	1284 f = self.opener(self.indexfile)
daff3ef0de8d verify: notice extra data in indices Matt Mackall <mpm@selenic.com> parents: 1660 diff changeset	1285 f.seek(0, 2)
daff3ef0de8d verify: notice extra data in indices Matt Mackall <mpm@selenic.com> parents: 1660 diff changeset	1286 actual = f.tell()
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	1287 s = struct.calcsize(self.indexformat)
1667 daff3ef0de8d verify: notice extra data in indices Matt Mackall <mpm@selenic.com> parents: 1660 diff changeset	1288 i = actual / s
daff3ef0de8d verify: notice extra data in indices Matt Mackall <mpm@selenic.com> parents: 1660 diff changeset	1289 di = actual - (i * s)
2073 1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	1290 if self.inlinedata():
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	1291 databytes = 0
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	1292 for r in xrange(self.count()):
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	1293 databytes += self.length(r)
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	1294 dd = 0
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	1295 di = actual - self.count() * s - databytes
1667 daff3ef0de8d verify: notice extra data in indices Matt Mackall <mpm@selenic.com> parents: 1660 diff changeset	1296 except IOError, inst:
daff3ef0de8d verify: notice extra data in indices Matt Mackall <mpm@selenic.com> parents: 1660 diff changeset	1297 if inst.errno != errno.ENOENT:
daff3ef0de8d verify: notice extra data in indices Matt Mackall <mpm@selenic.com> parents: 1660 diff changeset	1298 raise
daff3ef0de8d verify: notice extra data in indices Matt Mackall <mpm@selenic.com> parents: 1660 diff changeset	1299 di = 0
daff3ef0de8d verify: notice extra data in indices Matt Mackall <mpm@selenic.com> parents: 1660 diff changeset	1300
daff3ef0de8d verify: notice extra data in indices Matt Mackall <mpm@selenic.com> parents: 1660 diff changeset	1301 return (dd, di)
1494 249ca10d37f4 Handle empty logs in repo.checksize Matt Mackall <mpm@selenic.com> parents: 1493 diff changeset	1302
249ca10d37f4 Handle empty logs in repo.checksize Matt Mackall <mpm@selenic.com> parents: 1493 diff changeset	1303

Mercurial > hg > mercurial-crew-with-dirclash

annotate mercurial/revlog.py @ 3086:e7fc04dc6349