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

annotate mercurial/revlog.py @ 1535:7ae0ce7a3dc4

Add revlog.strip to truncate away revisions. This updates the revlog data structures for index and nodemap in place so the .d and .i files don't need to be reread after stripping away a revision.

author	mason@suse.com
date	Fri, 11 Nov 2005 18:20:24 -0800
parents	3d11f81c9145
children	ccb9b62de892

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
1325 57220daf40e9 Move urllib error handling from revlog into statichttprepo, where it belongs. Bryan O'Sullivan <bos@serpentine.com> parents: 1322 diff changeset	16 demandload(globals(), "binascii errno heapq mdiff sha struct zlib")
36 da28286bf6b7 Add smart node lookup by substring or by rev number mpm@selenic.com parents: 26 diff changeset	17
1091 d62130f99a73 Move hash function back to revlog from node mpm@selenic.com parents: 1089 diff changeset	18 def hash(text, p1, p2):
d62130f99a73 Move hash function back to revlog from node mpm@selenic.com parents: 1089 diff changeset	19 """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	20
d62130f99a73 Move hash function back to revlog from node mpm@selenic.com parents: 1089 diff changeset	21 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	22 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	23 content in the revision graph.
d62130f99a73 Move hash function back to revlog from node mpm@selenic.com parents: 1089 diff changeset	24 """
d62130f99a73 Move hash function back to revlog from node mpm@selenic.com parents: 1089 diff changeset	25 l = [p1, p2]
d62130f99a73 Move hash function back to revlog from node mpm@selenic.com parents: 1089 diff changeset	26 l.sort()
d62130f99a73 Move hash function back to revlog from node mpm@selenic.com parents: 1089 diff changeset	27 s = sha.new(l[0])
d62130f99a73 Move hash function back to revlog from node mpm@selenic.com parents: 1089 diff changeset	28 s.update(l[1])
d62130f99a73 Move hash function back to revlog from node mpm@selenic.com parents: 1089 diff changeset	29 s.update(text)
d62130f99a73 Move hash function back to revlog from node mpm@selenic.com parents: 1089 diff changeset	30 return s.digest()
d62130f99a73 Move hash function back to revlog from node mpm@selenic.com parents: 1089 diff changeset	31
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	32 def compress(text):
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	33 """ generate a possibly-compressed representation of text """
1533 3d11f81c9145 Reduce string duplication in compression code mason@suse.com parents: 1509 diff changeset	34 if not text: return ("", text)
112 aea6562add6c Make compression more intelligent: mpm@selenic.com parents: 98 diff changeset	35 if len(text) < 44:
1533 3d11f81c9145 Reduce string duplication in compression code mason@suse.com parents: 1509 diff changeset	36 if text[0] == '\0': return ("", text)
3d11f81c9145 Reduce string duplication in compression code mason@suse.com parents: 1509 diff changeset	37 return ('u', text)
112 aea6562add6c Make compression more intelligent: mpm@selenic.com parents: 98 diff changeset	38 bin = zlib.compress(text)
aea6562add6c Make compression more intelligent: mpm@selenic.com parents: 98 diff changeset	39 if len(bin) > len(text):
1533 3d11f81c9145 Reduce string duplication in compression code mason@suse.com parents: 1509 diff changeset	40 if text[0] == '\0': return ("", text)
3d11f81c9145 Reduce string duplication in compression code mason@suse.com parents: 1509 diff changeset	41 return ('u', text)
3d11f81c9145 Reduce string duplication in compression code mason@suse.com parents: 1509 diff changeset	42 return ("", bin)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	43
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	44 def decompress(bin):
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	45 """ decompress the given input """
112 aea6562add6c Make compression more intelligent: mpm@selenic.com parents: 98 diff changeset	46 if not bin: return bin
aea6562add6c Make compression more intelligent: mpm@selenic.com parents: 98 diff changeset	47 t = bin[0]
aea6562add6c Make compression more intelligent: mpm@selenic.com parents: 98 diff changeset	48 if t == '\0': return bin
aea6562add6c Make compression more intelligent: mpm@selenic.com parents: 98 diff changeset	49 if t == 'x': return zlib.decompress(bin)
aea6562add6c Make compression more intelligent: mpm@selenic.com parents: 98 diff changeset	50 if t == 'u': return bin[1:]
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	51 raise RevlogError(_("unknown compression type %s") % t)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	52
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	53 indexformat = ">4l20s20s20s"
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	54
76 d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	55 class lazyparser:
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	56 """
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	57 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	58
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	59 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	60
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	61 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	62 the lazy objects in revlog with the underlying objects for
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	63 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	64 """
323 c6f0673ab7e9 lazyparser speed ups mpm@selenic.com parents: 306 diff changeset	65 def __init__(self, data, revlog):
76 d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	66 self.data = data
d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	67 self.s = struct.calcsize(indexformat)
d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	68 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	69 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	70 self.map = {nullid: -1}
323 c6f0673ab7e9 lazyparser speed ups mpm@selenic.com parents: 306 diff changeset	71 self.all = 0
c6f0673ab7e9 lazyparser speed ups mpm@selenic.com parents: 306 diff changeset	72 self.revlog = revlog
76 d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	73
1535 7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	74 def trunc(self, pos):
7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	75 self.l = pos/self.s
7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	76
323 c6f0673ab7e9 lazyparser speed ups mpm@selenic.com parents: 306 diff changeset	77 def load(self, pos=None):
c6f0673ab7e9 lazyparser speed ups mpm@selenic.com parents: 306 diff changeset	78 if self.all: return
c6f0673ab7e9 lazyparser speed ups mpm@selenic.com parents: 306 diff changeset	79 if pos is not None:
c6f0673ab7e9 lazyparser speed ups mpm@selenic.com parents: 306 diff changeset	80 block = pos / 1000
c6f0673ab7e9 lazyparser speed ups mpm@selenic.com parents: 306 diff changeset	81 i = block * 1000
c6f0673ab7e9 lazyparser speed ups mpm@selenic.com parents: 306 diff changeset	82 end = min(self.l, i + 1000)
c6f0673ab7e9 lazyparser speed ups mpm@selenic.com parents: 306 diff changeset	83 else:
c6f0673ab7e9 lazyparser speed ups mpm@selenic.com parents: 306 diff changeset	84 self.all = 1
c6f0673ab7e9 lazyparser speed ups mpm@selenic.com parents: 306 diff changeset	85 i = 0
c6f0673ab7e9 lazyparser speed ups mpm@selenic.com parents: 306 diff changeset	86 end = self.l
c6f0673ab7e9 lazyparser speed ups mpm@selenic.com parents: 306 diff changeset	87 self.revlog.index = self.index
c6f0673ab7e9 lazyparser speed ups mpm@selenic.com parents: 306 diff changeset	88 self.revlog.nodemap = self.map
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 484 diff changeset	89
76 d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	90 while i < end:
d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	91 d = self.data[i * self.s: (i + 1) * self.s]
d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	92 e = struct.unpack(indexformat, d)
d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	93 self.index[i] = e
d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	94 self.map[e[6]] = i
d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	95 i += 1
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 484 diff changeset	96
76 d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	97 class lazyindex:
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	98 """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	99 def __init__(self, parser):
d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	100 self.p = parser
d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	101 def __len__(self):
d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	102 return len(self.p.index)
115 39b438eeb25a Make lazyindex load slightly faster mpm@selenic.com parents: 112 diff changeset	103 def load(self, pos):
1403 bc3e66edb04c lazyindex fix, make load handle negative indexes properly. Eric Hopper <hopper@omnifarious.org> parents: 1402 diff changeset	104 if pos < 0:
bc3e66edb04c lazyindex fix, make load handle negative indexes properly. Eric Hopper <hopper@omnifarious.org> parents: 1402 diff changeset	105 pos += len(self.p.index)
115 39b438eeb25a Make lazyindex load slightly faster mpm@selenic.com parents: 112 diff changeset	106 self.p.load(pos)
39b438eeb25a Make lazyindex load slightly faster mpm@selenic.com parents: 112 diff changeset	107 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	108 def __getitem__(self, pos):
115 39b438eeb25a Make lazyindex load slightly faster mpm@selenic.com parents: 112 diff changeset	109 return self.p.index[pos] or self.load(pos)
1535 7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	110 def __delitem__(self, pos):
7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	111 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	112 def append(self, e):
d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	113 self.p.index.append(e)
1535 7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	114 def trunc(self, pos):
7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	115 self.p.trunc(pos)
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 484 diff changeset	116
76 d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	117 class lazymap:
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	118 """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	119 def __init__(self, parser):
d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	120 self.p = parser
d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	121 def load(self, key):
323 c6f0673ab7e9 lazyparser speed ups mpm@selenic.com parents: 306 diff changeset	122 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	123 n = self.p.data.find(key)
1214 34706a835d4a Smarter handling of revlog key errors mpm@selenic.com parents: 1201 diff changeset	124 if n < 0:
34706a835d4a Smarter handling of revlog key errors mpm@selenic.com parents: 1201 diff changeset	125 raise KeyError(key)
76 d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	126 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	127 self.p.load(pos)
d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	128 def __contains__(self, key):
323 c6f0673ab7e9 lazyparser speed ups mpm@selenic.com parents: 306 diff changeset	129 self.p.load()
c6f0673ab7e9 lazyparser speed ups mpm@selenic.com parents: 306 diff changeset	130 return key in self.p.map
97 7a2abee6b0c2 Add iterator to the lazymap code mpm@selenic.com parents: 94 diff changeset	131 def __iter__(self):
469 e205194ca7ef Various node id lookup tweaks mpm@selenic.com parents: 451 diff changeset	132 yield nullid
97 7a2abee6b0c2 Add iterator to the lazymap code mpm@selenic.com parents: 94 diff changeset	133 for i in xrange(self.p.l):
7a2abee6b0c2 Add iterator to the lazymap code mpm@selenic.com parents: 94 diff changeset	134 try:
7a2abee6b0c2 Add iterator to the lazymap code mpm@selenic.com parents: 94 diff changeset	135 yield self.p.index[i][6]
7a2abee6b0c2 Add iterator to the lazymap code mpm@selenic.com parents: 94 diff changeset	136 except:
7a2abee6b0c2 Add iterator to the lazymap code mpm@selenic.com parents: 94 diff changeset	137 self.p.load(i)
7a2abee6b0c2 Add iterator to the lazymap code mpm@selenic.com parents: 94 diff changeset	138 yield self.p.index[i][6]
76 d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	139 def __getitem__(self, key):
d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	140 try:
d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	141 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	142 except KeyError:
86 1b945e8ba67b Friendlier exceptions for unknown node errors mpm@selenic.com parents: 84 diff changeset	143 try:
1b945e8ba67b Friendlier exceptions for unknown node errors mpm@selenic.com parents: 84 diff changeset	144 self.load(key)
1b945e8ba67b Friendlier exceptions for unknown node errors mpm@selenic.com parents: 84 diff changeset	145 return self.p.map[key]
1b945e8ba67b Friendlier exceptions for unknown node errors mpm@selenic.com parents: 84 diff changeset	146 except KeyError:
1b945e8ba67b Friendlier exceptions for unknown node errors mpm@selenic.com parents: 84 diff changeset	147 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	148 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	149 self.p.map[key] = val
1535 7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	150 def __delitem__(self, key):
7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	151 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	152
1073 7b35a980b982 [PATCH] raise exceptions with Exception subclasses Bart Trojanowski <bart@jukie.net> parents: 1062 diff changeset	153 class RevlogError(Exception): pass
7b35a980b982 [PATCH] raise exceptions with Exception subclasses Bart Trojanowski <bart@jukie.net> parents: 1062 diff changeset	154
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	155 class revlog:
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	156 """
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	157 the underlying revision storage object
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	158
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	159 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	160
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	161 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	162 information on each revision, includings its nodeid (hash), the
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	163 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	164 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	165 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	166 data.
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	167
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	168 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	169 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	170 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	171 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	172 version data. This makes retrieval of a version proportional to
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	173 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	174
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	175 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	176 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	177 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	178 for locking while reading.
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	179 """
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	180 def __init__(self, opener, indexfile, datafile):
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	181 """
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	182 create a revlog object
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	183
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	184 opener is a function that abstracts the file opening operation
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	185 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	186 """
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	187 self.indexfile = indexfile
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	188 self.datafile = datafile
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	189 self.opener = opener
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	190 self.cache = None
116 e484cd5ec282 Only use lazy indexing for big indices and avoid the overhead of the mpm@selenic.com parents: 115 diff changeset	191
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	192 try:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	193 i = self.opener(self.indexfile).read()
1322 b3d44e9b3092 Make revlog constructor more discerning in its treatment of errors. Bryan O'Sullivan <bos@serpentine.com> parents: 1232 diff changeset	194 except IOError, inst:
b3d44e9b3092 Make revlog constructor more discerning in its treatment of errors. Bryan O'Sullivan <bos@serpentine.com> parents: 1232 diff changeset	195 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	196 raise
76 d993ebd69d28 Add lazy{parser,index,map} to speed up processing of index files mpm@selenic.com parents: 73 diff changeset	197 i = ""
116 e484cd5ec282 Only use lazy indexing for big indices and avoid the overhead of the mpm@selenic.com parents: 115 diff changeset	198
e484cd5ec282 Only use lazy indexing for big indices and avoid the overhead of the mpm@selenic.com parents: 115 diff changeset	199 if len(i) > 10000:
e484cd5ec282 Only use lazy indexing for big indices and avoid the overhead of the mpm@selenic.com parents: 115 diff changeset	200 # big index, let's parse it on demand
323 c6f0673ab7e9 lazyparser speed ups mpm@selenic.com parents: 306 diff changeset	201 parser = lazyparser(i, self)
116 e484cd5ec282 Only use lazy indexing for big indices and avoid the overhead of the mpm@selenic.com parents: 115 diff changeset	202 self.index = lazyindex(parser)
e484cd5ec282 Only use lazy indexing for big indices and avoid the overhead of the mpm@selenic.com parents: 115 diff changeset	203 self.nodemap = lazymap(parser)
e484cd5ec282 Only use lazy indexing for big indices and avoid the overhead of the mpm@selenic.com parents: 115 diff changeset	204 else:
e484cd5ec282 Only use lazy indexing for big indices and avoid the overhead of the mpm@selenic.com parents: 115 diff changeset	205 s = struct.calcsize(indexformat)
e484cd5ec282 Only use lazy indexing for big indices and avoid the overhead of the mpm@selenic.com parents: 115 diff changeset	206 l = len(i) / s
e484cd5ec282 Only use lazy indexing for big indices and avoid the overhead of the mpm@selenic.com parents: 115 diff changeset	207 self.index = [None] * l
e484cd5ec282 Only use lazy indexing for big indices and avoid the overhead of the mpm@selenic.com parents: 115 diff changeset	208 m = [None] * l
e484cd5ec282 Only use lazy indexing for big indices and avoid the overhead of the mpm@selenic.com parents: 115 diff changeset	209
e484cd5ec282 Only use lazy indexing for big indices and avoid the overhead of the mpm@selenic.com parents: 115 diff changeset	210 n = 0
e484cd5ec282 Only use lazy indexing for big indices and avoid the overhead of the mpm@selenic.com parents: 115 diff changeset	211 for f in xrange(0, len(i), s):
e484cd5ec282 Only use lazy indexing for big indices and avoid the overhead of the mpm@selenic.com parents: 115 diff changeset	212 # offset, size, base, linkrev, p1, p2, nodeid
e484cd5ec282 Only use lazy indexing for big indices and avoid the overhead of the mpm@selenic.com parents: 115 diff changeset	213 e = struct.unpack(indexformat, i[f:f + s])
e484cd5ec282 Only use lazy indexing for big indices and avoid the overhead of the mpm@selenic.com parents: 115 diff changeset	214 m[n] = (e[6], n)
e484cd5ec282 Only use lazy indexing for big indices and avoid the overhead of the mpm@selenic.com parents: 115 diff changeset	215 self.index[n] = e
e484cd5ec282 Only use lazy indexing for big indices and avoid the overhead of the mpm@selenic.com parents: 115 diff changeset	216 n += 1
e484cd5ec282 Only use lazy indexing for big indices and avoid the overhead of the mpm@selenic.com parents: 115 diff changeset	217
e484cd5ec282 Only use lazy indexing for big indices and avoid the overhead of the mpm@selenic.com parents: 115 diff changeset	218 self.nodemap = dict(m)
e484cd5ec282 Only use lazy indexing for big indices and avoid the overhead of the mpm@selenic.com parents: 115 diff changeset	219 self.nodemap[nullid] = -1
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	220
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	221 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	222 def count(self): return len(self.index)
26 9cf83bf9ad38 Simplify integrity checking mpm@selenic.com parents: 14 diff changeset	223 def node(self, rev): return (rev < 0) and nullid or self.index[rev][6]
1201 59bfbdbc38f6 revlog: raise informative exception if file is missing. Bryan O'Sullivan <bos@serpentine.com> parents: 1099 diff changeset	224 def rev(self, node):
59bfbdbc38f6 revlog: raise informative exception if file is missing. Bryan O'Sullivan <bos@serpentine.com> parents: 1099 diff changeset	225 try:
59bfbdbc38f6 revlog: raise informative exception if file is missing. Bryan O'Sullivan <bos@serpentine.com> parents: 1099 diff changeset	226 return self.nodemap[node]
59bfbdbc38f6 revlog: raise informative exception if file is missing. Bryan O'Sullivan <bos@serpentine.com> parents: 1099 diff changeset	227 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	228 raise RevlogError(_('%s: no node %s') % (self.indexfile, hex(node)))
1201 59bfbdbc38f6 revlog: raise informative exception if file is missing. Bryan O'Sullivan <bos@serpentine.com> parents: 1099 diff changeset	229 def linkrev(self, node): return self.index[self.rev(node)][3]
2 ecf3fd948051 Handle nullid better for ancestor mpm@selenic.com parents: 0 diff changeset	230 def parents(self, node):
ecf3fd948051 Handle nullid better for ancestor mpm@selenic.com parents: 0 diff changeset	231 if node == nullid: return (nullid, nullid)
1201 59bfbdbc38f6 revlog: raise informative exception if file is missing. Bryan O'Sullivan <bos@serpentine.com> parents: 1099 diff changeset	232 return self.index[self.rev(node)][4:6]
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	233
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	234 def start(self, rev): return self.index[rev][0]
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	235 def length(self, rev): return self.index[rev][1]
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	236 def end(self, rev): return self.start(rev) + self.length(rev)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	237 def base(self, rev): return self.index[rev][2]
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	238
1074 55bf5cfde69e Add revlog.reachable to find a graph of ancestors for a given rev mason@suse.com parents: 1073 diff changeset	239 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	240 reachable = {}
55bf5cfde69e Add revlog.reachable to find a graph of ancestors for a given rev mason@suse.com parents: 1073 diff changeset	241 visit = [rev]
55bf5cfde69e Add revlog.reachable to find a graph of ancestors for a given rev mason@suse.com parents: 1073 diff changeset	242 reachable[rev] = 1
55bf5cfde69e Add revlog.reachable to find a graph of ancestors for a given rev mason@suse.com parents: 1073 diff changeset	243 if stop:
55bf5cfde69e Add revlog.reachable to find a graph of ancestors for a given rev mason@suse.com parents: 1073 diff changeset	244 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	245 else:
55bf5cfde69e Add revlog.reachable to find a graph of ancestors for a given rev mason@suse.com parents: 1073 diff changeset	246 stopn = 0
55bf5cfde69e Add revlog.reachable to find a graph of ancestors for a given rev mason@suse.com parents: 1073 diff changeset	247 while visit:
55bf5cfde69e Add revlog.reachable to find a graph of ancestors for a given rev mason@suse.com parents: 1073 diff changeset	248 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	249 if n == stop:
55bf5cfde69e Add revlog.reachable to find a graph of ancestors for a given rev mason@suse.com parents: 1073 diff changeset	250 continue
55bf5cfde69e Add revlog.reachable to find a graph of ancestors for a given rev mason@suse.com parents: 1073 diff changeset	251 if n == nullid:
55bf5cfde69e Add revlog.reachable to find a graph of ancestors for a given rev mason@suse.com parents: 1073 diff changeset	252 continue
55bf5cfde69e Add revlog.reachable to find a graph of ancestors for a given rev mason@suse.com parents: 1073 diff changeset	253 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	254 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	255 continue
55bf5cfde69e Add revlog.reachable to find a graph of ancestors for a given rev mason@suse.com parents: 1073 diff changeset	256 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	257 reachable[p] = 1
55bf5cfde69e Add revlog.reachable to find a graph of ancestors for a given rev mason@suse.com parents: 1073 diff changeset	258 visit.append(p)
55bf5cfde69e Add revlog.reachable to find a graph of ancestors for a given rev mason@suse.com parents: 1073 diff changeset	259 return reachable
55bf5cfde69e Add revlog.reachable to find a graph of ancestors for a given rev mason@suse.com parents: 1073 diff changeset	260
1457 518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	261 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	262 """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	263 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	264 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	265
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	266 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	267 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	268 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	269 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	270 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	271
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	272 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	273 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	274 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	275 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	276 nonodes = ([], [], [])
1457 518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	277 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	278 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	279 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	280 return nonodes
1457 518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	281 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	282 else:
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	283 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	284 lowestrev = -1
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	285 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	286 # 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	287 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	288 [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	289 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	290 # 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	291 # node.
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	292 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	293 # 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	294 ancestors = None
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	295 # 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	296 heads = {}
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	297 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	298 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	299 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	300 return nonodes
1457 518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	301 ancestors = {}
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	302 # 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	303 nodestotag = heads[:]
1457 518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	304 # 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	305 # 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	306 # find from roots.
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	307 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	308 # 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	309 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	310 while nodestotag:
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	311 # 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	312 n = nodestotag.pop()
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	313 # Never tag nullid
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	314 if n == nullid:
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	315 continue
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	316 # 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	317 # 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	318 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	319 if r >= lowestrev:
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	320 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	321 # 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	322 # 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	323 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	324 # 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	325 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	326 p != nullid])
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	327 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	328 # 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	329 # any other heads.
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	330 heads.pop(n)
1459 106fdec8e1fb Fix small bug in nodesbetween if heads is [nullid]. Eric Hopper <hopper@omnifarious.org> parents: 1458 diff changeset	331 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	332 return nonodes
1457 518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	333 # 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	334 # 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	335
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	336 # 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	337 if lowestrev > -1:
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	338 # 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	339 # 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	340
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	341 # 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	342 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	343 # 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	344 if roots:
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	345 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	346 else:
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	347 # 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	348 return nonodes
1457 518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	349 else:
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	350 # 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	351 # any other roots.
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	352 lowestrev = -1
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	353 roots = [nullid]
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	354 # 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	355 # 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	356 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	357 # 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	358 # '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	359 roots = descendents.copy()
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	360 # 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	361 orderedout = []
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	362 # 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	363 # 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	364 # they're descendents.
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	365 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	366 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	367 isdescendent = False
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	368 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	369 isdescendent = True
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	370 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	371 # 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	372 isdescendent = True
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	373 # 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	374 # 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	375 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	376 # 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	377 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	378 # 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	379 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	380 roots.pop(n)
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	381 else:
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	382 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	383 # 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	384 # 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	385 # up there, remember?)
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	386 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	387 descendents[n] = 1
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	388 isdescendent = True
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	389 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	390 # 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	391 orderedout.append(n)
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	392 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	393 # 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	394 # from roots.
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	395 # 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	396 heads[n] = 1
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	397 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	398 # 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	399 # 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	400 # 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	401 heads[n] = 1
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	402 # 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	403 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	404 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	405 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	406 roots = roots.keys()
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	407 assert orderedout
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	408 assert roots
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	409 assert heads
518da3c3b6ce This implements the nodesbetween method, and it removes the newer method Eric Hopper <hopper@omnifarious.org> parents: 1351 diff changeset	410 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	411
902 c749ca37aed1 Add optional stop revision to revlog.heads mason@suse.com parents: 896 diff changeset	412 def heads(self, stop=None):
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	413 """return the list of all nodes that have no children"""
221 2bfe525ef6ca Beginning of multi-head support mpm@selenic.com parents: 208 diff changeset	414 p = {}
2bfe525ef6ca Beginning of multi-head support mpm@selenic.com parents: 208 diff changeset	415 h = []
902 c749ca37aed1 Add optional stop revision to revlog.heads mason@suse.com parents: 896 diff changeset	416 stoprev = 0
c749ca37aed1 Add optional stop revision to revlog.heads mason@suse.com parents: 896 diff changeset	417 if stop and stop in self.nodemap:
c749ca37aed1 Add optional stop revision to revlog.heads mason@suse.com parents: 896 diff changeset	418 stoprev = self.rev(stop)
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	419
243 9a9ea2d1d3c4 fix heads for rev 0 mpm@selenic.com parents: 241 diff changeset	420 for r in range(self.count() - 1, -1, -1):
221 2bfe525ef6ca Beginning of multi-head support mpm@selenic.com parents: 208 diff changeset	421 n = self.node(r)
2bfe525ef6ca Beginning of multi-head support mpm@selenic.com parents: 208 diff changeset	422 if n not in p:
2bfe525ef6ca Beginning of multi-head support mpm@selenic.com parents: 208 diff changeset	423 h.append(n)
902 c749ca37aed1 Add optional stop revision to revlog.heads mason@suse.com parents: 896 diff changeset	424 if n == stop:
c749ca37aed1 Add optional stop revision to revlog.heads mason@suse.com parents: 896 diff changeset	425 break
c749ca37aed1 Add optional stop revision to revlog.heads mason@suse.com parents: 896 diff changeset	426 if r < stoprev:
c749ca37aed1 Add optional stop revision to revlog.heads mason@suse.com parents: 896 diff changeset	427 break
221 2bfe525ef6ca Beginning of multi-head support mpm@selenic.com parents: 208 diff changeset	428 for pn in self.parents(n):
2bfe525ef6ca Beginning of multi-head support mpm@selenic.com parents: 208 diff changeset	429 p[pn] = 1
2bfe525ef6ca Beginning of multi-head support mpm@selenic.com parents: 208 diff changeset	430 return h
370 c90385d82aec revlog: add a children function mpm@selenic.com parents: 330 diff changeset	431
c90385d82aec revlog: add a children function mpm@selenic.com parents: 330 diff changeset	432 def children(self, node):
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	433 """find the children of a given node"""
370 c90385d82aec revlog: add a children function mpm@selenic.com parents: 330 diff changeset	434 c = []
c90385d82aec revlog: add a children function mpm@selenic.com parents: 330 diff changeset	435 p = self.rev(node)
c90385d82aec revlog: add a children function mpm@selenic.com parents: 330 diff changeset	436 for r in range(p + 1, self.count()):
c90385d82aec revlog: add a children function mpm@selenic.com parents: 330 diff changeset	437 n = self.node(r)
c90385d82aec revlog: add a children function mpm@selenic.com parents: 330 diff changeset	438 for pn in self.parents(n):
854 473c030d34a6 Fixed revlog.children. Tristan Wibberley <tristan@wibberley.org> parents: 655 diff changeset	439 if pn == node:
473c030d34a6 Fixed revlog.children. Tristan Wibberley <tristan@wibberley.org> parents: 655 diff changeset	440 c.append(n)
370 c90385d82aec revlog: add a children function mpm@selenic.com parents: 330 diff changeset	441 continue
c90385d82aec revlog: add a children function mpm@selenic.com parents: 330 diff changeset	442 elif pn == nullid:
c90385d82aec revlog: add a children function mpm@selenic.com parents: 330 diff changeset	443 continue
c90385d82aec revlog: add a children function mpm@selenic.com parents: 330 diff changeset	444 return c
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 484 diff changeset	445
36 da28286bf6b7 Add smart node lookup by substring or by rev number mpm@selenic.com parents: 26 diff changeset	446 def lookup(self, id):
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	447 """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	448 try:
da28286bf6b7 Add smart node lookup by substring or by rev number mpm@selenic.com parents: 26 diff changeset	449 rev = int(id)
469 e205194ca7ef Various node id lookup tweaks mpm@selenic.com parents: 451 diff changeset	450 if str(rev) != id: raise ValueError
e205194ca7ef Various node id lookup tweaks mpm@selenic.com parents: 451 diff changeset	451 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	452 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	453 return self.node(rev)
469 e205194ca7ef Various node id lookup tweaks mpm@selenic.com parents: 451 diff changeset	454 except (ValueError, OverflowError):
36 da28286bf6b7 Add smart node lookup by substring or by rev number mpm@selenic.com parents: 26 diff changeset	455 c = []
da28286bf6b7 Add smart node lookup by substring or by rev number mpm@selenic.com parents: 26 diff changeset	456 for n in self.nodemap:
469 e205194ca7ef Various node id lookup tweaks mpm@selenic.com parents: 451 diff changeset	457 if hex(n).startswith(id):
36 da28286bf6b7 Add smart node lookup by substring or by rev number mpm@selenic.com parents: 26 diff changeset	458 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	459 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	460 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	461 return c[0]
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 484 diff changeset	462
36 da28286bf6b7 Add smart node lookup by substring or by rev number mpm@selenic.com parents: 26 diff changeset	463 return None
da28286bf6b7 Add smart node lookup by substring or by rev number mpm@selenic.com parents: 26 diff changeset	464
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	465 def diff(self, a, b):
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	466 """return a delta between two revisions"""
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	467 return mdiff.textdiff(a, b)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	468
73 ee1cbe841e01 Change revlog to use new patch code mpm@selenic.com parents: 71 diff changeset	469 def patches(self, t, pl):
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	470 """apply a list of patches to a string"""
73 ee1cbe841e01 Change revlog to use new patch code mpm@selenic.com parents: 71 diff changeset	471 return mdiff.patches(t, pl)
ee1cbe841e01 Change revlog to use new patch code mpm@selenic.com parents: 71 diff changeset	472
119 c7a66f9752a4 Add code to retrieve or construct a revlog delta mpm@selenic.com parents: 117 diff changeset	473 def delta(self, node):
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	474 """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	475 r = self.rev(node)
c7a66f9752a4 Add code to retrieve or construct a revlog delta mpm@selenic.com parents: 117 diff changeset	476 b = self.base(r)
c7a66f9752a4 Add code to retrieve or construct a revlog delta mpm@selenic.com parents: 117 diff changeset	477 if r == b:
c7a66f9752a4 Add code to retrieve or construct a revlog delta mpm@selenic.com parents: 117 diff changeset	478 return self.diff(self.revision(self.node(r - 1)),
c7a66f9752a4 Add code to retrieve or construct a revlog delta mpm@selenic.com parents: 117 diff changeset	479 self.revision(node))
c7a66f9752a4 Add code to retrieve or construct a revlog delta mpm@selenic.com parents: 117 diff changeset	480 else:
c7a66f9752a4 Add code to retrieve or construct a revlog delta mpm@selenic.com parents: 117 diff changeset	481 f = self.opener(self.datafile)
c7a66f9752a4 Add code to retrieve or construct a revlog delta mpm@selenic.com parents: 117 diff changeset	482 f.seek(self.start(r))
c7a66f9752a4 Add code to retrieve or construct a revlog delta mpm@selenic.com parents: 117 diff changeset	483 data = f.read(self.length(r))
c7a66f9752a4 Add code to retrieve or construct a revlog delta mpm@selenic.com parents: 117 diff changeset	484 return decompress(data)
c7a66f9752a4 Add code to retrieve or construct a revlog delta mpm@selenic.com parents: 117 diff changeset	485
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	486 def revision(self, node):
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	487 """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	488 if node == nullid: return ""
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	489 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	490
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	491 # look up what we need to read
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	492 text = None
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	493 rev = self.rev(node)
117 2ac722ad1a9d Make revision code slightly faster mpm@selenic.com parents: 116 diff changeset	494 start, length, base, link, p1, p2, node = self.index[rev]
2ac722ad1a9d Make revision code slightly faster mpm@selenic.com parents: 116 diff changeset	495 end = start + length
2ac722ad1a9d Make revision code slightly faster mpm@selenic.com parents: 116 diff changeset	496 if base != rev: start = self.start(base)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	497
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	498 # do we have useful data cached?
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	499 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	500 base = self.cache[1]
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	501 start = self.start(base + 1)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	502 text = self.cache[2]
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	503 last = 0
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	504
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	505 f = self.opener(self.datafile)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	506 f.seek(start)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	507 data = f.read(end - start)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	508
651 08b65d66f3e7 Fix an odd revlog bug Matt Mackall <mpm@selenic.com> parents: 644 diff changeset	509 if text is None:
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	510 last = self.length(base)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	511 text = decompress(data[:last])
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	512
71 47c9a869adee Add mdiff.patches to speed up applying thousands of patches to the manifest mpm@selenic.com parents: 67 diff changeset	513 bins = []
64 b3e2ddff0159 Diff in subdirectories from Jake Edge mpm@selenic.com parents: 46 diff changeset	514 for r in xrange(base + 1, rev + 1):
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	515 s = self.length(r)
71 47c9a869adee Add mdiff.patches to speed up applying thousands of patches to the manifest mpm@selenic.com parents: 67 diff changeset	516 bins.append(decompress(data[last:last + s]))
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	517 last = last + s
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	518
71 47c9a869adee Add mdiff.patches to speed up applying thousands of patches to the manifest mpm@selenic.com parents: 67 diff changeset	519 text = mdiff.patches(text, bins)
47c9a869adee Add mdiff.patches to speed up applying thousands of patches to the manifest mpm@selenic.com parents: 67 diff changeset	520
26 9cf83bf9ad38 Simplify integrity checking mpm@selenic.com parents: 14 diff changeset	521 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	522 raise RevlogError(_("integrity check failed on %s:%d")
98 3dde7c87e36d Add paranoia to diff code mpm@selenic.com parents: 97 diff changeset	523 % (self.datafile, rev))
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	524
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	525 self.cache = (node, rev, text)
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 484 diff changeset	526 return text
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	527
644 6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 547 diff changeset	528 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	529 """add a revision to the log
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	530
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	531 text - the revision data to add
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	532 transaction - the transaction object used for rollback
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	533 link - the linkrev data to add
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	534 p1, p2 - the parent nodeids of the revision
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	535 d - an optional precomputed delta
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	536 """
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	537 if text is None: text = ""
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	538 if p1 is None: p1 = self.tip()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	539 if p2 is None: p2 = nullid
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	540
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	541 node = hash(text, p1, p2)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	542
301 5add718d92db revlog: allow duplicates mpm@selenic.com parents: 243 diff changeset	543 if node in self.nodemap:
5add718d92db revlog: allow duplicates mpm@selenic.com parents: 243 diff changeset	544 return node
5add718d92db revlog: allow duplicates mpm@selenic.com parents: 243 diff changeset	545
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	546 n = self.count()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	547 t = n - 1
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	548
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	549 if n:
64 b3e2ddff0159 Diff in subdirectories from Jake Edge mpm@selenic.com parents: 46 diff changeset	550 base = self.base(t)
b3e2ddff0159 Diff in subdirectories from Jake Edge mpm@selenic.com parents: 46 diff changeset	551 start = self.start(base)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	552 end = self.end(t)
644 6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 547 diff changeset	553 if not d:
6ebe118280bd Performance enhancements for manifest.add() mason@suse.com parents: 547 diff changeset	554 prev = self.revision(self.tip())
1533 3d11f81c9145 Reduce string duplication in compression code mason@suse.com parents: 1509 diff changeset	555 d = self.diff(prev, str(text))
98 3dde7c87e36d Add paranoia to diff code mpm@selenic.com parents: 97 diff changeset	556 data = compress(d)
1533 3d11f81c9145 Reduce string duplication in compression code mason@suse.com parents: 1509 diff changeset	557 l = len(data[1]) + len(data[0])
3d11f81c9145 Reduce string duplication in compression code mason@suse.com parents: 1509 diff changeset	558 dist = end - start + l
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	559
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	560 # full versions are inserted when the needed deltas
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	561 # become comparable to the uncompressed text
64 b3e2ddff0159 Diff in subdirectories from Jake Edge mpm@selenic.com parents: 46 diff changeset	562 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	563 data = compress(text)
1533 3d11f81c9145 Reduce string duplication in compression code mason@suse.com parents: 1509 diff changeset	564 l = len(data[1]) + len(data[0])
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	565 base = n
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	566 else:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	567 base = self.base(t)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	568
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	569 offset = 0
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	570 if t >= 0:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	571 offset = self.end(t)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	572
1533 3d11f81c9145 Reduce string duplication in compression code mason@suse.com parents: 1509 diff changeset	573 e = (offset, l, base, link, p1, p2, node)
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 484 diff changeset	574
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	575 self.index.append(e)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	576 self.nodemap[node] = n
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	577 entry = struct.pack(indexformat, *e)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	578
26 9cf83bf9ad38 Simplify integrity checking mpm@selenic.com parents: 14 diff changeset	579 transaction.add(self.datafile, e[0])
1533 3d11f81c9145 Reduce string duplication in compression code mason@suse.com parents: 1509 diff changeset	580 f = self.opener(self.datafile, "a")
3d11f81c9145 Reduce string duplication in compression code mason@suse.com parents: 1509 diff changeset	581 if data[0]:
3d11f81c9145 Reduce string duplication in compression code mason@suse.com parents: 1509 diff changeset	582 f.write(data[0])
3d11f81c9145 Reduce string duplication in compression code mason@suse.com parents: 1509 diff changeset	583 f.write(data[1])
41 df3f46253878 Fix truncate logic for indices again mpm@selenic.com parents: 36 diff changeset	584 transaction.add(self.indexfile, n * len(entry))
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	585 self.opener(self.indexfile, "a").write(entry)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	586
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	587 self.cache = (node, n, text)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	588 return node
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	589
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	590 def ancestor(self, a, b):
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	591 """calculate the least common ancestor of nodes a and b"""
147 b6d8ed7aeba0 A new ancestor algorithm mpm@selenic.com parents: 126 diff changeset	592 # calculate the distance of every node from root
b6d8ed7aeba0 A new ancestor algorithm mpm@selenic.com parents: 126 diff changeset	593 dist = {nullid: 0}
b6d8ed7aeba0 A new ancestor algorithm mpm@selenic.com parents: 126 diff changeset	594 for i in xrange(self.count()):
b6d8ed7aeba0 A new ancestor algorithm mpm@selenic.com parents: 126 diff changeset	595 n = self.node(i)
b6d8ed7aeba0 A new ancestor algorithm mpm@selenic.com parents: 126 diff changeset	596 p1, p2 = self.parents(n)
b6d8ed7aeba0 A new ancestor algorithm mpm@selenic.com parents: 126 diff changeset	597 dist[n] = max(dist[p1], dist[p2]) + 1
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 484 diff changeset	598
147 b6d8ed7aeba0 A new ancestor algorithm mpm@selenic.com parents: 126 diff changeset	599 # traverse ancestors in order of decreasing distance from root
b6d8ed7aeba0 A new ancestor algorithm mpm@selenic.com parents: 126 diff changeset	600 def ancestors(node):
b6d8ed7aeba0 A new ancestor algorithm mpm@selenic.com parents: 126 diff changeset	601 # we store negative distances because heap returns smallest member
b6d8ed7aeba0 A new ancestor algorithm mpm@selenic.com parents: 126 diff changeset	602 h = [(-dist[node], node)]
b6d8ed7aeba0 A new ancestor algorithm mpm@selenic.com parents: 126 diff changeset	603 seen = {}
b6d8ed7aeba0 A new ancestor algorithm mpm@selenic.com parents: 126 diff changeset	604 earliest = self.count()
b6d8ed7aeba0 A new ancestor algorithm mpm@selenic.com parents: 126 diff changeset	605 while h:
b6d8ed7aeba0 A new ancestor algorithm mpm@selenic.com parents: 126 diff changeset	606 d, n = heapq.heappop(h)
b6d8ed7aeba0 A new ancestor algorithm mpm@selenic.com parents: 126 diff changeset	607 if n not in seen:
b6d8ed7aeba0 A new ancestor algorithm mpm@selenic.com parents: 126 diff changeset	608 seen[n] = 1
381 024ee0f8722a Ancestor algorithm fix mpm@selenic.com parents: 377 diff changeset	609 r = self.rev(n)
1351 0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	610 yield (-d, n)
147 b6d8ed7aeba0 A new ancestor algorithm mpm@selenic.com parents: 126 diff changeset	611 for p in self.parents(n):
b6d8ed7aeba0 A new ancestor algorithm mpm@selenic.com parents: 126 diff changeset	612 heapq.heappush(h, (-dist[p], p))
45 f2b2d5daec30 Fix recursion depth trouble with ancestor algorithm mpm@selenic.com parents: 41 diff changeset	613
1351 0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	614 def generations(node):
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	615 sg, s = None, {}
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	616 for g,n in ancestors(node):
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	617 if g != sg:
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	618 if sg:
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	619 yield sg, s
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	620 sg, s = g, {n:1}
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	621 else:
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	622 s[n] = 1
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	623 yield sg, s
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	624
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	625 x = generations(a)
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	626 y = generations(b)
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	627 gx = x.next()
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	628 gy = y.next()
45 f2b2d5daec30 Fix recursion depth trouble with ancestor algorithm mpm@selenic.com parents: 41 diff changeset	629
147 b6d8ed7aeba0 A new ancestor algorithm mpm@selenic.com parents: 126 diff changeset	630 # increment each ancestor list until it is closer to root than
b6d8ed7aeba0 A new ancestor algorithm mpm@selenic.com parents: 126 diff changeset	631 # the other, or they match
b6d8ed7aeba0 A new ancestor algorithm mpm@selenic.com parents: 126 diff changeset	632 while 1:
1351 0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	633 #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	634 if gx[0] == gy[0]:
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	635 # find the intersection
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	636 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	637 if i:
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	638 return i[0]
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	639 else:
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	640 #print "next"
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	641 gy = y.next()
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	642 gx = x.next()
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	643 elif gx[0] < gy[0]:
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	644 #print "next y"
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	645 gy = y.next()
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	646 else:
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	647 #print "next x"
0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 1325 diff changeset	648 gx = x.next()
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	649
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	650 def group(self, nodelist, lookup, infocollect = None):
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	651 """calculate a delta group
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	652
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	653 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	654 metadata corresponding to nodes. the first delta is
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	655 parent(nodes[0]) -> nodes[0] the receiver is guaranteed to
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	656 have this parent as it has all history before these
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	657 changesets. parent is parent[0]
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	658 """
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	659 revs = [self.rev(n) for n in nodelist]
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	660 needed = dict.fromkeys(revs, 1)
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	661
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	662 # 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	663 if not revs:
5d8553352d2e Changes to network protocol mpm@selenic.com parents: 155 diff changeset	664 yield struct.pack(">l", 0)
5d8553352d2e Changes to network protocol mpm@selenic.com parents: 155 diff changeset	665 return
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	666
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	667 # add the parent of the first rev
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	668 p = self.parents(self.node(revs[0]))[0]
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	669 revs.insert(0, self.rev(p))
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	670
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	671 # for each delta that isn't contiguous in the log, we need to
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	672 # reconstruct the base, reconstruct the result, and then
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	673 # calculate the delta. We also need to do this where we've
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	674 # stored a full version and not a delta
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	675 for i in xrange(0, len(revs) - 1):
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	676 a, b = revs[i], revs[i + 1]
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	677 if a + 1 != b or self.base(b) == b:
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	678 for j in xrange(self.base(a), a + 1):
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	679 needed[j] = 1
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	680 for j in xrange(self.base(b), b + 1):
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	681 needed[j] = 1
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	682
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	683 # calculate spans to retrieve from datafile
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	684 needed = needed.keys()
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	685 needed.sort()
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	686 spans = []
192 5d8553352d2e Changes to network protocol mpm@selenic.com parents: 155 diff changeset	687 oo = -1
5d8553352d2e Changes to network protocol mpm@selenic.com parents: 155 diff changeset	688 ol = 0
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	689 for n in needed:
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	690 if n < 0: continue
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	691 o = self.start(n)
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	692 l = self.length(n)
192 5d8553352d2e Changes to network protocol mpm@selenic.com parents: 155 diff changeset	693 if oo + ol == o: # can we merge with the previous?
5d8553352d2e Changes to network protocol mpm@selenic.com parents: 155 diff changeset	694 nl = spans[-1][2]
5d8553352d2e Changes to network protocol mpm@selenic.com parents: 155 diff changeset	695 nl.append((n, l))
5d8553352d2e Changes to network protocol mpm@selenic.com parents: 155 diff changeset	696 ol += l
5d8553352d2e Changes to network protocol mpm@selenic.com parents: 155 diff changeset	697 spans[-1] = (oo, ol, nl)
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	698 else:
192 5d8553352d2e Changes to network protocol mpm@selenic.com parents: 155 diff changeset	699 oo = o
5d8553352d2e Changes to network protocol mpm@selenic.com parents: 155 diff changeset	700 ol = l
5d8553352d2e Changes to network protocol mpm@selenic.com parents: 155 diff changeset	701 spans.append((oo, ol, [(n, l)]))
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	702
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	703 # read spans in, divide up chunks
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	704 chunks = {}
192 5d8553352d2e Changes to network protocol mpm@selenic.com parents: 155 diff changeset	705 for span in spans:
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	706 # we reopen the file for each span to make http happy for now
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	707 f = self.opener(self.datafile)
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	708 f.seek(span[0])
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	709 data = f.read(span[1])
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	710
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	711 # divide up the span
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	712 pos = 0
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	713 for r, l in span[2]:
192 5d8553352d2e Changes to network protocol mpm@selenic.com parents: 155 diff changeset	714 chunks[r] = decompress(data[pos: pos + l])
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	715 pos += l
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	716
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	717 # helper to reconstruct intermediate versions
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	718 def construct(text, base, rev):
192 5d8553352d2e Changes to network protocol mpm@selenic.com parents: 155 diff changeset	719 bins = [chunks[r] for r in xrange(base + 1, rev + 1)]
71 47c9a869adee Add mdiff.patches to speed up applying thousands of patches to the manifest mpm@selenic.com parents: 67 diff changeset	720 return mdiff.patches(text, bins)
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	721
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	722 # build deltas
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	723 deltas = []
71 47c9a869adee Add mdiff.patches to speed up applying thousands of patches to the manifest mpm@selenic.com parents: 67 diff changeset	724 for d in xrange(0, len(revs) - 1):
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	725 a, b = revs[d], revs[d + 1]
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	726 n = self.node(b)
192 5d8553352d2e Changes to network protocol mpm@selenic.com parents: 155 diff changeset	727
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	728 if infocollect is not None:
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	729 infocollect(n)
1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	730
192 5d8553352d2e Changes to network protocol mpm@selenic.com parents: 155 diff changeset	731 # do we need to construct a new delta?
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	732 if a + 1 != b or self.base(b) == b:
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	733 if a >= 0:
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	734 base = self.base(a)
192 5d8553352d2e Changes to network protocol mpm@selenic.com parents: 155 diff changeset	735 ta = chunks[self.base(a)]
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	736 ta = construct(ta, base, a)
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	737 else:
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	738 ta = ""
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 484 diff changeset	739
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	740 base = self.base(b)
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	741 if a > base:
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	742 base = a
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	743 tb = ta
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	744 else:
192 5d8553352d2e Changes to network protocol mpm@selenic.com parents: 155 diff changeset	745 tb = chunks[self.base(b)]
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	746 tb = construct(tb, base, b)
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	747 d = self.diff(ta, tb)
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	748 else:
192 5d8553352d2e Changes to network protocol mpm@selenic.com parents: 155 diff changeset	749 d = chunks[b]
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	750
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	751 p = self.parents(n)
1458 1033892bbb87 This changes the revlog.group and re-implements the localrepo.changeroup Eric Hopper <hopper@omnifarious.org> parents: 1457 diff changeset	752 meta = n + p[0] + p[1] + lookup(n)
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	753 l = struct.pack(">l", len(meta) + len(d) + 4)
192 5d8553352d2e Changes to network protocol mpm@selenic.com parents: 155 diff changeset	754 yield l
5d8553352d2e Changes to network protocol mpm@selenic.com parents: 155 diff changeset	755 yield meta
5d8553352d2e Changes to network protocol mpm@selenic.com parents: 155 diff changeset	756 yield d
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	757
192 5d8553352d2e Changes to network protocol mpm@selenic.com parents: 155 diff changeset	758 yield struct.pack(">l", 0)
5d8553352d2e Changes to network protocol mpm@selenic.com parents: 155 diff changeset	759
1062 6d5a62a549fa pep-0008 cleanup benoit.boissinot@ens-lyon.fr parents: 902 diff changeset	760 def addgroup(self, revs, linkmapper, transaction, unique=0):
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	761 """
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	762 add a delta group
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	763
1083 30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	764 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	765 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	766 log, the rest are against the previous delta.
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	767 """
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	768
30974cf73435 Add some docstrings to revlog.py mpm@selenic.com parents: 1074 diff changeset	769 #track the base of the current delta log
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	770 r = self.count()
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	771 t = r - 1
192 5d8553352d2e Changes to network protocol mpm@selenic.com parents: 155 diff changeset	772 node = nullid
515 03f27b1381f9 Whitespace cleanups mpm@selenic.com parents: 484 diff changeset	773
655 b3bba126b04a Fix out of range regression Matt Mackall <mpm@selenic.com> parents: 653 diff changeset	774 base = prev = -1
653 94cdd02792b5 Fix corruption resulting from skipping parts of a revision group Matt Mackall <mpm@selenic.com> parents: 651 diff changeset	775 start = end = measure = 0
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	776 if r:
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	777 start = self.start(self.base(t))
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	778 end = self.end(t)
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	779 measure = self.length(self.base(t))
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	780 base = self.base(t)
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	781 prev = self.tip()
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	782
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	783 transaction.add(self.datafile, end)
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	784 transaction.add(self.indexfile, r * struct.calcsize(indexformat))
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	785 dfh = self.opener(self.datafile, "a")
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	786 ifh = self.opener(self.indexfile, "a")
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	787
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	788 # loop through our set of deltas
192 5d8553352d2e Changes to network protocol mpm@selenic.com parents: 155 diff changeset	789 chain = None
5d8553352d2e Changes to network protocol mpm@selenic.com parents: 155 diff changeset	790 for chunk in revs:
5d8553352d2e Changes to network protocol mpm@selenic.com parents: 155 diff changeset	791 node, p1, p2, cs = struct.unpack("20s20s20s20s", chunk[:80])
94 7daef883134f Refactor merge code mpm@selenic.com parents: 86 diff changeset	792 link = linkmapper(cs)
77 bed15e766511 Fix bug in lazymap code mpm@selenic.com parents: 76 diff changeset	793 if node in self.nodemap:
224 ccbcc4d76f81 fix bad assumption about uniqueness of file versions mpm@selenic.com parents: 221 diff changeset	794 # 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	795 # 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	796 # 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	797 chain = node
224 ccbcc4d76f81 fix bad assumption about uniqueness of file versions mpm@selenic.com parents: 221 diff changeset	798 continue
192 5d8553352d2e Changes to network protocol mpm@selenic.com parents: 155 diff changeset	799 delta = chunk[80:]
5d8553352d2e Changes to network protocol mpm@selenic.com parents: 155 diff changeset	800
1509 46a07392cf28 Add safety check for addgroup Matt Mackall <mpm@selenic.com> parents: 1494 diff changeset	801 for p in (p1, p2):
46a07392cf28 Add safety check for addgroup Matt Mackall <mpm@selenic.com> parents: 1494 diff changeset	802 if not p in self.nodemap:
46a07392cf28 Add safety check for addgroup Matt Mackall <mpm@selenic.com> parents: 1494 diff changeset	803 raise RevlogError(_("unknown parent %s") % short(p1))
46a07392cf28 Add safety check for addgroup Matt Mackall <mpm@selenic.com> parents: 1494 diff changeset	804
192 5d8553352d2e Changes to network protocol mpm@selenic.com parents: 155 diff changeset	805 if not chain:
5d8553352d2e Changes to network protocol mpm@selenic.com parents: 155 diff changeset	806 # retrieve the parent revision of the delta chain
5d8553352d2e Changes to network protocol mpm@selenic.com parents: 155 diff changeset	807 chain = p1
5d8553352d2e Changes to network protocol mpm@selenic.com parents: 155 diff changeset	808 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	809 raise RevlogError(_("unknown base %s") % short(chain[:4]))
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	810
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	811 # full versions are inserted when the needed deltas become
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	812 # comparable to the uncompressed text or when the previous
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	813 # version is not the one we have a delta against. We use
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	814 # the size of the previous full rev as a proxy for the
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	815 # current size.
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	816
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	817 if chain == prev:
1533 3d11f81c9145 Reduce string duplication in compression code mason@suse.com parents: 1509 diff changeset	818 tempd = compress(delta)
3d11f81c9145 Reduce string duplication in compression code mason@suse.com parents: 1509 diff changeset	819 cdelta = tempd[0] + tempd[1]
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	820
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	821 if chain != prev or (end - start + len(cdelta)) > measure * 2:
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	822 # flush our writes here so we can read it in revision
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	823 dfh.flush()
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	824 ifh.flush()
65 d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	825 text = self.revision(chain)
73 ee1cbe841e01 Change revlog to use new patch code mpm@selenic.com parents: 71 diff changeset	826 text = self.patches(text, [delta])
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	827 chk = self.addrevision(text, transaction, link, p1, p2)
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	828 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	829 raise RevlogError(_("consistency error adding group"))
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	830 measure = len(text)
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	831 else:
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	832 e = (end, len(cdelta), self.base(t), link, p1, p2, node)
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	833 self.index.append(e)
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	834 self.nodemap[node] = r
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	835 dfh.write(cdelta)
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	836 ifh.write(struct.pack(indexformat, *e))
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	837
65 d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	838 t, r, chain, prev = r, r + 1, node, node
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	839 start = self.start(self.base(t))
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	840 end = self.end(t)
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	841
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	842 dfh.close()
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	843 ifh.close()
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	844 return node
1493 1a216cb4ee64 verify: add check for mismatch of index and data length Matt Mackall <mpm@selenic.com> parents: 1469 diff changeset	845
1535 7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	846 def strip(self, rev, minlink):
7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	847 if self.count() == 0 or rev >= self.count():
7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	848 return
7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	849
7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	850 # 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	851 # does not actually belong to an older changeset.
7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	852 # The minlink parameter defines the oldest revision
7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	853 # we're allowed to strip away.
7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	854 while minlink > self.index[rev][3]:
7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	855 rev += 1
7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	856 if rev >= self.count():
7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	857 return
7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	858
7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	859 # first truncate the files on disk
7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	860 end = self.start(rev)
7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	861 self.opener(self.datafile, "a").truncate(end)
7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	862 end = rev * struct.calcsize(indexformat)
7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	863 self.opener(self.indexfile, "a").truncate(end)
7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	864
7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	865 # 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	866 self.cache = None
7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	867 for p in self.index[rev:]:
7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	868 del self.nodemap[p[6]]
7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	869 del self.index[rev:]
7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	870
7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	871 # truncating the lazyindex also truncates the lazymap.
7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	872 if isinstance(self.index, lazyindex):
7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	873 self.index.trunc(end)
7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	874
7ae0ce7a3dc4 Add revlog.strip to truncate away revisions. mason@suse.com parents: 1533 diff changeset	875
1493 1a216cb4ee64 verify: add check for mismatch of index and data length Matt Mackall <mpm@selenic.com> parents: 1469 diff changeset	876 def checksize(self):
1a216cb4ee64 verify: add check for mismatch of index and data length Matt Mackall <mpm@selenic.com> parents: 1469 diff changeset	877 expected = 0
1a216cb4ee64 verify: add check for mismatch of index and data length Matt Mackall <mpm@selenic.com> parents: 1469 diff changeset	878 if self.count():
1a216cb4ee64 verify: add check for mismatch of index and data length Matt Mackall <mpm@selenic.com> parents: 1469 diff changeset	879 expected = self.end(self.count() - 1)
1494 249ca10d37f4 Handle empty logs in repo.checksize Matt Mackall <mpm@selenic.com> parents: 1493 diff changeset	880 try:
249ca10d37f4 Handle empty logs in repo.checksize Matt Mackall <mpm@selenic.com> parents: 1493 diff changeset	881 f = self.opener(self.datafile)
249ca10d37f4 Handle empty logs in repo.checksize Matt Mackall <mpm@selenic.com> parents: 1493 diff changeset	882 f.seek(0, 2)
249ca10d37f4 Handle empty logs in repo.checksize Matt Mackall <mpm@selenic.com> parents: 1493 diff changeset	883 actual = f.tell()
249ca10d37f4 Handle empty logs in repo.checksize Matt Mackall <mpm@selenic.com> parents: 1493 diff changeset	884 return expected - actual
249ca10d37f4 Handle empty logs in repo.checksize Matt Mackall <mpm@selenic.com> parents: 1493 diff changeset	885 except IOError, inst:
249ca10d37f4 Handle empty logs in repo.checksize Matt Mackall <mpm@selenic.com> parents: 1493 diff changeset	886 if inst.errno == errno.ENOENT:
249ca10d37f4 Handle empty logs in repo.checksize Matt Mackall <mpm@selenic.com> parents: 1493 diff changeset	887 return 0
249ca10d37f4 Handle empty logs in repo.checksize Matt Mackall <mpm@selenic.com> parents: 1493 diff changeset	888 raise
249ca10d37f4 Handle empty logs in repo.checksize Matt Mackall <mpm@selenic.com> parents: 1493 diff changeset	889
249ca10d37f4 Handle empty logs in repo.checksize Matt Mackall <mpm@selenic.com> parents: 1493 diff changeset	890

Mercurial > hg > mercurial-crew-with-dirclash

annotate mercurial/revlog.py @ 1535:7ae0ce7a3dc4