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

annotate mercurial/revlog.py @ 2076:d007df6daf8e

Create an atomic opener that does not automatically rename on close The revlog.checkinlinesize() uses an atomic opener to replace the index file after converting it from inline to traditional .i and .d files. If this operation is interrupted, the atomic file class can overwrite a valid file with a partially written one. This patch introduces an atomic opener that does not automatically replace the destination file with the tempfile. This way an interrupted checkinlinesize() call turns into a noop.

author	mason@suse.com
date	Tue, 04 Apr 2006 16:38:44 -0400
parents	343aeefb553b
children	4d0700ae0991

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
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	7 Copyright 2005 Matt Mackall <mpm@selenic.com>
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")
736b6c96bbbc make incoming work via ssh (issue139); move chunk code into separate module. Thomas Arendsen Hein <thomas@intevation.de> parents: 1941 diff changeset	17 demandload(globals(), "sha struct 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)
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	25
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	26 def flagstr(flag):
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	27 if flag == "inline":
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	28 return REVLOGNGINLINEDATA
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	29 raise RevlogError(_("unknown revlog flag %s" % flag))
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	30
1091 d62130f99a73 Move hash function back to revlog from node mpm@selenic.com parents: 1089 diff changeset	31 def hash(text, p1, p2):
d62130f99a73 Move hash function back to revlog from node mpm@selenic.com parents: 1089 diff changeset	32 """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	33
d62130f99a73 Move hash function back to revlog from node mpm@selenic.com parents: 1089 diff changeset	34 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	35 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	36 content in the revision graph.
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 l = [p1, p2]
d62130f99a73 Move hash function back to revlog from node mpm@selenic.com parents: 1089 diff changeset	39 l.sort()
d62130f99a73 Move hash function back to revlog from node mpm@selenic.com parents: 1089 diff changeset	40 s = sha.new(l[0])
d62130f99a73 Move hash function back to revlog from node mpm@selenic.com parents: 1089 diff changeset	41 s.update(l[1])
d62130f99a73 Move hash function back to revlog from node mpm@selenic.com parents: 1089 diff changeset	42 s.update(text)
d62130f99a73 Move hash function back to revlog from node mpm@selenic.com parents: 1089 diff changeset	43 return s.digest()
d62130f99a73 Move hash function back to revlog from node mpm@selenic.com parents: 1089 diff changeset	44
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	45 def compress(text):
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	46 """ generate a possibly-compressed representation of text """
1533 3d11f81c9145 Reduce string duplication in compression code mason@suse.com parents: 1509 diff changeset	47 if not text: return ("", text)
112 aea6562add6c Make compression more intelligent: mpm@selenic.com parents: 98 diff changeset	48 if len(text) < 44:
1533 3d11f81c9145 Reduce string duplication in compression code mason@suse.com parents: 1509 diff changeset	49 if text[0] == '\0': return ("", text)
3d11f81c9145 Reduce string duplication in compression code mason@suse.com parents: 1509 diff changeset	50 return ('u', text)
112 aea6562add6c Make compression more intelligent: mpm@selenic.com parents: 98 diff changeset	51 bin = zlib.compress(text)
aea6562add6c Make compression more intelligent: mpm@selenic.com parents: 98 diff changeset	52 if len(bin) > len(text):
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)
3d11f81c9145 Reduce string duplication in compression code mason@suse.com parents: 1509 diff changeset	55 return ("", bin)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	56
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	57 def decompress(bin):
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	58 """ decompress the given input """
112 aea6562add6c Make compression more intelligent: mpm@selenic.com parents: 98 diff changeset	59 if not bin: return bin
aea6562add6c Make compression more intelligent: mpm@selenic.com parents: 98 diff changeset	60 t = bin[0]
aea6562add6c Make compression more intelligent: mpm@selenic.com parents: 98 diff changeset	61 if t == '\0': return bin
aea6562add6c Make compression more intelligent: mpm@selenic.com parents: 98 diff changeset	62 if t == 'x': return zlib.decompress(bin)
aea6562add6c Make compression more intelligent: mpm@selenic.com parents: 98 diff changeset	63 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	64 raise RevlogError(_("unknown compression type %r") % t)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	65
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	66 indexformatv0 = ">4l20s20s20s"
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	67 # index ng:
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	68 # 6 bytes offset
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	69 # 2 bytes flags
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	70 # 4 bytes compressed length
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	71 # 4 bytes uncompressed length
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	72 # 4 bytes: base rev
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	73 # 4 bytes link rev
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	74 # 4 bytes parent 1 rev
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	75 # 4 bytes parent 2 rev
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	76 # 32 bytes: nodeid
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	77 indexformatng = ">Qiiiiii20s12x"
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	78 versionformat = ">i"
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	79
1559 59b3639df0a9 Convert all classes to new-style classes by deriving them from object. Eric Hopper <hopper@omnifarious.org> parents: 1551 diff changeset	80 class lazyparser(object):
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	81 """
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	82 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	83
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	84 By default we parse and load 1000 entries at a time.
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	85
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	86 If no position is specified, we load the whole index, and replace
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	87 the lazy objects in revlog with the underlying objects for
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	88 efficiency in cases where we look at most of the nodes.
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	89 """
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	90 def __init__(self, data, revlog, indexformat):
76 d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	91 self.data = data
d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	92 self.s = struct.calcsize(indexformat)
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	93 self.indexformat = indexformat
76 d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	94 self.l = len(data)/self.s
d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	95 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	96 self.map = {nullid: -1}
323 c6f0673ab7e9 lazyparser speed ups mpm@selenic.com parents: 306 diff changeset	97 self.all = 0
c6f0673ab7e9 lazyparser speed ups mpm@selenic.com parents: 306 diff changeset	98 self.revlog = revlog
76 d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	99
323 c6f0673ab7e9 lazyparser speed ups mpm@selenic.com parents: 306 diff changeset	100 def load(self, pos=None):
c6f0673ab7e9 lazyparser speed ups mpm@selenic.com parents: 306 diff changeset	101 if self.all: return
c6f0673ab7e9 lazyparser speed ups mpm@selenic.com parents: 306 diff changeset	102 if pos is not None:
c6f0673ab7e9 lazyparser speed ups mpm@selenic.com parents: 306 diff changeset	103 block = pos / 1000
c6f0673ab7e9 lazyparser speed ups mpm@selenic.com parents: 306 diff changeset	104 i = block * 1000
c6f0673ab7e9 lazyparser speed ups mpm@selenic.com parents: 306 diff changeset	105 end = min(self.l, i + 1000)
c6f0673ab7e9 lazyparser speed ups mpm@selenic.com parents: 306 diff changeset	106 else:
c6f0673ab7e9 lazyparser speed ups mpm@selenic.com parents: 306 diff changeset	107 self.all = 1
c6f0673ab7e9 lazyparser speed ups mpm@selenic.com parents: 306 diff changeset	108 i = 0
c6f0673ab7e9 lazyparser speed ups mpm@selenic.com parents: 306 diff changeset	109 end = self.l
c6f0673ab7e9 lazyparser speed ups mpm@selenic.com parents: 306 diff changeset	110 self.revlog.index = self.index
c6f0673ab7e9 lazyparser speed ups mpm@selenic.com parents: 306 diff changeset	111 self.revlog.nodemap = self.map
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 484 diff changeset	112
76 d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	113 while i < end:
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	114 if not self.index[i]:
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	115 d = self.data[i * self.s: (i + 1) * self.s]
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	116 e = struct.unpack(self.indexformat, d)
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	117 self.index[i] = e
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	118 self.map[e[-1]] = i
76 d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	119 i += 1
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 484 diff changeset	120
1559 59b3639df0a9 Convert all classes to new-style classes by deriving them from object. Eric Hopper <hopper@omnifarious.org> parents: 1551 diff changeset	121 class lazyindex(object):
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	122 """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	123 def __init__(self, parser):
d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	124 self.p = parser
d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	125 def __len__(self):
d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	126 return len(self.p.index)
115 39b438eeb25a Make lazyindex load slightly faster mpm@selenic.com parents: 112 diff changeset	127 def load(self, pos):
1403 bc3e66edb04c lazyindex fix, make load handle negative indexes properly. Eric Hopper <hopper@omnifarious.org> parents: 1402 diff changeset	128 if pos < 0:
bc3e66edb04c lazyindex fix, make load handle negative indexes properly. Eric Hopper <hopper@omnifarious.org> parents: 1402 diff changeset	129 pos += len(self.p.index)
115 39b438eeb25a Make lazyindex load slightly faster mpm@selenic.com parents: 112 diff changeset	130 self.p.load(pos)
39b438eeb25a Make lazyindex load slightly faster mpm@selenic.com parents: 112 diff changeset	131 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	132 def __getitem__(self, pos):
115 39b438eeb25a Make lazyindex load slightly faster mpm@selenic.com parents: 112 diff changeset	133 return self.p.index[pos] or self.load(pos)
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	134 def __setitem__(self, pos, item):
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	135 self.p.index[pos] = item
1535 7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	136 def __delitem__(self, pos):
7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	137 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	138 def append(self, e):
d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	139 self.p.index.append(e)
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 484 diff changeset	140
1559 59b3639df0a9 Convert all classes to new-style classes by deriving them from object. Eric Hopper <hopper@omnifarious.org> parents: 1551 diff changeset	141 class lazymap(object):
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	142 """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	143 def __init__(self, parser):
d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	144 self.p = parser
d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	145 def load(self, key):
323 c6f0673ab7e9 lazyparser speed ups mpm@selenic.com parents: 306 diff changeset	146 if self.p.all: return
76 d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	147 n = self.p.data.find(key)
1214 34706a835d4a Smarter handling of revlog key errors mpm@selenic.com parents: 1201 diff changeset	148 if n < 0:
34706a835d4a Smarter handling of revlog key errors mpm@selenic.com parents: 1201 diff changeset	149 raise KeyError(key)
76 d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	150 pos = n / self.p.s
d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	151 self.p.load(pos)
d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	152 def __contains__(self, key):
323 c6f0673ab7e9 lazyparser speed ups mpm@selenic.com parents: 306 diff changeset	153 self.p.load()
c6f0673ab7e9 lazyparser speed ups mpm@selenic.com parents: 306 diff changeset	154 return key in self.p.map
97 7a2abee6b0c2 Add iterator to the lazymap code mpm@selenic.com parents: 94 diff changeset	155 def __iter__(self):
469 e205194ca7ef Various node id lookup tweaks mpm@selenic.com parents: 451 diff changeset	156 yield nullid
97 7a2abee6b0c2 Add iterator to the lazymap code mpm@selenic.com parents: 94 diff changeset	157 for i in xrange(self.p.l):
7a2abee6b0c2 Add iterator to the lazymap code mpm@selenic.com parents: 94 diff changeset	158 try:
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	159 yield self.p.index[i][-1]
97 7a2abee6b0c2 Add iterator to the lazymap code mpm@selenic.com parents: 94 diff changeset	160 except:
7a2abee6b0c2 Add iterator to the lazymap code mpm@selenic.com parents: 94 diff changeset	161 self.p.load(i)
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	162 yield self.p.index[i][-1]
76 d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	163 def __getitem__(self, key):
d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	164 try:
d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	165 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	166 except KeyError:
86 1b945e8ba67b Friendlier exceptions for unknown node errors mpm@selenic.com parents: 84 diff changeset	167 try:
1b945e8ba67b Friendlier exceptions for unknown node errors mpm@selenic.com parents: 84 diff changeset	168 self.load(key)
1b945e8ba67b Friendlier exceptions for unknown node errors mpm@selenic.com parents: 84 diff changeset	169 return self.p.map[key]
1b945e8ba67b Friendlier exceptions for unknown node errors mpm@selenic.com parents: 84 diff changeset	170 except KeyError:
1b945e8ba67b Friendlier exceptions for unknown node errors mpm@selenic.com parents: 84 diff changeset	171 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	172 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	173 self.p.map[key] = val
1535 7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	174 def __delitem__(self, key):
7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	175 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	176
1073 7b35a980b982 [PATCH] raise exceptions with Exception subclasses Bart Trojanowski <bart@jukie.net> parents: 1062 diff changeset	177 class RevlogError(Exception): pass
7b35a980b982 [PATCH] raise exceptions with Exception subclasses Bart Trojanowski <bart@jukie.net> parents: 1062 diff changeset	178
1559 59b3639df0a9 Convert all classes to new-style classes by deriving them from object. Eric Hopper <hopper@omnifarious.org> parents: 1551 diff changeset	179 class revlog(object):
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	180 """
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	181 the underlying revision storage object
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	182
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	183 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	184
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	185 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	186 information on each revision, includings its nodeid (hash), the
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	187 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	188 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	189 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	190 data.
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	191
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	192 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	193 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	194 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	195 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	196 version data. This makes retrieval of a version proportional to
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	197 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	198
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	199 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	200 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	201 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	202 for locking while reading.
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	203 """
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	204 def __init__(self, opener, indexfile, datafile, defversion=0):
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	205 """
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	206 create a revlog object
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	207
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	208 opener is a function that abstracts the file opening operation
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	209 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	210 """
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	211 self.indexfile = indexfile
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	212 self.datafile = datafile
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	213 self.opener = opener
1784 2e0a288ca93e revalidate revlog data after locking the repo (issue132) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1749 diff changeset	214
2e0a288ca93e revalidate revlog data after locking the repo (issue132) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1749 diff changeset	215 self.indexstat = None
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	216 self.cache = None
1598 14d1f1868bf6 cleanup of revlog.group when repository is local Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	217 self.chunkcache = None
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	218 self.defversion = defversion
1784 2e0a288ca93e revalidate revlog data after locking the repo (issue132) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1749 diff changeset	219 self.load()
116 e484cd5ec282 Only use lazy indexing for big indices and avoid the overhead of the mpm@selenic.com parents: 115 diff changeset	220
1784 2e0a288ca93e revalidate revlog data after locking the repo (issue132) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1749 diff changeset	221 def load(self):
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	222 v = self.defversion
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	223 try:
1784 2e0a288ca93e revalidate revlog data after locking the repo (issue132) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1749 diff changeset	224 f = self.opener(self.indexfile)
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	225 i = f.read()
1322 b3d44e9b3092 Make revlog constructor more discerning in its treatment of errors. Bryan O'Sullivan <bos@serpentine.com> parents: 1232 diff changeset	226 except IOError, inst:
b3d44e9b3092 Make revlog constructor more discerning in its treatment of errors. Bryan O'Sullivan <bos@serpentine.com> parents: 1232 diff changeset	227 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	228 raise
76 d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	229 i = ""
1784 2e0a288ca93e revalidate revlog data after locking the repo (issue132) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1749 diff changeset	230 else:
2e0a288ca93e revalidate revlog data after locking the repo (issue132) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1749 diff changeset	231 try:
2e0a288ca93e revalidate revlog data after locking the repo (issue132) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1749 diff changeset	232 st = os.fstat(f.fileno())
2e0a288ca93e revalidate revlog data after locking the repo (issue132) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1749 diff changeset	233 except AttributeError, inst:
2e0a288ca93e revalidate revlog data after locking the repo (issue132) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1749 diff changeset	234 st = None
2e0a288ca93e revalidate revlog data after locking the repo (issue132) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1749 diff changeset	235 else:
2e0a288ca93e revalidate revlog data after locking the repo (issue132) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1749 diff changeset	236 oldst = self.indexstat
2e0a288ca93e revalidate revlog data after locking the repo (issue132) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1749 diff changeset	237 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	238 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	239 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	240 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	241 return
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	242 self.indexstat = st
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	243 if len(i) > 0:
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	244 v = struct.unpack(versionformat, i[:4])[0]
2073 1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	245 flags = v & ~0xFFFF
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	246 fmt = v & 0xFFFF
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	247 if fmt == 0:
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	248 if flags:
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	249 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	250 (self.indexfile, flags)))
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	251 elif fmt == REVLOGNG:
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	252 if flags & ~REVLOGNGINLINEDATA:
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	253 raise RevlogError(_("index %s invalid flags %x for revlogng" %
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	254 (self.indexfile, flags)))
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	255 else:
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	256 raise RevlogError(_("index %s invalid format %d" %
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	257 (self.indexfile, fmt)))
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	258 self.version = v
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	259 if v == 0:
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	260 self.indexformat = indexformatv0
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	261 else:
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	262 self.indexformat = indexformatng
116 e484cd5ec282 Only use lazy indexing for big indices and avoid the overhead of the mpm@selenic.com parents: 115 diff changeset	263
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	264 if i:
2073 1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	265 if not self.inlinedata() and st and st.st_size > 10000:
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	266 # big index, let's parse it on demand
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	267 parser = lazyparser(i, self, self.indexformat)
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	268 self.index = lazyindex(parser)
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	269 self.nodemap = lazymap(parser)
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	270 else:
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	271 self.parseindex(i)
2073 1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	272 if self.inlinedata():
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	273 # we've already got the entire data file read in, save it
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	274 # in the chunk data
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	275 self.chunkcache = (0, i)
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	276 if self.version != 0:
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	277 e = list(self.index[0])
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	278 type = self.ngtype(e[0])
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	279 e[0] = self.offset_type(0, type)
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	280 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	281 else:
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	282 self.nodemap = { nullid: -1}
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	283 self.index = []
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	284
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	285
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	286 def parseindex(self, data):
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	287 s = struct.calcsize(self.indexformat)
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	288 l = len(data)
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	289 self.index = []
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	290 self.nodemap = {nullid: -1}
2073 1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	291 inline = self.inlinedata()
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	292 off = 0
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	293 n = 0
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	294 while off < l:
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	295 e = struct.unpack(self.indexformat, data[off:off + s])
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	296 self.index.append(e)
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	297 self.nodemap[e[-1]] = n
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	298 n += 1
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	299 off += s
2073 1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	300 if inline:
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	301 off += e[1]
116 e484cd5ec282 Only use lazy indexing for big indices and avoid the overhead of the mpm@selenic.com parents: 115 diff changeset	302
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	303 def ngoffset(self, q):
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	304 if q & 0xFFFF:
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	305 raise RevlogError(_('%s: incompatible revision flag %x') %
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	306 (self.indexfile, type))
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	307 return long(q >> 16)
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	308
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	309 def ngtype(self, q):
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	310 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	311
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	312 def offset_type(self, offset, type):
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	313 return long(long(offset) << 16 \| type)
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	314
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	315 def loadindexmap(self):
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	316 """loads both the map and the index from the lazy parser"""
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	317 if isinstance(self.index, lazyindex):
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	318 p = self.index.p
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	319 p.load()
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	320
2073 1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	321 def inlinedata(self): return self.version & REVLOGNGINLINEDATA
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	322 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	323 def count(self): return len(self.index)
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	324 def node(self, rev):
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	325 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	326 def rev(self, node):
59bfbdbc38f6 revlog: raise informative exception if file is missing. Bryan O'Sullivan <bos@serpentine.com> parents: 1099 diff changeset	327 try:
59bfbdbc38f6 revlog: raise informative exception if file is missing. Bryan O'Sullivan <bos@serpentine.com> parents: 1099 diff changeset	328 return self.nodemap[node]
59bfbdbc38f6 revlog: raise informative exception if file is missing. Bryan O'Sullivan <bos@serpentine.com> parents: 1099 diff changeset	329 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	330 raise RevlogError(_('%s: no node %s') % (self.indexfile, hex(node)))
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	331 def linkrev(self, node): return self.index[self.rev(node)][-4]
2 ecf3fd948051 Handle nullid better for ancestor mpm@selenic.com parents: 0 diff changeset	332 def parents(self, node):
ecf3fd948051 Handle nullid better for ancestor mpm@selenic.com parents: 0 diff changeset	333 if node == nullid: return (nullid, nullid)
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	334 r = self.rev(node)
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	335 d = self.index[r][-3:-1]
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	336 if self.version == 0:
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	337 return d
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	338 return [ self.node(x) for x in d ]
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	339 def start(self, rev):
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	340 if rev < 0:
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	341 return -1
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	342 if self.version != 0:
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	343 return self.ngoffset(self.index[rev][0])
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	344 return self.index[rev][0]
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	345 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	346
1941 7518823709a2 revlog.py: factorization and fixes for rev < 0 (nullid) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1853 diff changeset	347 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	348 if rev < 0:
7518823709a2 revlog.py: factorization and fixes for rev < 0 (nullid) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1853 diff changeset	349 return 0
7518823709a2 revlog.py: factorization and fixes for rev < 0 (nullid) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1853 diff changeset	350 else:
7518823709a2 revlog.py: factorization and fixes for rev < 0 (nullid) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1853 diff changeset	351 return self.index[rev][1]
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	352 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	353
1074 55bf5cfde69e Add revlog.reachable to find a graph of ancestors for a given rev mason@suse.com parents: 1073 diff changeset	354 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	355 reachable = {}
55bf5cfde69e Add revlog.reachable to find a graph of ancestors for a given rev mason@suse.com parents: 1073 diff changeset	356 visit = [rev]
55bf5cfde69e Add revlog.reachable to find a graph of ancestors for a given rev mason@suse.com parents: 1073 diff changeset	357 reachable[rev] = 1
55bf5cfde69e Add revlog.reachable to find a graph of ancestors for a given rev mason@suse.com parents: 1073 diff changeset	358 if stop:
55bf5cfde69e Add revlog.reachable to find a graph of ancestors for a given rev mason@suse.com parents: 1073 diff changeset	359 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	360 else:
55bf5cfde69e Add revlog.reachable to find a graph of ancestors for a given rev mason@suse.com parents: 1073 diff changeset	361 stopn = 0
55bf5cfde69e Add revlog.reachable to find a graph of ancestors for a given rev mason@suse.com parents: 1073 diff changeset	362 while visit:
55bf5cfde69e Add revlog.reachable to find a graph of ancestors for a given rev mason@suse.com parents: 1073 diff changeset	363 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	364 if n == stop:
55bf5cfde69e Add revlog.reachable to find a graph of ancestors for a given rev mason@suse.com parents: 1073 diff changeset	365 continue
55bf5cfde69e Add revlog.reachable to find a graph of ancestors for a given rev mason@suse.com parents: 1073 diff changeset	366 if n == nullid:
55bf5cfde69e Add revlog.reachable to find a graph of ancestors for a given rev mason@suse.com parents: 1073 diff changeset	367 continue
55bf5cfde69e Add revlog.reachable to find a graph of ancestors for a given rev mason@suse.com parents: 1073 diff changeset	368 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	369 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	370 continue
55bf5cfde69e Add revlog.reachable to find a graph of ancestors for a given rev mason@suse.com parents: 1073 diff changeset	371 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	372 reachable[p] = 1
55bf5cfde69e Add revlog.reachable to find a graph of ancestors for a given rev mason@suse.com parents: 1073 diff changeset	373 visit.append(p)
55bf5cfde69e Add revlog.reachable to find a graph of ancestors for a given rev mason@suse.com parents: 1073 diff changeset	374 return reachable
55bf5cfde69e Add revlog.reachable to find a graph of ancestors for a given rev mason@suse.com parents: 1073 diff changeset	375
1457 518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	376 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	377 """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	378 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	379 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	380
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	381 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	382 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	383 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	384 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	385 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	386
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	387 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	388 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	389 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	390 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	391 nonodes = ([], [], [])
1457 518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	392 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	393 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	394 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	395 return nonodes
1457 518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	396 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	397 else:
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	398 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	399 lowestrev = -1
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	400 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	401 # 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	402 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	403 [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	404 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	405 # 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	406 # node.
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	407 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	408 # 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	409 ancestors = None
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	410 # 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	411 heads = {}
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	412 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	413 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	414 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	415 return nonodes
1457 518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	416 ancestors = {}
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	417 # 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	418 nodestotag = heads[:]
1457 518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	419 # 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	420 # 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	421 # find from roots.
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	422 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	423 # 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	424 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	425 while nodestotag:
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	426 # 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	427 n = nodestotag.pop()
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	428 # Never tag nullid
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	429 if n == nullid:
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	430 continue
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	431 # 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	432 # 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	433 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	434 if r >= lowestrev:
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	435 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	436 # 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	437 # 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	438 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	439 # 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	440 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	441 p != nullid])
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	442 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	443 # 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	444 # any other heads.
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	445 heads.pop(n)
1459 106fdec8e1fb Fix small bug in nodesbetween if heads is [nullid]. Eric Hopper <hopper@omnifarious.org> parents: 1458 diff changeset	446 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	447 return nonodes
1457 518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	448 # 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	449 # 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	450
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	451 # 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	452 if lowestrev > -1:
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	453 # 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	454 # 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	455
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	456 # 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	457 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	458 # 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	459 if roots:
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	460 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	461 else:
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	462 # 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	463 return nonodes
1457 518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	464 else:
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	465 # 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	466 # any other roots.
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	467 lowestrev = -1
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	468 roots = [nullid]
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	469 # 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	470 # 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	471 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	472 # 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	473 # '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	474 roots = descendents.copy()
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	475 # 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	476 orderedout = []
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	477 # 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	478 # 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	479 # they're descendents.
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	480 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	481 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	482 isdescendent = False
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	483 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	484 isdescendent = True
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	485 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	486 # 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	487 isdescendent = True
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	488 # 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	489 # 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	490 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	491 # 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	492 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	493 # 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	494 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	495 roots.pop(n)
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	496 else:
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	497 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	498 # 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	499 # 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	500 # up there, remember?)
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	501 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	502 descendents[n] = 1
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	503 isdescendent = True
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	504 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	505 # 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	506 orderedout.append(n)
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	507 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	508 # 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	509 # from roots.
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	510 # 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	511 heads[n] = 1
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	512 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	513 # 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	514 # 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	515 # 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	516 heads[n] = 1
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	517 # 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	518 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	519 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	520 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	521 roots = roots.keys()
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	522 assert orderedout
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	523 assert roots
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	524 assert heads
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	525 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	526
1551 e793cbc8be00 Fixes to "hg heads -r FOO": Thomas Arendsen Hein <thomas@intevation.de> parents: 1550 diff changeset	527 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	528 """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	529
e793cbc8be00 Fixes to "hg heads -r FOO": Thomas Arendsen Hein <thomas@intevation.de> parents: 1550 diff changeset	530 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	531 start will be returned
e793cbc8be00 Fixes to "hg heads -r FOO": Thomas Arendsen Hein <thomas@intevation.de> parents: 1550 diff changeset	532
e793cbc8be00 Fixes to "hg heads -r FOO": Thomas Arendsen Hein <thomas@intevation.de> parents: 1550 diff changeset	533 """
e793cbc8be00 Fixes to "hg heads -r FOO": Thomas Arendsen Hein <thomas@intevation.de> parents: 1550 diff changeset	534 if start is None:
e793cbc8be00 Fixes to "hg heads -r FOO": Thomas Arendsen Hein <thomas@intevation.de> parents: 1550 diff changeset	535 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	536 reachable = {start: 1}
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	537 heads = {start: 1}
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	538 startrev = self.rev(start)
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	539
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	540 for r in xrange(startrev + 1, self.count()):
221 2bfe525ef6ca Beginning of multi-head support mpm@selenic.com parents: 208 diff changeset	541 n = self.node(r)
2bfe525ef6ca Beginning of multi-head support mpm@selenic.com parents: 208 diff changeset	542 for pn in self.parents(n):
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	543 if pn in reachable:
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	544 reachable[n] = 1
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	545 heads[n] = 1
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	546 if pn in heads:
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	547 del heads[pn]
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	548 return heads.keys()
370 c90385d82aec revlog: add a children function mpm@selenic.com parents: 330 diff changeset	549
c90385d82aec revlog: add a children function mpm@selenic.com parents: 330 diff changeset	550 def children(self, node):
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	551 """find the children of a given node"""
370 c90385d82aec revlog: add a children function mpm@selenic.com parents: 330 diff changeset	552 c = []
c90385d82aec revlog: add a children function mpm@selenic.com parents: 330 diff changeset	553 p = self.rev(node)
c90385d82aec revlog: add a children function mpm@selenic.com parents: 330 diff changeset	554 for r in range(p + 1, self.count()):
c90385d82aec revlog: add a children function mpm@selenic.com parents: 330 diff changeset	555 n = self.node(r)
c90385d82aec revlog: add a children function mpm@selenic.com parents: 330 diff changeset	556 for pn in self.parents(n):
854 473c030d34a6 Fixed revlog.children. Tristan Wibberley <tristan@wibberley.org> parents: 655 diff changeset	557 if pn == node:
473c030d34a6 Fixed revlog.children. Tristan Wibberley <tristan@wibberley.org> parents: 655 diff changeset	558 c.append(n)
370 c90385d82aec revlog: add a children function mpm@selenic.com parents: 330 diff changeset	559 continue
c90385d82aec revlog: add a children function mpm@selenic.com parents: 330 diff changeset	560 elif pn == nullid:
c90385d82aec revlog: add a children function mpm@selenic.com parents: 330 diff changeset	561 continue
c90385d82aec revlog: add a children function mpm@selenic.com parents: 330 diff changeset	562 return c
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 484 diff changeset	563
36 da28286bf6b7 Add smart node lookup by substring or by rev number mpm@selenic.com parents: 26 diff changeset	564 def lookup(self, id):
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	565 """locate a node based on revision number or subset of hex nodeid"""
36 da28286bf6b7 Add smart node lookup by substring or by rev number mpm@selenic.com parents: 26 diff changeset	566 try:
da28286bf6b7 Add smart node lookup by substring or by rev number mpm@selenic.com parents: 26 diff changeset	567 rev = int(id)
469 e205194ca7ef Various node id lookup tweaks mpm@selenic.com parents: 451 diff changeset	568 if str(rev) != id: raise ValueError
e205194ca7ef Various node id lookup tweaks mpm@selenic.com parents: 451 diff changeset	569 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	570 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	571 return self.node(rev)
469 e205194ca7ef Various node id lookup tweaks mpm@selenic.com parents: 451 diff changeset	572 except (ValueError, OverflowError):
36 da28286bf6b7 Add smart node lookup by substring or by rev number mpm@selenic.com parents: 26 diff changeset	573 c = []
da28286bf6b7 Add smart node lookup by substring or by rev number mpm@selenic.com parents: 26 diff changeset	574 for n in self.nodemap:
469 e205194ca7ef Various node id lookup tweaks mpm@selenic.com parents: 451 diff changeset	575 if hex(n).startswith(id):
36 da28286bf6b7 Add smart node lookup by substring or by rev number mpm@selenic.com parents: 26 diff changeset	576 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	577 if len(c) > 1: raise RevlogError(_("Ambiguous identifier"))
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	578 if len(c) < 1: raise RevlogError(_("No match found"))
36 da28286bf6b7 Add smart node lookup by substring or by rev number mpm@selenic.com parents: 26 diff changeset	579 return c[0]
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 484 diff changeset	580
36 da28286bf6b7 Add smart node lookup by substring or by rev number mpm@selenic.com parents: 26 diff changeset	581 return None
da28286bf6b7 Add smart node lookup by substring or by rev number mpm@selenic.com parents: 26 diff changeset	582
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	583 def diff(self, a, b):
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	584 """return a delta between two revisions"""
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	585 return mdiff.textdiff(a, b)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	586
73 ee1cbe841e01 Change revlog to use new patch code mpm@selenic.com parents: 71 diff changeset	587 def patches(self, t, pl):
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	588 """apply a list of patches to a string"""
73 ee1cbe841e01 Change revlog to use new patch code mpm@selenic.com parents: 71 diff changeset	589 return mdiff.patches(t, pl)
ee1cbe841e01 Change revlog to use new patch code mpm@selenic.com parents: 71 diff changeset	590
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	591 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	592 start, length = self.start(rev), self.length(rev)
2073 1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	593 inline = self.inlinedata()
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	594 if inline:
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	595 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	596 end = start + length
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	597 def loadcache(df):
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	598 cache_length = max(cachelen, length) # 4k
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	599 if not df:
2073 1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	600 if inline:
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	601 df = self.opener(self.indexfile)
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	602 else:
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	603 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	604 df.seek(start)
14d1f1868bf6 cleanup of revlog.group when repository is local Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	605 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	606
14d1f1868bf6 cleanup of revlog.group when repository is local Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	607 if not self.chunkcache:
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	608 loadcache(df)
1598 14d1f1868bf6 cleanup of revlog.group when repository is local Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	609
14d1f1868bf6 cleanup of revlog.group when repository is local Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	610 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	611 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	612 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	613 # it is cached
14d1f1868bf6 cleanup of revlog.group when repository is local Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	614 offset = start - cache_start
14d1f1868bf6 cleanup of revlog.group when repository is local Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	615 else:
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	616 loadcache(df)
1598 14d1f1868bf6 cleanup of revlog.group when repository is local Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	617 offset = 0
14d1f1868bf6 cleanup of revlog.group when repository is local Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	618
14d1f1868bf6 cleanup of revlog.group when repository is local Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	619 #def checkchunk():
14d1f1868bf6 cleanup of revlog.group when repository is local Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	620 # 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	621 # df.seek(start)
14d1f1868bf6 cleanup of revlog.group when repository is local Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	622 # return df.read(length)
14d1f1868bf6 cleanup of revlog.group when repository is local Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	623 #assert s == checkchunk()
14d1f1868bf6 cleanup of revlog.group when repository is local Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	624 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	625
119 c7a66f9752a4 Add code to retrieve or construct a revlog delta mpm@selenic.com parents: 117 diff changeset	626 def delta(self, node):
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	627 """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	628 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	629 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	630
7518823709a2 revlog.py: factorization and fixes for rev < 0 (nullid) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1853 diff changeset	631 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	632 """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	633 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	634 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	635 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	636 return self.chunk(rev2)
119 c7a66f9752a4 Add code to retrieve or construct a revlog delta mpm@selenic.com parents: 117 diff changeset	637 else:
1941 7518823709a2 revlog.py: factorization and fixes for rev < 0 (nullid) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1853 diff changeset	638 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	639 self.revision(self.node(rev2)))
119 c7a66f9752a4 Add code to retrieve or construct a revlog delta mpm@selenic.com parents: 117 diff changeset	640
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	641 def revision(self, node):
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	642 """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	643 if node == nullid: return ""
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	644 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	645
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	646 # look up what we need to read
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	647 text = None
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	648 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	649 base = self.base(rev)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	650
2073 1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	651 if self.inlinedata():
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	652 # we probably have the whole chunk cached
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	653 df = None
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	654 else:
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	655 df = self.opener(self.datafile)
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	656
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	657 # do we have useful data cached?
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	658 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	659 base = self.cache[1]
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	660 text = self.cache[2]
1598 14d1f1868bf6 cleanup of revlog.group when repository is local Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	661 else:
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	662 text = self.chunk(base, df=df)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	663
71 47c9a869adee Add mdiff.patches to speed up applying thousands of patches to the manifest mpm@selenic.com parents: 67 diff changeset	664 bins = []
64 b3e2ddff0159 Diff in subdirectories from Jake Edge mpm@selenic.com parents: 46 diff changeset	665 for r in xrange(base + 1, rev + 1):
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	666 bins.append(self.chunk(r, df=df))
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	667
1941 7518823709a2 revlog.py: factorization and fixes for rev < 0 (nullid) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1853 diff changeset	668 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	669
1598 14d1f1868bf6 cleanup of revlog.group when repository is local Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	670 p1, p2 = self.parents(node)
26 9cf83bf9ad38 Simplify integrity checking mpm@selenic.com parents: 14 diff changeset	671 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	672 raise RevlogError(_("integrity check failed on %s:%d")
98 3dde7c87e36d Add paranoia to diff code mpm@selenic.com parents: 97 diff changeset	673 % (self.datafile, rev))
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	674
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	675 self.cache = (node, rev, text)
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 484 diff changeset	676 return text
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	677
2075 343aeefb553b Make the appendfile class inline-data index friendly mason@suse.com parents: 2073 diff changeset	678 def checkinlinesize(self, tr, fp=None):
2073 1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	679 if not self.inlinedata():
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	680 return
2075 343aeefb553b Make the appendfile class inline-data index friendly mason@suse.com parents: 2073 diff changeset	681 if not fp:
343aeefb553b Make the appendfile class inline-data index friendly mason@suse.com parents: 2073 diff changeset	682 fp = self.opener(self.indexfile, 'r')
2073 1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	683 size = fp.tell()
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	684 if size < 131072:
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	685 return
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	686 tr.add(self.datafile, 0)
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	687 df = self.opener(self.datafile, 'w')
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	688 calc = struct.calcsize(self.indexformat)
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	689 for r in xrange(self.count()):
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	690 start = self.start(r) + (r + 1) * calc
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	691 length = self.length(r)
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	692 fp.seek(start)
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	693 d = fp.read(length)
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	694 df.write(d)
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	695 fp.close()
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	696 df.close()
2076 d007df6daf8e Create an atomic opener that does not automatically rename on close mason@suse.com parents: 2075 diff changeset	697 fp = self.opener(self.indexfile, 'w', atomictemp=True)
2073 1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	698 self.version &= ~(REVLOGNGINLINEDATA)
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	699 if self.count():
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	700 x = self.index[0]
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	701 e = struct.pack(self.indexformat, *x)[4:]
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	702 l = struct.pack(versionformat, self.version)
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	703 fp.write(l)
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	704 fp.write(e)
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	705
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	706 for i in xrange(1, self.count()):
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	707 x = self.index[i]
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	708 e = struct.pack(self.indexformat, *x)
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	709 fp.write(e)
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	710
2076 d007df6daf8e Create an atomic opener that does not automatically rename on close mason@suse.com parents: 2075 diff changeset	711 # 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	712 # real index
d007df6daf8e Create an atomic opener that does not automatically rename on close mason@suse.com parents: 2075 diff changeset	713 fp.rename()
2073 1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	714 self.chunkcache = None
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	715
644 6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 547 diff changeset	716 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	717 """add a revision to the log
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	718
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	719 text - the revision data to add
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	720 transaction - the transaction object used for rollback
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	721 link - the linkrev data to add
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	722 p1, p2 - the parent nodeids of the revision
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	723 d - an optional precomputed delta
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	724 """
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	725 if text is None: text = ""
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	726 if p1 is None: p1 = self.tip()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	727 if p2 is None: p2 = nullid
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	728
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	729 node = hash(text, p1, p2)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	730
301 5add718d92db revlog: allow duplicates mpm@selenic.com parents: 243 diff changeset	731 if node in self.nodemap:
5add718d92db revlog: allow duplicates mpm@selenic.com parents: 243 diff changeset	732 return node
5add718d92db revlog: allow duplicates mpm@selenic.com parents: 243 diff changeset	733
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	734 n = self.count()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	735 t = n - 1
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	736
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	737 if n:
64 b3e2ddff0159 Diff in subdirectories from Jake Edge mpm@selenic.com parents: 46 diff changeset	738 base = self.base(t)
b3e2ddff0159 Diff in subdirectories from Jake Edge mpm@selenic.com parents: 46 diff changeset	739 start = self.start(base)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	740 end = self.end(t)
644 6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 547 diff changeset	741 if not d:
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 547 diff changeset	742 prev = self.revision(self.tip())
1533 3d11f81c9145 Reduce string duplication in compression code mason@suse.com parents: 1509 diff changeset	743 d = self.diff(prev, str(text))
98 3dde7c87e36d Add paranoia to diff code mpm@selenic.com parents: 97 diff changeset	744 data = compress(d)
1533 3d11f81c9145 Reduce string duplication in compression code mason@suse.com parents: 1509 diff changeset	745 l = len(data[1]) + len(data[0])
3d11f81c9145 Reduce string duplication in compression code mason@suse.com parents: 1509 diff changeset	746 dist = end - start + l
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	747
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	748 # full versions are inserted when the needed deltas
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	749 # become comparable to the uncompressed text
64 b3e2ddff0159 Diff in subdirectories from Jake Edge mpm@selenic.com parents: 46 diff changeset	750 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	751 data = compress(text)
1533 3d11f81c9145 Reduce string duplication in compression code mason@suse.com parents: 1509 diff changeset	752 l = len(data[1]) + len(data[0])
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	753 base = n
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	754 else:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	755 base = self.base(t)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	756
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	757 offset = 0
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	758 if t >= 0:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	759 offset = self.end(t)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	760
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	761 if self.version == 0:
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	762 e = (offset, l, base, link, p1, p2, node)
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	763 else:
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	764 e = (self.offset_type(offset, 0), l, len(text),
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	765 base, link, self.rev(p1), self.rev(p2), node)
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 484 diff changeset	766
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	767 self.index.append(e)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	768 self.nodemap[node] = n
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	769 entry = struct.pack(self.indexformat, *e)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	770
2073 1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	771 if not self.inlinedata():
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	772 transaction.add(self.datafile, offset)
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	773 transaction.add(self.indexfile, n * len(entry))
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	774 f = self.opener(self.datafile, "a")
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	775 if data[0]:
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	776 f.write(data[0])
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	777 f.write(data[1])
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	778 f = self.opener(self.indexfile, "a")
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	779 else:
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	780 f = self.opener(self.indexfile, "a+")
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	781 transaction.add(self.indexfile, f.tell())
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	782
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	783 if len(self.index) == 1 and self.version != 0:
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	784 l = struct.pack(versionformat, self.version)
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	785 f.write(l)
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	786 entry = entry[4:]
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	787
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	788 f.write(entry)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	789
2073 1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	790 if self.inlinedata():
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	791 f.write(data[0])
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	792 f.write(data[1])
2075 343aeefb553b Make the appendfile class inline-data index friendly mason@suse.com parents: 2073 diff changeset	793 self.checkinlinesize(transaction, f)
2073 1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	794
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	795 self.cache = (node, n, text)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	796 return node
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	797
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	798 def ancestor(self, a, b):
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	799 """calculate the least common ancestor of nodes a and b"""
147 b6d8ed7aeba0 A new ancestor algorithm mpm@selenic.com parents: 126 diff changeset	800 # calculate the distance of every node from root
b6d8ed7aeba0 A new ancestor algorithm mpm@selenic.com parents: 126 diff changeset	801 dist = {nullid: 0}
b6d8ed7aeba0 A new ancestor algorithm mpm@selenic.com parents: 126 diff changeset	802 for i in xrange(self.count()):
b6d8ed7aeba0 A new ancestor algorithm mpm@selenic.com parents: 126 diff changeset	803 n = self.node(i)
b6d8ed7aeba0 A new ancestor algorithm mpm@selenic.com parents: 126 diff changeset	804 p1, p2 = self.parents(n)
b6d8ed7aeba0 A new ancestor algorithm mpm@selenic.com parents: 126 diff changeset	805 dist[n] = max(dist[p1], dist[p2]) + 1
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 484 diff changeset	806
147 b6d8ed7aeba0 A new ancestor algorithm mpm@selenic.com parents: 126 diff changeset	807 # traverse ancestors in order of decreasing distance from root
b6d8ed7aeba0 A new ancestor algorithm mpm@selenic.com parents: 126 diff changeset	808 def ancestors(node):
b6d8ed7aeba0 A new ancestor algorithm mpm@selenic.com parents: 126 diff changeset	809 # we store negative distances because heap returns smallest member
b6d8ed7aeba0 A new ancestor algorithm mpm@selenic.com parents: 126 diff changeset	810 h = [(-dist[node], node)]
b6d8ed7aeba0 A new ancestor algorithm mpm@selenic.com parents: 126 diff changeset	811 seen = {}
b6d8ed7aeba0 A new ancestor algorithm mpm@selenic.com parents: 126 diff changeset	812 while h:
b6d8ed7aeba0 A new ancestor algorithm mpm@selenic.com parents: 126 diff changeset	813 d, n = heapq.heappop(h)
b6d8ed7aeba0 A new ancestor algorithm mpm@selenic.com parents: 126 diff changeset	814 if n not in seen:
b6d8ed7aeba0 A new ancestor algorithm mpm@selenic.com parents: 126 diff changeset	815 seen[n] = 1
1351 0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	816 yield (-d, n)
147 b6d8ed7aeba0 A new ancestor algorithm mpm@selenic.com parents: 126 diff changeset	817 for p in self.parents(n):
b6d8ed7aeba0 A new ancestor algorithm mpm@selenic.com parents: 126 diff changeset	818 heapq.heappush(h, (-dist[p], p))
45 f2b2d5daec30 Fix recursion depth trouble with ancestor algorithm mpm@selenic.com parents: 41 diff changeset	819
1351 0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	820 def generations(node):
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	821 sg, s = None, {}
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	822 for g,n in ancestors(node):
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	823 if g != sg:
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	824 if sg:
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	825 yield sg, s
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	826 sg, s = g, {n:1}
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	827 else:
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	828 s[n] = 1
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	829 yield sg, s
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	830
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	831 x = generations(a)
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	832 y = generations(b)
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	833 gx = x.next()
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	834 gy = y.next()
45 f2b2d5daec30 Fix recursion depth trouble with ancestor algorithm mpm@selenic.com parents: 41 diff changeset	835
147 b6d8ed7aeba0 A new ancestor algorithm mpm@selenic.com parents: 126 diff changeset	836 # increment each ancestor list until it is closer to root than
b6d8ed7aeba0 A new ancestor algorithm mpm@selenic.com parents: 126 diff changeset	837 # the other, or they match
b6d8ed7aeba0 A new ancestor algorithm mpm@selenic.com parents: 126 diff changeset	838 while 1:
1351 0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	839 #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	840 if gx[0] == gy[0]:
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	841 # find the intersection
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	842 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	843 if i:
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	844 return i[0]
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	845 else:
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	846 #print "next"
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	847 gy = y.next()
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	848 gx = x.next()
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	849 elif gx[0] < gy[0]:
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	850 #print "next y"
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	851 gy = y.next()
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	852 else:
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	853 #print "next x"
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	854 gx = x.next()
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	855
1598 14d1f1868bf6 cleanup of revlog.group when repository is local Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	856 def group(self, nodelist, lookup, infocollect=None):
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	857 """calculate a delta group
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	858
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	859 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	860 metadata corresponding to nodes. the first delta is
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	861 parent(nodes[0]) -> nodes[0] the receiver is guaranteed to
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	862 have this parent as it has all history before these
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	863 changesets. parent is parent[0]
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	864 """
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	865 revs = [self.rev(n) for n in nodelist]
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	866
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	867 # 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	868 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	869 yield changegroup.closechunk()
192 5d8553352d2e Changes to network protocol mpm@selenic.com parents: 155 diff changeset	870 return
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	871
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	872 # add the parent of the first rev
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	873 p = self.parents(self.node(revs[0]))[0]
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	874 revs.insert(0, self.rev(p))
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	875
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	876 # build deltas
71 47c9a869adee Add mdiff.patches to speed up applying thousands of patches to the manifest mpm@selenic.com parents: 67 diff changeset	877 for d in xrange(0, len(revs) - 1):
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	878 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	879 nb = self.node(b)
192 5d8553352d2e Changes to network protocol mpm@selenic.com parents: 155 diff changeset	880
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	881 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	882 infocollect(nb)
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	883
1941 7518823709a2 revlog.py: factorization and fixes for rev < 0 (nullid) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1853 diff changeset	884 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	885 p = self.parents(nb)
14d1f1868bf6 cleanup of revlog.group when repository is local Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1559 diff changeset	886 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	887 yield changegroup.genchunk("%s%s" % (meta, d))
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	888
1981 736b6c96bbbc make incoming work via ssh (issue139); move chunk code into separate module. Thomas Arendsen Hein <thomas@intevation.de> parents: 1941 diff changeset	889 yield changegroup.closechunk()
192 5d8553352d2e Changes to network protocol mpm@selenic.com parents: 155 diff changeset	890
1062 6d5a62a549fa pep-0008 cleanup benoit.boissinot@ens-lyon.fr parents: 902 diff changeset	891 def addgroup(self, revs, linkmapper, transaction, unique=0):
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	892 """
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	893 add a delta group
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	894
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	895 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	896 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	897 log, the rest are against the previous delta.
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	898 """
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	899
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	900 #track the base of the current delta log
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	901 r = self.count()
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	902 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	903 node = None
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 484 diff changeset	904
655 b3bba126b04a Fix out of range regression Matt Mackall <mpm@selenic.com> parents: 653 diff changeset	905 base = prev = -1
653 94cdd02792b5 Fix corruption resulting from skipping parts of a revision group Matt Mackall <mpm@selenic.com> parents: 651 diff changeset	906 start = end = measure = 0
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	907 if r:
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	908 end = self.end(t)
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	909
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	910 ifh = self.opener(self.indexfile, "a+")
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	911 transaction.add(self.indexfile, ifh.tell())
2073 1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	912 if self.inlinedata():
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	913 dfh = None
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	914 else:
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	915 transaction.add(self.datafile, end)
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	916 dfh = self.opener(self.datafile, "a")
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	917
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	918 # loop through our set of deltas
192 5d8553352d2e Changes to network protocol mpm@selenic.com parents: 155 diff changeset	919 chain = None
5d8553352d2e Changes to network protocol mpm@selenic.com parents: 155 diff changeset	920 for chunk in revs:
5d8553352d2e Changes to network protocol mpm@selenic.com parents: 155 diff changeset	921 node, p1, p2, cs = struct.unpack("20s20s20s20s", chunk[:80])
94 7daef883134f Refactor merge code mpm@selenic.com parents: 86 diff changeset	922 link = linkmapper(cs)
77 bed15e766511 Fix bug in lazymap code mpm@selenic.com parents: 76 diff changeset	923 if node in self.nodemap:
224 ccbcc4d76f81 fix bad assumption about uniqueness of file versions mpm@selenic.com parents: 221 diff changeset	924 # 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	925 # 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	926 # 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	927 chain = node
224 ccbcc4d76f81 fix bad assumption about uniqueness of file versions mpm@selenic.com parents: 221 diff changeset	928 continue
192 5d8553352d2e Changes to network protocol mpm@selenic.com parents: 155 diff changeset	929 delta = chunk[80:]
5d8553352d2e Changes to network protocol mpm@selenic.com parents: 155 diff changeset	930
1509 46a07392cf28 Add safety check for addgroup Matt Mackall <mpm@selenic.com> parents: 1494 diff changeset	931 for p in (p1, p2):
46a07392cf28 Add safety check for addgroup Matt Mackall <mpm@selenic.com> parents: 1494 diff changeset	932 if not p in self.nodemap:
46a07392cf28 Add safety check for addgroup Matt Mackall <mpm@selenic.com> parents: 1494 diff changeset	933 raise RevlogError(_("unknown parent %s") % short(p1))
46a07392cf28 Add safety check for addgroup Matt Mackall <mpm@selenic.com> parents: 1494 diff changeset	934
192 5d8553352d2e Changes to network protocol mpm@selenic.com parents: 155 diff changeset	935 if not chain:
5d8553352d2e Changes to network protocol mpm@selenic.com parents: 155 diff changeset	936 # retrieve the parent revision of the delta chain
5d8553352d2e Changes to network protocol mpm@selenic.com parents: 155 diff changeset	937 chain = p1
5d8553352d2e Changes to network protocol mpm@selenic.com parents: 155 diff changeset	938 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	939 raise RevlogError(_("unknown base %s") % short(chain[:4]))
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	940
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	941 # full versions are inserted when the needed deltas become
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	942 # comparable to the uncompressed text or when the previous
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	943 # version is not the one we have a delta against. We use
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	944 # the size of the previous full rev as a proxy for the
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	945 # current size.
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	946
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	947 if chain == prev:
1533 3d11f81c9145 Reduce string duplication in compression code mason@suse.com parents: 1509 diff changeset	948 tempd = compress(delta)
3d11f81c9145 Reduce string duplication in compression code mason@suse.com parents: 1509 diff changeset	949 cdelta = tempd[0] + tempd[1]
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	950
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	951 if chain != prev or (end - start + len(cdelta)) > measure * 2:
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	952 # flush our writes here so we can read it in revision
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	953 if dfh:
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	954 dfh.flush()
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	955 ifh.flush()
65 d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	956 text = self.revision(chain)
73 ee1cbe841e01 Change revlog to use new patch code mpm@selenic.com parents: 71 diff changeset	957 text = self.patches(text, [delta])
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	958 chk = self.addrevision(text, transaction, link, p1, p2)
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	959 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	960 raise RevlogError(_("consistency error adding group"))
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	961 measure = len(text)
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	962 else:
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	963 if self.version == 0:
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	964 e = (end, len(cdelta), base, link, p1, p2, node)
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	965 else:
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	966 e = (self.offset_type(end, 0), len(cdelta), -1, base,
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	967 link, self.rev(p1), self.rev(p2), node)
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	968 self.index.append(e)
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	969 self.nodemap[node] = r
2073 1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	970 if self.inlinedata():
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	971 ifh.write(struct.pack(self.indexformat, *e))
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	972 ifh.write(cdelta)
2075 343aeefb553b Make the appendfile class inline-data index friendly mason@suse.com parents: 2073 diff changeset	973 self.checkinlinesize(transaction, ifh)
2073 1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	974 if not self.inlinedata():
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	975 dfh = self.opener(self.datafile, "a")
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	976 ifh = self.opener(self.indexfile, "a")
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	977 else:
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	978 if not dfh:
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	979 # addrevision switched from inline to conventional
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	980 # reopen the index
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	981 dfh = self.opener(self.datafile, "a")
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	982 ifh = self.opener(self.indexfile, "a")
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	983 dfh.write(cdelta)
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	984 ifh.write(struct.pack(self.indexformat, *e))
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	985
65 d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	986 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	987 base = self.base(t)
d457fec76ab0 fix warnings from pychecker (unused variables and shadowing) Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1711 diff changeset	988 start = self.start(base)
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	989 end = self.end(t)
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	990
2002 4aab906517c6 Calling revlog.addgroup with an empty changegroup now raises RevlogError. Thomas Arendsen Hein <thomas@intevation.de> parents: 1981 diff changeset	991 if node is None:
4aab906517c6 Calling revlog.addgroup with an empty changegroup now raises RevlogError. Thomas Arendsen Hein <thomas@intevation.de> parents: 1981 diff changeset	992 raise RevlogError(_("group to be added is empty"))
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	993 return node
1493 1a216cb4ee64 verify: add check for mismatch of index and data length Matt Mackall <mpm@selenic.com> parents: 1469 diff changeset	994
1535 7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	995 def strip(self, rev, minlink):
7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	996 if self.count() == 0 or rev >= self.count():
7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	997 return
7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	998
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	999 if isinstance(self.index, lazyindex):
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	1000 self.loadindexmap()
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	1001
1535 7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	1002 # 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	1003 # does not actually belong to an older changeset.
7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	1004 # The minlink parameter defines the oldest revision
7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	1005 # we're allowed to strip away.
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	1006 while minlink > self.index[rev][-4]:
1535 7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	1007 rev += 1
7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	1008 if rev >= self.count():
7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	1009 return
7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	1010
7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	1011 # first truncate the files on disk
7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	1012 end = self.start(rev)
2073 1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	1013 if not self.inlinedata():
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	1014 df = self.opener(self.datafile, "a")
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	1015 df.truncate(end)
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	1016 end = rev * struct.calcsize(self.indexformat)
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	1017 else:
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	1018 end += rev * struct.calcsize(self.indexformat)
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	1019
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	1020 indexf = self.opener(self.indexfile, "a")
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	1021 indexf.truncate(end)
1535 7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	1022
7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	1023 # 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	1024 self.cache = None
1711 8959700c2b19 revlog.strip should clear the chunkcache mason@suse.com parents: 1667 diff changeset	1025 self.chunkcache = None
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	1026 for x in xrange(rev, self.count()):
74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	1027 del self.nodemap[self.node(x)]
1535 7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	1028
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	1029 del self.index[rev:]
1535 7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	1030
1493 1a216cb4ee64 verify: add check for mismatch of index and data length Matt Mackall <mpm@selenic.com> parents: 1469 diff changeset	1031 def checksize(self):
1a216cb4ee64 verify: add check for mismatch of index and data length Matt Mackall <mpm@selenic.com> parents: 1469 diff changeset	1032 expected = 0
1a216cb4ee64 verify: add check for mismatch of index and data length Matt Mackall <mpm@selenic.com> parents: 1469 diff changeset	1033 if self.count():
1a216cb4ee64 verify: add check for mismatch of index and data length Matt Mackall <mpm@selenic.com> parents: 1469 diff changeset	1034 expected = self.end(self.count() - 1)
1667 daff3ef0de8d verify: notice extra data in indices Matt Mackall <mpm@selenic.com> parents: 1660 diff changeset	1035
1494 249ca10d37f4 Handle empty logs in repo.checksize Matt Mackall <mpm@selenic.com> parents: 1493 diff changeset	1036 try:
249ca10d37f4 Handle empty logs in repo.checksize Matt Mackall <mpm@selenic.com> parents: 1493 diff changeset	1037 f = self.opener(self.datafile)
249ca10d37f4 Handle empty logs in repo.checksize Matt Mackall <mpm@selenic.com> parents: 1493 diff changeset	1038 f.seek(0, 2)
249ca10d37f4 Handle empty logs in repo.checksize Matt Mackall <mpm@selenic.com> parents: 1493 diff changeset	1039 actual = f.tell()
1667 daff3ef0de8d verify: notice extra data in indices Matt Mackall <mpm@selenic.com> parents: 1660 diff changeset	1040 dd = actual - expected
1494 249ca10d37f4 Handle empty logs in repo.checksize Matt Mackall <mpm@selenic.com> parents: 1493 diff changeset	1041 except IOError, inst:
1667 daff3ef0de8d verify: notice extra data in indices Matt Mackall <mpm@selenic.com> parents: 1660 diff changeset	1042 if inst.errno != errno.ENOENT:
daff3ef0de8d verify: notice extra data in indices Matt Mackall <mpm@selenic.com> parents: 1660 diff changeset	1043 raise
daff3ef0de8d verify: notice extra data in indices Matt Mackall <mpm@selenic.com> parents: 1660 diff changeset	1044 dd = 0
daff3ef0de8d verify: notice extra data in indices Matt Mackall <mpm@selenic.com> parents: 1660 diff changeset	1045
daff3ef0de8d verify: notice extra data in indices Matt Mackall <mpm@selenic.com> parents: 1660 diff changeset	1046 try:
daff3ef0de8d verify: notice extra data in indices Matt Mackall <mpm@selenic.com> parents: 1660 diff changeset	1047 f = self.opener(self.indexfile)
daff3ef0de8d verify: notice extra data in indices Matt Mackall <mpm@selenic.com> parents: 1660 diff changeset	1048 f.seek(0, 2)
daff3ef0de8d verify: notice extra data in indices Matt Mackall <mpm@selenic.com> parents: 1660 diff changeset	1049 actual = f.tell()
2072 74d3f5336b66 Implement revlogng. mason@suse.com parents: 2002 diff changeset	1050 s = struct.calcsize(self.indexformat)
1667 daff3ef0de8d verify: notice extra data in indices Matt Mackall <mpm@selenic.com> parents: 1660 diff changeset	1051 i = actual / s
daff3ef0de8d verify: notice extra data in indices Matt Mackall <mpm@selenic.com> parents: 1660 diff changeset	1052 di = actual - (i * s)
2073 1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	1053 if self.inlinedata():
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	1054 databytes = 0
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	1055 for r in xrange(self.count()):
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	1056 databytes += self.length(r)
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	1057 dd = 0
1e6745f78989 Implement data inlined with the index file mason@suse.com parents: 2072 diff changeset	1058 di = actual - self.count() * s - databytes
1667 daff3ef0de8d verify: notice extra data in indices Matt Mackall <mpm@selenic.com> parents: 1660 diff changeset	1059 except IOError, inst:
daff3ef0de8d verify: notice extra data in indices Matt Mackall <mpm@selenic.com> parents: 1660 diff changeset	1060 if inst.errno != errno.ENOENT:
daff3ef0de8d verify: notice extra data in indices Matt Mackall <mpm@selenic.com> parents: 1660 diff changeset	1061 raise
daff3ef0de8d verify: notice extra data in indices Matt Mackall <mpm@selenic.com> parents: 1660 diff changeset	1062 di = 0
daff3ef0de8d verify: notice extra data in indices Matt Mackall <mpm@selenic.com> parents: 1660 diff changeset	1063
daff3ef0de8d verify: notice extra data in indices Matt Mackall <mpm@selenic.com> parents: 1660 diff changeset	1064 return (dd, di)
1494 249ca10d37f4 Handle empty logs in repo.checksize Matt Mackall <mpm@selenic.com> parents: 1493 diff changeset	1065
249ca10d37f4 Handle empty logs in repo.checksize Matt Mackall <mpm@selenic.com> parents: 1493 diff changeset	1066

Mercurial > hg > mercurial-crew-with-dirclash

annotate mercurial/revlog.py @ 2076:d007df6daf8e