Mercurial > hg > mercurial-crew-with-dirclash
annotate mercurial/revlog.py @ 1089:142b5d5ec9cc
Break apart hg.py
- move the various parts of hg.py into their own files
- create node.py to store node manipulation functions
| author | mpm@selenic.com |
|---|---|
| date | Sat, 27 Aug 2005 14:21:25 -0700 |
| parents | 30974cf73435 |
| children | d62130f99a73 |
| rev | line source |
|---|---|
| 1083 | 1 """ |
| 2 revlog.py - storage back-end for mercurial | |
| 3 | |
| 4 This provides efficient delta storage with O(1) retrieve and append | |
| 5 and O(changes) merge between branches | |
| 6 | |
| 7 Copyright 2005 Matt Mackall <mpm@selenic.com> | |
| 8 | |
| 9 This software may be used and distributed according to the terms | |
| 10 of the GNU General Public License, incorporated herein by reference. | |
| 11 """ | |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
12 |
| 208 | 13 import zlib, struct, sha, binascii, heapq |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
14 from mercurial import mdiff |
| 1089 | 15 from node import * |
|
36
da28286bf6b7
Add smart node lookup by substring or by rev number
mpm@selenic.com
parents:
26
diff
changeset
|
16 |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
17 def compress(text): |
| 1083 | 18 """ generate a possibly-compressed representation of text """ |
| 112 | 19 if not text: return text |
| 20 if len(text) < 44: | |
| 21 if text[0] == '\0': return text | |
| 22 return 'u' + text | |
| 23 bin = zlib.compress(text) | |
| 24 if len(bin) > len(text): | |
| 25 if text[0] == '\0': return text | |
| 26 return 'u' + text | |
| 27 return bin | |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
28 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
29 def decompress(bin): |
| 1083 | 30 """ decompress the given input """ |
| 112 | 31 if not bin: return bin |
| 32 t = bin[0] | |
| 33 if t == '\0': return bin | |
| 34 if t == 'x': return zlib.decompress(bin) | |
| 35 if t == 'u': return bin[1:] | |
|
1073
7b35a980b982
[PATCH] raise exceptions with Exception subclasses
Bart Trojanowski <bart@jukie.net>
parents:
1062
diff
changeset
|
36 raise RevlogError("unknown compression type %s" % t) |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
37 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
38 indexformat = ">4l20s20s20s" |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
39 |
|
76
d993ebd69d28
Add lazy{parser,index,map} to speed up processing of index files
mpm@selenic.com
parents:
73
diff
changeset
|
40 class lazyparser: |
| 1083 | 41 """ |
| 42 this class avoids the need to parse the entirety of large indices | |
| 43 | |
| 44 By default we parse and load 1000 entries at a time. | |
| 45 | |
| 46 If no position is specified, we load the whole index, and replace | |
| 47 the lazy objects in revlog with the underlying objects for | |
| 48 efficiency in cases where we look at most of the nodes. | |
| 49 """ | |
| 323 | 50 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
|
51 self.data = data |
|
d993ebd69d28
Add lazy{parser,index,map} to speed up processing of index files
mpm@selenic.com
parents:
73
diff
changeset
|
52 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
|
53 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
|
54 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
|
55 self.map = {nullid: -1} |
| 323 | 56 self.all = 0 |
| 57 self.revlog = revlog | |
|
76
d993ebd69d28
Add lazy{parser,index,map} to speed up processing of index files
mpm@selenic.com
parents:
73
diff
changeset
|
58 |
| 323 | 59 def load(self, pos=None): |
| 60 if self.all: return | |
| 61 if pos is not None: | |
| 62 block = pos / 1000 | |
| 63 i = block * 1000 | |
| 64 end = min(self.l, i + 1000) | |
| 65 else: | |
| 66 self.all = 1 | |
| 67 i = 0 | |
| 68 end = self.l | |
| 69 self.revlog.index = self.index | |
| 70 self.revlog.nodemap = self.map | |
| 515 | 71 |
|
76
d993ebd69d28
Add lazy{parser,index,map} to speed up processing of index files
mpm@selenic.com
parents:
73
diff
changeset
|
72 while i < end: |
|
d993ebd69d28
Add lazy{parser,index,map} to speed up processing of index files
mpm@selenic.com
parents:
73
diff
changeset
|
73 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
|
74 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
|
75 self.index[i] = e |
|
d993ebd69d28
Add lazy{parser,index,map} to speed up processing of index files
mpm@selenic.com
parents:
73
diff
changeset
|
76 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
|
77 i += 1 |
| 515 | 78 |
|
76
d993ebd69d28
Add lazy{parser,index,map} to speed up processing of index files
mpm@selenic.com
parents:
73
diff
changeset
|
79 class lazyindex: |
| 1083 | 80 """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
|
81 def __init__(self, parser): |
|
d993ebd69d28
Add lazy{parser,index,map} to speed up processing of index files
mpm@selenic.com
parents:
73
diff
changeset
|
82 self.p = parser |
|
d993ebd69d28
Add lazy{parser,index,map} to speed up processing of index files
mpm@selenic.com
parents:
73
diff
changeset
|
83 def __len__(self): |
|
d993ebd69d28
Add lazy{parser,index,map} to speed up processing of index files
mpm@selenic.com
parents:
73
diff
changeset
|
84 return len(self.p.index) |
| 115 | 85 def load(self, pos): |
| 86 self.p.load(pos) | |
| 87 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
|
88 def __getitem__(self, pos): |
| 115 | 89 return self.p.index[pos] or self.load(pos) |
|
76
d993ebd69d28
Add lazy{parser,index,map} to speed up processing of index files
mpm@selenic.com
parents:
73
diff
changeset
|
90 def append(self, e): |
|
d993ebd69d28
Add lazy{parser,index,map} to speed up processing of index files
mpm@selenic.com
parents:
73
diff
changeset
|
91 self.p.index.append(e) |
| 515 | 92 |
|
76
d993ebd69d28
Add lazy{parser,index,map} to speed up processing of index files
mpm@selenic.com
parents:
73
diff
changeset
|
93 class lazymap: |
| 1083 | 94 """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
|
95 def __init__(self, parser): |
|
d993ebd69d28
Add lazy{parser,index,map} to speed up processing of index files
mpm@selenic.com
parents:
73
diff
changeset
|
96 self.p = parser |
|
d993ebd69d28
Add lazy{parser,index,map} to speed up processing of index files
mpm@selenic.com
parents:
73
diff
changeset
|
97 def load(self, key): |
| 323 | 98 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
|
99 n = self.p.data.find(key) |
|
86
1b945e8ba67b
Friendlier exceptions for unknown node errors
mpm@selenic.com
parents:
84
diff
changeset
|
100 if n < 0: 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
|
101 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
|
102 self.p.load(pos) |
|
d993ebd69d28
Add lazy{parser,index,map} to speed up processing of index files
mpm@selenic.com
parents:
73
diff
changeset
|
103 def __contains__(self, key): |
| 323 | 104 self.p.load() |
| 105 return key in self.p.map | |
| 97 | 106 def __iter__(self): |
| 469 | 107 yield nullid |
| 97 | 108 for i in xrange(self.p.l): |
| 109 try: | |
| 110 yield self.p.index[i][6] | |
| 111 except: | |
| 112 self.p.load(i) | |
| 113 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
|
114 def __getitem__(self, key): |
|
d993ebd69d28
Add lazy{parser,index,map} to speed up processing of index files
mpm@selenic.com
parents:
73
diff
changeset
|
115 try: |
|
d993ebd69d28
Add lazy{parser,index,map} to speed up processing of index files
mpm@selenic.com
parents:
73
diff
changeset
|
116 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
|
117 except KeyError: |
|
86
1b945e8ba67b
Friendlier exceptions for unknown node errors
mpm@selenic.com
parents:
84
diff
changeset
|
118 try: |
|
1b945e8ba67b
Friendlier exceptions for unknown node errors
mpm@selenic.com
parents:
84
diff
changeset
|
119 self.load(key) |
|
1b945e8ba67b
Friendlier exceptions for unknown node errors
mpm@selenic.com
parents:
84
diff
changeset
|
120 return self.p.map[key] |
|
1b945e8ba67b
Friendlier exceptions for unknown node errors
mpm@selenic.com
parents:
84
diff
changeset
|
121 except KeyError: |
|
1b945e8ba67b
Friendlier exceptions for unknown node errors
mpm@selenic.com
parents:
84
diff
changeset
|
122 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
|
123 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
|
124 self.p.map[key] = val |
|
d993ebd69d28
Add lazy{parser,index,map} to speed up processing of index files
mpm@selenic.com
parents:
73
diff
changeset
|
125 |
|
1073
7b35a980b982
[PATCH] raise exceptions with Exception subclasses
Bart Trojanowski <bart@jukie.net>
parents:
1062
diff
changeset
|
126 class RevlogError(Exception): pass |
|
7b35a980b982
[PATCH] raise exceptions with Exception subclasses
Bart Trojanowski <bart@jukie.net>
parents:
1062
diff
changeset
|
127 |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
128 class revlog: |
| 1083 | 129 """ |
| 130 the underlying revision storage object | |
| 131 | |
| 132 A revlog consists of two parts, an index and the revision data. | |
| 133 | |
| 134 The index is a file with a fixed record size containing | |
| 135 information on each revision, includings its nodeid (hash), the | |
| 136 nodeids of its parents, the position and offset of its data within | |
| 137 the data file, and the revision it's based on. Finally, each entry | |
| 138 contains a linkrev entry that can serve as a pointer to external | |
| 139 data. | |
| 140 | |
| 141 The revision data itself is a linear collection of data chunks. | |
| 142 Each chunk represents a revision and is usually represented as a | |
| 143 delta against the previous chunk. To bound lookup time, runs of | |
| 144 deltas are limited to about 2 times the length of the original | |
| 145 version data. This makes retrieval of a version proportional to | |
| 146 its size, or O(1) relative to the number of revisions. | |
| 147 | |
| 148 Both pieces of the revlog are written to in an append-only | |
| 149 fashion, which means we never need to rewrite a file to insert or | |
| 150 remove data, and can use some simple techniques to avoid the need | |
| 151 for locking while reading. | |
| 152 """ | |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
153 def __init__(self, opener, indexfile, datafile): |
| 1083 | 154 """ |
| 155 create a revlog object | |
| 156 | |
| 157 opener is a function that abstracts the file opening operation | |
| 158 and can be used to implement COW semantics or the like. | |
| 159 """ | |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
160 self.indexfile = indexfile |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
161 self.datafile = datafile |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
162 self.opener = opener |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
163 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
|
164 |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
165 try: |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
166 i = self.opener(self.indexfile).read() |
| 73 | 167 except IOError: |
|
76
d993ebd69d28
Add lazy{parser,index,map} to speed up processing of index files
mpm@selenic.com
parents:
73
diff
changeset
|
168 i = "" |
|
116
e484cd5ec282
Only use lazy indexing for big indices and avoid the overhead of the
mpm@selenic.com
parents:
115
diff
changeset
|
169 |
|
e484cd5ec282
Only use lazy indexing for big indices and avoid the overhead of the
mpm@selenic.com
parents:
115
diff
changeset
|
170 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
|
171 # big index, let's parse it on demand |
| 323 | 172 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
|
173 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
|
174 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
|
175 else: |
|
e484cd5ec282
Only use lazy indexing for big indices and avoid the overhead of the
mpm@selenic.com
parents:
115
diff
changeset
|
176 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
|
177 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
|
178 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
|
179 m = [None] * l |
|
e484cd5ec282
Only use lazy indexing for big indices and avoid the overhead of the
mpm@selenic.com
parents:
115
diff
changeset
|
180 |
|
e484cd5ec282
Only use lazy indexing for big indices and avoid the overhead of the
mpm@selenic.com
parents:
115
diff
changeset
|
181 n = 0 |
|
e484cd5ec282
Only use lazy indexing for big indices and avoid the overhead of the
mpm@selenic.com
parents:
115
diff
changeset
|
182 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
|
183 # 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
|
184 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
|
185 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
|
186 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
|
187 n += 1 |
|
e484cd5ec282
Only use lazy indexing for big indices and avoid the overhead of the
mpm@selenic.com
parents:
115
diff
changeset
|
188 |
|
e484cd5ec282
Only use lazy indexing for big indices and avoid the overhead of the
mpm@selenic.com
parents:
115
diff
changeset
|
189 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
|
190 self.nodemap[nullid] = -1 |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
191 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
192 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
|
193 def count(self): return len(self.index) |
| 26 | 194 def node(self, rev): return (rev < 0) and nullid or self.index[rev][6] |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
195 def rev(self, node): return self.nodemap[node] |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
196 def linkrev(self, node): return self.index[self.nodemap[node]][3] |
| 2 | 197 def parents(self, node): |
| 198 if node == nullid: return (nullid, nullid) | |
| 199 return self.index[self.nodemap[node]][4:6] | |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
200 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
201 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
|
202 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
|
203 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
|
204 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
|
205 |
|
1074
55bf5cfde69e
Add revlog.reachable to find a graph of ancestors for a given rev
mason@suse.com
parents:
1073
diff
changeset
|
206 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
|
207 reachable = {} |
|
55bf5cfde69e
Add revlog.reachable to find a graph of ancestors for a given rev
mason@suse.com
parents:
1073
diff
changeset
|
208 visit = [rev] |
|
55bf5cfde69e
Add revlog.reachable to find a graph of ancestors for a given rev
mason@suse.com
parents:
1073
diff
changeset
|
209 reachable[rev] = 1 |
|
55bf5cfde69e
Add revlog.reachable to find a graph of ancestors for a given rev
mason@suse.com
parents:
1073
diff
changeset
|
210 if stop: |
|
55bf5cfde69e
Add revlog.reachable to find a graph of ancestors for a given rev
mason@suse.com
parents:
1073
diff
changeset
|
211 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
|
212 else: |
|
55bf5cfde69e
Add revlog.reachable to find a graph of ancestors for a given rev
mason@suse.com
parents:
1073
diff
changeset
|
213 stopn = 0 |
|
55bf5cfde69e
Add revlog.reachable to find a graph of ancestors for a given rev
mason@suse.com
parents:
1073
diff
changeset
|
214 while visit: |
|
55bf5cfde69e
Add revlog.reachable to find a graph of ancestors for a given rev
mason@suse.com
parents:
1073
diff
changeset
|
215 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
|
216 if n == stop: |
|
55bf5cfde69e
Add revlog.reachable to find a graph of ancestors for a given rev
mason@suse.com
parents:
1073
diff
changeset
|
217 continue |
|
55bf5cfde69e
Add revlog.reachable to find a graph of ancestors for a given rev
mason@suse.com
parents:
1073
diff
changeset
|
218 if n == nullid: |
|
55bf5cfde69e
Add revlog.reachable to find a graph of ancestors for a given rev
mason@suse.com
parents:
1073
diff
changeset
|
219 continue |
|
55bf5cfde69e
Add revlog.reachable to find a graph of ancestors for a given rev
mason@suse.com
parents:
1073
diff
changeset
|
220 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
|
221 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
|
222 continue |
|
55bf5cfde69e
Add revlog.reachable to find a graph of ancestors for a given rev
mason@suse.com
parents:
1073
diff
changeset
|
223 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
|
224 reachable[p] = 1 |
|
55bf5cfde69e
Add revlog.reachable to find a graph of ancestors for a given rev
mason@suse.com
parents:
1073
diff
changeset
|
225 visit.append(p) |
|
55bf5cfde69e
Add revlog.reachable to find a graph of ancestors for a given rev
mason@suse.com
parents:
1073
diff
changeset
|
226 return reachable |
|
55bf5cfde69e
Add revlog.reachable to find a graph of ancestors for a given rev
mason@suse.com
parents:
1073
diff
changeset
|
227 |
| 902 | 228 def heads(self, stop=None): |
| 1083 | 229 """return the list of all nodes that have no children""" |
| 221 | 230 p = {} |
| 231 h = [] | |
| 902 | 232 stoprev = 0 |
| 233 if stop and stop in self.nodemap: | |
| 234 stoprev = self.rev(stop) | |
| 1083 | 235 |
| 243 | 236 for r in range(self.count() - 1, -1, -1): |
| 221 | 237 n = self.node(r) |
| 238 if n not in p: | |
| 239 h.append(n) | |
| 902 | 240 if n == stop: |
| 241 break | |
| 242 if r < stoprev: | |
| 243 break | |
| 221 | 244 for pn in self.parents(n): |
| 245 p[pn] = 1 | |
| 246 return h | |
| 370 | 247 |
| 248 def children(self, node): | |
| 1083 | 249 """find the children of a given node""" |
| 370 | 250 c = [] |
| 251 p = self.rev(node) | |
| 252 for r in range(p + 1, self.count()): | |
| 253 n = self.node(r) | |
| 254 for pn in self.parents(n): | |
|
854
473c030d34a6
Fixed revlog.children.
Tristan Wibberley <tristan@wibberley.org>
parents:
655
diff
changeset
|
255 if pn == node: |
|
473c030d34a6
Fixed revlog.children.
Tristan Wibberley <tristan@wibberley.org>
parents:
655
diff
changeset
|
256 c.append(n) |
| 370 | 257 continue |
| 258 elif pn == nullid: | |
| 259 continue | |
| 260 return c | |
| 515 | 261 |
|
36
da28286bf6b7
Add smart node lookup by substring or by rev number
mpm@selenic.com
parents:
26
diff
changeset
|
262 def lookup(self, id): |
| 1083 | 263 """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
|
264 try: |
|
da28286bf6b7
Add smart node lookup by substring or by rev number
mpm@selenic.com
parents:
26
diff
changeset
|
265 rev = int(id) |
| 469 | 266 if str(rev) != id: raise ValueError |
| 267 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
|
268 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
|
269 return self.node(rev) |
| 469 | 270 except (ValueError, OverflowError): |
|
36
da28286bf6b7
Add smart node lookup by substring or by rev number
mpm@selenic.com
parents:
26
diff
changeset
|
271 c = [] |
|
da28286bf6b7
Add smart node lookup by substring or by rev number
mpm@selenic.com
parents:
26
diff
changeset
|
272 for n in self.nodemap: |
| 469 | 273 if hex(n).startswith(id): |
|
36
da28286bf6b7
Add smart node lookup by substring or by rev number
mpm@selenic.com
parents:
26
diff
changeset
|
274 c.append(n) |
|
da28286bf6b7
Add smart node lookup by substring or by rev number
mpm@selenic.com
parents:
26
diff
changeset
|
275 if len(c) > 1: raise KeyError("Ambiguous identifier") |
| 67 | 276 if len(c) < 1: raise KeyError("No match found") |
|
36
da28286bf6b7
Add smart node lookup by substring or by rev number
mpm@selenic.com
parents:
26
diff
changeset
|
277 return c[0] |
| 515 | 278 |
|
36
da28286bf6b7
Add smart node lookup by substring or by rev number
mpm@selenic.com
parents:
26
diff
changeset
|
279 return None |
|
da28286bf6b7
Add smart node lookup by substring or by rev number
mpm@selenic.com
parents:
26
diff
changeset
|
280 |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
281 def diff(self, a, b): |
| 1083 | 282 """return a delta between two revisions""" |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
283 return mdiff.textdiff(a, b) |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
284 |
| 73 | 285 def patches(self, t, pl): |
| 1083 | 286 """apply a list of patches to a string""" |
| 73 | 287 return mdiff.patches(t, pl) |
| 288 | |
|
119
c7a66f9752a4
Add code to retrieve or construct a revlog delta
mpm@selenic.com
parents:
117
diff
changeset
|
289 def delta(self, node): |
| 1083 | 290 """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
|
291 r = self.rev(node) |
|
c7a66f9752a4
Add code to retrieve or construct a revlog delta
mpm@selenic.com
parents:
117
diff
changeset
|
292 b = self.base(r) |
|
c7a66f9752a4
Add code to retrieve or construct a revlog delta
mpm@selenic.com
parents:
117
diff
changeset
|
293 if r == b: |
|
c7a66f9752a4
Add code to retrieve or construct a revlog delta
mpm@selenic.com
parents:
117
diff
changeset
|
294 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
|
295 self.revision(node)) |
|
c7a66f9752a4
Add code to retrieve or construct a revlog delta
mpm@selenic.com
parents:
117
diff
changeset
|
296 else: |
|
c7a66f9752a4
Add code to retrieve or construct a revlog delta
mpm@selenic.com
parents:
117
diff
changeset
|
297 f = self.opener(self.datafile) |
|
c7a66f9752a4
Add code to retrieve or construct a revlog delta
mpm@selenic.com
parents:
117
diff
changeset
|
298 f.seek(self.start(r)) |
|
c7a66f9752a4
Add code to retrieve or construct a revlog delta
mpm@selenic.com
parents:
117
diff
changeset
|
299 data = f.read(self.length(r)) |
|
c7a66f9752a4
Add code to retrieve or construct a revlog delta
mpm@selenic.com
parents:
117
diff
changeset
|
300 return decompress(data) |
|
c7a66f9752a4
Add code to retrieve or construct a revlog delta
mpm@selenic.com
parents:
117
diff
changeset
|
301 |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
302 def revision(self, node): |
| 1083 | 303 """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
|
304 if node == nullid: return "" |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
305 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
|
306 |
| 1083 | 307 # look up what we need to read |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
308 text = None |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
309 rev = self.rev(node) |
| 117 | 310 start, length, base, link, p1, p2, node = self.index[rev] |
| 311 end = start + length | |
| 312 if base != rev: start = self.start(base) | |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
313 |
| 1083 | 314 # do we have useful data cached? |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
315 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
|
316 base = self.cache[1] |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
317 start = self.start(base + 1) |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
318 text = self.cache[2] |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
319 last = 0 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
320 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
321 f = self.opener(self.datafile) |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
322 f.seek(start) |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
323 data = f.read(end - start) |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
324 |
| 651 | 325 if text is None: |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
326 last = self.length(base) |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
327 text = decompress(data[:last]) |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
328 |
|
71
47c9a869adee
Add mdiff.patches to speed up applying thousands of patches to the manifest
mpm@selenic.com
parents:
67
diff
changeset
|
329 bins = [] |
| 64 | 330 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
|
331 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
|
332 bins.append(decompress(data[last:last + s])) |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
333 last = last + s |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
334 |
|
71
47c9a869adee
Add mdiff.patches to speed up applying thousands of patches to the manifest
mpm@selenic.com
parents:
67
diff
changeset
|
335 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
|
336 |
| 26 | 337 if node != hash(text, p1, p2): |
| 98 | 338 raise IOError("integrity check failed on %s:%d" |
| 339 % (self.datafile, rev)) | |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
340 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
341 self.cache = (node, rev, text) |
| 515 | 342 return text |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
343 |
| 644 | 344 def addrevision(self, text, transaction, link, p1=None, p2=None, d=None): |
| 1083 | 345 """add a revision to the log |
| 346 | |
| 347 text - the revision data to add | |
| 348 transaction - the transaction object used for rollback | |
| 349 link - the linkrev data to add | |
| 350 p1, p2 - the parent nodeids of the revision | |
| 351 d - an optional precomputed delta | |
| 352 """ | |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
353 if text is None: text = "" |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
354 if p1 is None: p1 = self.tip() |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
355 if p2 is None: p2 = nullid |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
356 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
357 node = hash(text, p1, p2) |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
358 |
| 301 | 359 if node in self.nodemap: |
| 360 return node | |
| 361 | |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
362 n = self.count() |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
363 t = n - 1 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
364 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
365 if n: |
| 64 | 366 base = self.base(t) |
| 367 start = self.start(base) | |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
368 end = self.end(t) |
| 644 | 369 if not d: |
| 370 prev = self.revision(self.tip()) | |
| 371 d = self.diff(prev, text) | |
| 98 | 372 data = compress(d) |
| 64 | 373 dist = end - start + len(data) |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
374 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
375 # full versions are inserted when the needed deltas |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
376 # become comparable to the uncompressed text |
| 64 | 377 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
|
378 data = compress(text) |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
379 base = n |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
380 else: |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
381 base = self.base(t) |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
382 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
383 offset = 0 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
384 if t >= 0: |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
385 offset = self.end(t) |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
386 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
387 e = (offset, len(data), base, link, p1, p2, node) |
| 515 | 388 |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
389 self.index.append(e) |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
390 self.nodemap[node] = n |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
391 entry = struct.pack(indexformat, *e) |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
392 |
| 26 | 393 transaction.add(self.datafile, e[0]) |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
394 self.opener(self.datafile, "a").write(data) |
| 41 | 395 transaction.add(self.indexfile, n * len(entry)) |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
396 self.opener(self.indexfile, "a").write(entry) |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
397 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
398 self.cache = (node, n, text) |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
399 return node |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
400 |
|
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
401 def ancestor(self, a, b): |
| 1083 | 402 """calculate the least common ancestor of nodes a and b""" |
| 147 | 403 # calculate the distance of every node from root |
| 404 dist = {nullid: 0} | |
| 405 for i in xrange(self.count()): | |
| 406 n = self.node(i) | |
| 407 p1, p2 = self.parents(n) | |
| 408 dist[n] = max(dist[p1], dist[p2]) + 1 | |
| 515 | 409 |
| 147 | 410 # traverse ancestors in order of decreasing distance from root |
| 411 def ancestors(node): | |
| 412 # we store negative distances because heap returns smallest member | |
| 413 h = [(-dist[node], node)] | |
| 414 seen = {} | |
| 415 earliest = self.count() | |
| 416 while h: | |
| 417 d, n = heapq.heappop(h) | |
| 418 if n not in seen: | |
| 419 seen[n] = 1 | |
| 381 | 420 r = self.rev(n) |
| 421 yield (-d, r, n) | |
| 147 | 422 for p in self.parents(n): |
| 423 heapq.heappush(h, (-dist[p], p)) | |
|
45
f2b2d5daec30
Fix recursion depth trouble with ancestor algorithm
mpm@selenic.com
parents:
41
diff
changeset
|
424 |
| 147 | 425 x = ancestors(a) |
| 426 y = ancestors(b) | |
| 427 lx = x.next() | |
| 428 ly = y.next() | |
|
45
f2b2d5daec30
Fix recursion depth trouble with ancestor algorithm
mpm@selenic.com
parents:
41
diff
changeset
|
429 |
| 147 | 430 # increment each ancestor list until it is closer to root than |
| 431 # the other, or they match | |
| 432 while 1: | |
| 433 if lx == ly: | |
| 381 | 434 return lx[2] |
| 147 | 435 elif lx < ly: |
| 436 ly = y.next() | |
| 437 elif lx > ly: | |
| 438 lx = x.next() | |
|
0
9117c6561b0b
Add back links from file revisions to changeset revisions
mpm@selenic.com
parents:
diff
changeset
|
439 |
| 46 | 440 def group(self, linkmap): |
| 1083 | 441 """calculate a delta group |
| 46 | 442 |
| 1083 | 443 Given a list of changeset revs, return a set of deltas and |
| 444 metadata corresponding to nodes. the first delta is | |
| 445 parent(nodes[0]) -> nodes[0] the receiver is guaranteed to | |
| 446 have this parent as it has all history before these | |
| 447 changesets. parent is parent[0] | |
| 448 """ | |
| 46 | 449 revs = [] |
| 450 needed = {} | |
| 451 | |
| 452 # find file nodes/revs that match changeset revs | |
| 453 for i in xrange(0, self.count()): | |
| 454 if self.index[i][3] in linkmap: | |
| 455 revs.append(i) | |
| 456 needed[i] = 1 | |
| 457 | |
| 458 # if we don't have any revisions touched by these changesets, bail | |
| 192 | 459 if not revs: |
| 460 yield struct.pack(">l", 0) | |
| 461 return | |
| 46 | 462 |
| 463 # add the parent of the first rev | |
| 464 p = self.parents(self.node(revs[0]))[0] | |
| 465 revs.insert(0, self.rev(p)) | |
| 466 | |
| 467 # for each delta that isn't contiguous in the log, we need to | |
| 468 # reconstruct the base, reconstruct the result, and then | |
| 469 # calculate the delta. We also need to do this where we've | |
| 470 # stored a full version and not a delta | |
| 471 for i in xrange(0, len(revs) - 1): | |
| 472 a, b = revs[i], revs[i + 1] | |
| 473 if a + 1 != b or self.base(b) == b: | |
| 474 for j in xrange(self.base(a), a + 1): | |
| 475 needed[j] = 1 | |
| 476 for j in xrange(self.base(b), b + 1): | |
| 477 needed[j] = 1 | |
| 478 | |
| 479 # calculate spans to retrieve from datafile | |
| 480 needed = needed.keys() | |
| 481 needed.sort() | |
| 482 spans = [] | |
| 192 | 483 oo = -1 |
| 484 ol = 0 | |
| 46 | 485 for n in needed: |
| 486 if n < 0: continue | |
| 487 o = self.start(n) | |
| 488 l = self.length(n) | |
| 192 | 489 if oo + ol == o: # can we merge with the previous? |
| 490 nl = spans[-1][2] | |
| 491 nl.append((n, l)) | |
| 492 ol += l | |
| 493 spans[-1] = (oo, ol, nl) | |
| 46 | 494 else: |
| 192 | 495 oo = o |
| 496 ol = l | |
| 497 spans.append((oo, ol, [(n, l)])) | |
| 46 | 498 |
| 499 # read spans in, divide up chunks | |
| 500 chunks = {} | |
| 192 | 501 for span in spans: |
| 46 | 502 # we reopen the file for each span to make http happy for now |
| 503 f = self.opener(self.datafile) | |
| 504 f.seek(span[0]) | |
| 505 data = f.read(span[1]) | |
| 506 | |
| 507 # divide up the span | |
| 508 pos = 0 | |
| 509 for r, l in span[2]: | |
| 192 | 510 chunks[r] = decompress(data[pos: pos + l]) |
| 46 | 511 pos += l |
| 512 | |
| 513 # helper to reconstruct intermediate versions | |
| 514 def construct(text, base, rev): | |
| 192 | 515 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
|
516 return mdiff.patches(text, bins) |
| 46 | 517 |
| 518 # build deltas | |
| 519 deltas = [] | |
|
71
47c9a869adee
Add mdiff.patches to speed up applying thousands of patches to the manifest
mpm@selenic.com
parents:
67
diff
changeset
|
520 for d in xrange(0, len(revs) - 1): |
| 46 | 521 a, b = revs[d], revs[d + 1] |
| 522 n = self.node(b) | |
| 192 | 523 |
| 524 # do we need to construct a new delta? | |
| 46 | 525 if a + 1 != b or self.base(b) == b: |
| 526 if a >= 0: | |
| 527 base = self.base(a) | |
| 192 | 528 ta = chunks[self.base(a)] |
| 46 | 529 ta = construct(ta, base, a) |
| 530 else: | |
| 531 ta = "" | |
| 515 | 532 |
| 46 | 533 base = self.base(b) |
| 534 if a > base: | |
| 535 base = a | |
| 536 tb = ta | |
| 537 else: | |
| 192 | 538 tb = chunks[self.base(b)] |
| 46 | 539 tb = construct(tb, base, b) |
| 540 d = self.diff(ta, tb) | |
| 541 else: | |
| 192 | 542 d = chunks[b] |
| 46 | 543 |
| 544 p = self.parents(n) | |
| 545 meta = n + p[0] + p[1] + linkmap[self.linkrev(n)] | |
| 546 l = struct.pack(">l", len(meta) + len(d) + 4) | |
| 192 | 547 yield l |
| 548 yield meta | |
| 549 yield d | |
| 46 | 550 |
| 192 | 551 yield struct.pack(">l", 0) |
| 552 | |
| 1062 | 553 def addgroup(self, revs, linkmapper, transaction, unique=0): |
| 1083 | 554 """ |
| 555 add a delta group | |
| 46 | 556 |
| 1083 | 557 given a set of deltas, add them to the revision log. the |
| 558 first delta is against its parent, which should be in our | |
| 559 log, the rest are against the previous delta. | |
| 560 """ | |
| 561 | |
| 562 #track the base of the current delta log | |
| 46 | 563 r = self.count() |
| 564 t = r - 1 | |
| 192 | 565 node = nullid |
| 515 | 566 |
| 655 | 567 base = prev = -1 |
|
653
94cdd02792b5
Fix corruption resulting from skipping parts of a revision group
Matt Mackall <mpm@selenic.com>
parents:
651
diff
changeset
|
568 start = end = measure = 0 |
| 46 | 569 if r: |
| 570 start = self.start(self.base(t)) | |
| 571 end = self.end(t) | |
| 572 measure = self.length(self.base(t)) | |
| 573 base = self.base(t) | |
| 574 prev = self.tip() | |
| 575 | |
| 576 transaction.add(self.datafile, end) | |
| 577 transaction.add(self.indexfile, r * struct.calcsize(indexformat)) | |
| 578 dfh = self.opener(self.datafile, "a") | |
| 579 ifh = self.opener(self.indexfile, "a") | |
| 580 | |
| 581 # loop through our set of deltas | |
| 192 | 582 chain = None |
| 583 for chunk in revs: | |
| 584 node, p1, p2, cs = struct.unpack("20s20s20s20s", chunk[:80]) | |
| 94 | 585 link = linkmapper(cs) |
| 77 | 586 if node in self.nodemap: |
|
224
ccbcc4d76f81
fix bad assumption about uniqueness of file versions
mpm@selenic.com
parents:
221
diff
changeset
|
587 # this can happen if two branches make the same change |
|
ccbcc4d76f81
fix bad assumption about uniqueness of file versions
mpm@selenic.com
parents:
221
diff
changeset
|
588 if unique: |
|
1073
7b35a980b982
[PATCH] raise exceptions with Exception subclasses
Bart Trojanowski <bart@jukie.net>
parents:
1062
diff
changeset
|
589 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
|
590 chain = node |
|
224
ccbcc4d76f81
fix bad assumption about uniqueness of file versions
mpm@selenic.com
parents:
221
diff
changeset
|
591 continue |
| 192 | 592 delta = chunk[80:] |
| 593 | |
| 594 if not chain: | |
| 595 # retrieve the parent revision of the delta chain | |
| 596 chain = p1 | |
| 597 if not chain in self.nodemap: | |
|
1073
7b35a980b982
[PATCH] raise exceptions with Exception subclasses
Bart Trojanowski <bart@jukie.net>
parents:
1062
diff
changeset
|
598 raise RevlogError("unknown base %s" % short(chain[:4])) |
| 46 | 599 |
| 600 # full versions are inserted when the needed deltas become | |
| 601 # comparable to the uncompressed text or when the previous | |
| 602 # version is not the one we have a delta against. We use | |
| 603 # the size of the previous full rev as a proxy for the | |
| 604 # current size. | |
| 605 | |
| 606 if chain == prev: | |
| 607 cdelta = compress(delta) | |
| 608 | |
| 609 if chain != prev or (end - start + len(cdelta)) > measure * 2: | |
| 610 # flush our writes here so we can read it in revision | |
| 611 dfh.flush() | |
| 612 ifh.flush() | |
|
65
d40cc5aacc31
Fix up a bunch of bugs in the new merge code
mpm@selenic.com
parents:
64
diff
changeset
|
613 text = self.revision(chain) |
| 73 | 614 text = self.patches(text, [delta]) |
| 46 | 615 chk = self.addrevision(text, transaction, link, p1, p2) |
| 616 if chk != node: | |
|
1073
7b35a980b982
[PATCH] raise exceptions with Exception subclasses
Bart Trojanowski <bart@jukie.net>
parents:
1062
diff
changeset
|
617 raise RevlogError("consistency error adding group") |
| 46 | 618 measure = len(text) |
| 619 else: | |
| 620 e = (end, len(cdelta), self.base(t), link, p1, p2, node) | |
| 621 self.index.append(e) | |
| 622 self.nodemap[node] = r | |
| 623 dfh.write(cdelta) | |
| 624 ifh.write(struct.pack(indexformat, *e)) | |
| 625 | |
|
65
d40cc5aacc31
Fix up a bunch of bugs in the new merge code
mpm@selenic.com
parents:
64
diff
changeset
|
626 t, r, chain, prev = r, r + 1, node, node |
| 46 | 627 start = self.start(self.base(t)) |
| 628 end = self.end(t) | |
| 629 | |
| 630 dfh.close() | |
| 631 ifh.close() | |
| 632 return node |