Show More
@@ -1,547 +1,543 | |||
|
1 | 1 | # changelog.py - changelog class for mercurial |
|
2 | 2 | # |
|
3 | 3 | # Copyright 2005-2007 Matt Mackall <mpm@selenic.com> |
|
4 | 4 | # |
|
5 | 5 | # This software may be used and distributed according to the terms of the |
|
6 | 6 | # GNU General Public License version 2 or any later version. |
|
7 | 7 | |
|
8 | 8 | from __future__ import absolute_import |
|
9 | 9 | |
|
10 | 10 | import collections |
|
11 | 11 | |
|
12 | 12 | from .i18n import _ |
|
13 | 13 | from .node import ( |
|
14 | 14 | bin, |
|
15 | 15 | hex, |
|
16 | 16 | nullid, |
|
17 | wdirid, | |
|
18 | 17 | ) |
|
19 | 18 | |
|
20 | 19 | from . import ( |
|
21 | 20 | encoding, |
|
22 | 21 | error, |
|
23 | 22 | revlog, |
|
24 | 23 | util, |
|
25 | 24 | ) |
|
26 | 25 | |
|
27 | 26 | _defaultextra = {'branch': 'default'} |
|
28 | 27 | |
|
29 | 28 | def _string_escape(text): |
|
30 | 29 | """ |
|
31 | 30 | >>> d = {'nl': chr(10), 'bs': chr(92), 'cr': chr(13), 'nul': chr(0)} |
|
32 | 31 | >>> s = "ab%(nl)scd%(bs)s%(bs)sn%(nul)sab%(cr)scd%(bs)s%(nl)s" % d |
|
33 | 32 | >>> s |
|
34 | 33 | 'ab\\ncd\\\\\\\\n\\x00ab\\rcd\\\\\\n' |
|
35 | 34 | >>> res = _string_escape(s) |
|
36 | 35 | >>> s == util.unescapestr(res) |
|
37 | 36 | True |
|
38 | 37 | """ |
|
39 | 38 | # subset of the string_escape codec |
|
40 | 39 | text = text.replace('\\', '\\\\').replace('\n', '\\n').replace('\r', '\\r') |
|
41 | 40 | return text.replace('\0', '\\0') |
|
42 | 41 | |
|
43 | 42 | def decodeextra(text): |
|
44 | 43 | """ |
|
45 | 44 | >>> sorted(decodeextra(encodeextra({'foo': 'bar', 'baz': chr(0) + '2'}) |
|
46 | 45 | ... ).iteritems()) |
|
47 | 46 | [('baz', '\\x002'), ('branch', 'default'), ('foo', 'bar')] |
|
48 | 47 | >>> sorted(decodeextra(encodeextra({'foo': 'bar', |
|
49 | 48 | ... 'baz': chr(92) + chr(0) + '2'}) |
|
50 | 49 | ... ).iteritems()) |
|
51 | 50 | [('baz', '\\\\\\x002'), ('branch', 'default'), ('foo', 'bar')] |
|
52 | 51 | """ |
|
53 | 52 | extra = _defaultextra.copy() |
|
54 | 53 | for l in text.split('\0'): |
|
55 | 54 | if l: |
|
56 | 55 | if '\\0' in l: |
|
57 | 56 | # fix up \0 without getting into trouble with \\0 |
|
58 | 57 | l = l.replace('\\\\', '\\\\\n') |
|
59 | 58 | l = l.replace('\\0', '\0') |
|
60 | 59 | l = l.replace('\n', '') |
|
61 | 60 | k, v = util.unescapestr(l).split(':', 1) |
|
62 | 61 | extra[k] = v |
|
63 | 62 | return extra |
|
64 | 63 | |
|
65 | 64 | def encodeextra(d): |
|
66 | 65 | # keys must be sorted to produce a deterministic changelog entry |
|
67 | 66 | items = [_string_escape('%s:%s' % (k, d[k])) for k in sorted(d)] |
|
68 | 67 | return "\0".join(items) |
|
69 | 68 | |
|
70 | 69 | def stripdesc(desc): |
|
71 | 70 | """strip trailing whitespace and leading and trailing empty lines""" |
|
72 | 71 | return '\n'.join([l.rstrip() for l in desc.splitlines()]).strip('\n') |
|
73 | 72 | |
|
74 | 73 | class appender(object): |
|
75 | 74 | '''the changelog index must be updated last on disk, so we use this class |
|
76 | 75 | to delay writes to it''' |
|
77 | 76 | def __init__(self, vfs, name, mode, buf): |
|
78 | 77 | self.data = buf |
|
79 | 78 | fp = vfs(name, mode) |
|
80 | 79 | self.fp = fp |
|
81 | 80 | self.offset = fp.tell() |
|
82 | 81 | self.size = vfs.fstat(fp).st_size |
|
83 | 82 | self._end = self.size |
|
84 | 83 | |
|
85 | 84 | def end(self): |
|
86 | 85 | return self._end |
|
87 | 86 | def tell(self): |
|
88 | 87 | return self.offset |
|
89 | 88 | def flush(self): |
|
90 | 89 | pass |
|
91 | 90 | def close(self): |
|
92 | 91 | self.fp.close() |
|
93 | 92 | |
|
94 | 93 | def seek(self, offset, whence=0): |
|
95 | 94 | '''virtual file offset spans real file and data''' |
|
96 | 95 | if whence == 0: |
|
97 | 96 | self.offset = offset |
|
98 | 97 | elif whence == 1: |
|
99 | 98 | self.offset += offset |
|
100 | 99 | elif whence == 2: |
|
101 | 100 | self.offset = self.end() + offset |
|
102 | 101 | if self.offset < self.size: |
|
103 | 102 | self.fp.seek(self.offset) |
|
104 | 103 | |
|
105 | 104 | def read(self, count=-1): |
|
106 | 105 | '''only trick here is reads that span real file and data''' |
|
107 | 106 | ret = "" |
|
108 | 107 | if self.offset < self.size: |
|
109 | 108 | s = self.fp.read(count) |
|
110 | 109 | ret = s |
|
111 | 110 | self.offset += len(s) |
|
112 | 111 | if count > 0: |
|
113 | 112 | count -= len(s) |
|
114 | 113 | if count != 0: |
|
115 | 114 | doff = self.offset - self.size |
|
116 | 115 | self.data.insert(0, "".join(self.data)) |
|
117 | 116 | del self.data[1:] |
|
118 | 117 | s = self.data[0][doff:doff + count] |
|
119 | 118 | self.offset += len(s) |
|
120 | 119 | ret += s |
|
121 | 120 | return ret |
|
122 | 121 | |
|
123 | 122 | def write(self, s): |
|
124 | 123 | self.data.append(bytes(s)) |
|
125 | 124 | self.offset += len(s) |
|
126 | 125 | self._end += len(s) |
|
127 | 126 | |
|
128 | 127 | def _divertopener(opener, target): |
|
129 | 128 | """build an opener that writes in 'target.a' instead of 'target'""" |
|
130 | 129 | def _divert(name, mode='r', checkambig=False): |
|
131 | 130 | if name != target: |
|
132 | 131 | return opener(name, mode) |
|
133 | 132 | return opener(name + ".a", mode) |
|
134 | 133 | return _divert |
|
135 | 134 | |
|
136 | 135 | def _delayopener(opener, target, buf): |
|
137 | 136 | """build an opener that stores chunks in 'buf' instead of 'target'""" |
|
138 | 137 | def _delay(name, mode='r', checkambig=False): |
|
139 | 138 | if name != target: |
|
140 | 139 | return opener(name, mode) |
|
141 | 140 | return appender(opener, name, mode, buf) |
|
142 | 141 | return _delay |
|
143 | 142 | |
|
144 | 143 | _changelogrevision = collections.namedtuple(u'changelogrevision', |
|
145 | 144 | (u'manifest', u'user', u'date', |
|
146 | 145 | u'files', u'description', |
|
147 | 146 | u'extra')) |
|
148 | 147 | |
|
149 | 148 | class changelogrevision(object): |
|
150 | 149 | """Holds results of a parsed changelog revision. |
|
151 | 150 | |
|
152 | 151 | Changelog revisions consist of multiple pieces of data, including |
|
153 | 152 | the manifest node, user, and date. This object exposes a view into |
|
154 | 153 | the parsed object. |
|
155 | 154 | """ |
|
156 | 155 | |
|
157 | 156 | __slots__ = ( |
|
158 | 157 | u'_offsets', |
|
159 | 158 | u'_text', |
|
160 | 159 | ) |
|
161 | 160 | |
|
162 | 161 | def __new__(cls, text): |
|
163 | 162 | if not text: |
|
164 | 163 | return _changelogrevision( |
|
165 | 164 | manifest=nullid, |
|
166 | 165 | user='', |
|
167 | 166 | date=(0, 0), |
|
168 | 167 | files=[], |
|
169 | 168 | description='', |
|
170 | 169 | extra=_defaultextra, |
|
171 | 170 | ) |
|
172 | 171 | |
|
173 | 172 | self = super(changelogrevision, cls).__new__(cls) |
|
174 | 173 | # We could return here and implement the following as an __init__. |
|
175 | 174 | # But doing it here is equivalent and saves an extra function call. |
|
176 | 175 | |
|
177 | 176 | # format used: |
|
178 | 177 | # nodeid\n : manifest node in ascii |
|
179 | 178 | # user\n : user, no \n or \r allowed |
|
180 | 179 | # time tz extra\n : date (time is int or float, timezone is int) |
|
181 | 180 | # : extra is metadata, encoded and separated by '\0' |
|
182 | 181 | # : older versions ignore it |
|
183 | 182 | # files\n\n : files modified by the cset, no \n or \r allowed |
|
184 | 183 | # (.*) : comment (free text, ideally utf-8) |
|
185 | 184 | # |
|
186 | 185 | # changelog v0 doesn't use extra |
|
187 | 186 | |
|
188 | 187 | nl1 = text.index('\n') |
|
189 | 188 | nl2 = text.index('\n', nl1 + 1) |
|
190 | 189 | nl3 = text.index('\n', nl2 + 1) |
|
191 | 190 | |
|
192 | 191 | # The list of files may be empty. Which means nl3 is the first of the |
|
193 | 192 | # double newline that precedes the description. |
|
194 | 193 | if text[nl3 + 1:nl3 + 2] == '\n': |
|
195 | 194 | doublenl = nl3 |
|
196 | 195 | else: |
|
197 | 196 | doublenl = text.index('\n\n', nl3 + 1) |
|
198 | 197 | |
|
199 | 198 | self._offsets = (nl1, nl2, nl3, doublenl) |
|
200 | 199 | self._text = text |
|
201 | 200 | |
|
202 | 201 | return self |
|
203 | 202 | |
|
204 | 203 | @property |
|
205 | 204 | def manifest(self): |
|
206 | 205 | return bin(self._text[0:self._offsets[0]]) |
|
207 | 206 | |
|
208 | 207 | @property |
|
209 | 208 | def user(self): |
|
210 | 209 | off = self._offsets |
|
211 | 210 | return encoding.tolocal(self._text[off[0] + 1:off[1]]) |
|
212 | 211 | |
|
213 | 212 | @property |
|
214 | 213 | def _rawdate(self): |
|
215 | 214 | off = self._offsets |
|
216 | 215 | dateextra = self._text[off[1] + 1:off[2]] |
|
217 | 216 | return dateextra.split(' ', 2)[0:2] |
|
218 | 217 | |
|
219 | 218 | @property |
|
220 | 219 | def _rawextra(self): |
|
221 | 220 | off = self._offsets |
|
222 | 221 | dateextra = self._text[off[1] + 1:off[2]] |
|
223 | 222 | fields = dateextra.split(' ', 2) |
|
224 | 223 | if len(fields) != 3: |
|
225 | 224 | return None |
|
226 | 225 | |
|
227 | 226 | return fields[2] |
|
228 | 227 | |
|
229 | 228 | @property |
|
230 | 229 | def date(self): |
|
231 | 230 | raw = self._rawdate |
|
232 | 231 | time = float(raw[0]) |
|
233 | 232 | # Various tools did silly things with the timezone. |
|
234 | 233 | try: |
|
235 | 234 | timezone = int(raw[1]) |
|
236 | 235 | except ValueError: |
|
237 | 236 | timezone = 0 |
|
238 | 237 | |
|
239 | 238 | return time, timezone |
|
240 | 239 | |
|
241 | 240 | @property |
|
242 | 241 | def extra(self): |
|
243 | 242 | raw = self._rawextra |
|
244 | 243 | if raw is None: |
|
245 | 244 | return _defaultextra |
|
246 | 245 | |
|
247 | 246 | return decodeextra(raw) |
|
248 | 247 | |
|
249 | 248 | @property |
|
250 | 249 | def files(self): |
|
251 | 250 | off = self._offsets |
|
252 | 251 | if off[2] == off[3]: |
|
253 | 252 | return [] |
|
254 | 253 | |
|
255 | 254 | return self._text[off[2] + 1:off[3]].split('\n') |
|
256 | 255 | |
|
257 | 256 | @property |
|
258 | 257 | def description(self): |
|
259 | 258 | return encoding.tolocal(self._text[self._offsets[3] + 2:]) |
|
260 | 259 | |
|
261 | 260 | class changelog(revlog.revlog): |
|
262 | 261 | def __init__(self, opener, trypending=False): |
|
263 | 262 | """Load a changelog revlog using an opener. |
|
264 | 263 | |
|
265 | 264 | If ``trypending`` is true, we attempt to load the index from a |
|
266 | 265 | ``00changelog.i.a`` file instead of the default ``00changelog.i``. |
|
267 | 266 | The ``00changelog.i.a`` file contains index (and possibly inline |
|
268 | 267 | revision) data for a transaction that hasn't been finalized yet. |
|
269 | 268 | It exists in a separate file to facilitate readers (such as |
|
270 | 269 | hooks processes) accessing data before a transaction is finalized. |
|
271 | 270 | """ |
|
272 | 271 | if trypending and opener.exists('00changelog.i.a'): |
|
273 | 272 | indexfile = '00changelog.i.a' |
|
274 | 273 | else: |
|
275 | 274 | indexfile = '00changelog.i' |
|
276 | 275 | |
|
277 | 276 | datafile = '00changelog.d' |
|
278 | 277 | revlog.revlog.__init__(self, opener, indexfile, datafile=datafile, |
|
279 | 278 | checkambig=True) |
|
280 | 279 | |
|
281 | 280 | if self._initempty: |
|
282 | 281 | # changelogs don't benefit from generaldelta |
|
283 | 282 | self.version &= ~revlog.FLAG_GENERALDELTA |
|
284 | 283 | self._generaldelta = False |
|
285 | 284 | |
|
286 | 285 | # Delta chains for changelogs tend to be very small because entries |
|
287 | 286 | # tend to be small and don't delta well with each. So disable delta |
|
288 | 287 | # chains. |
|
289 | 288 | self.storedeltachains = False |
|
290 | 289 | |
|
291 | 290 | self._realopener = opener |
|
292 | 291 | self._delayed = False |
|
293 | 292 | self._delaybuf = None |
|
294 | 293 | self._divert = False |
|
295 | 294 | self.filteredrevs = frozenset() |
|
296 | 295 | |
|
297 | 296 | def tip(self): |
|
298 | 297 | """filtered version of revlog.tip""" |
|
299 | 298 | for i in xrange(len(self) -1, -2, -1): |
|
300 | 299 | if i not in self.filteredrevs: |
|
301 | 300 | return self.node(i) |
|
302 | 301 | |
|
303 | 302 | def __contains__(self, rev): |
|
304 | 303 | """filtered version of revlog.__contains__""" |
|
305 | 304 | return (0 <= rev < len(self) |
|
306 | 305 | and rev not in self.filteredrevs) |
|
307 | 306 | |
|
308 | 307 | def __iter__(self): |
|
309 | 308 | """filtered version of revlog.__iter__""" |
|
310 | 309 | if len(self.filteredrevs) == 0: |
|
311 | 310 | return revlog.revlog.__iter__(self) |
|
312 | 311 | |
|
313 | 312 | def filterediter(): |
|
314 | 313 | for i in xrange(len(self)): |
|
315 | 314 | if i not in self.filteredrevs: |
|
316 | 315 | yield i |
|
317 | 316 | |
|
318 | 317 | return filterediter() |
|
319 | 318 | |
|
320 | 319 | def revs(self, start=0, stop=None): |
|
321 | 320 | """filtered version of revlog.revs""" |
|
322 | 321 | for i in super(changelog, self).revs(start, stop): |
|
323 | 322 | if i not in self.filteredrevs: |
|
324 | 323 | yield i |
|
325 | 324 | |
|
326 | 325 | @util.propertycache |
|
327 | 326 | def nodemap(self): |
|
328 | 327 | # XXX need filtering too |
|
329 | 328 | self.rev(self.node(0)) |
|
330 | 329 | return self._nodecache |
|
331 | 330 | |
|
332 | 331 | def reachableroots(self, minroot, heads, roots, includepath=False): |
|
333 | 332 | return self.index.reachableroots2(minroot, heads, roots, includepath) |
|
334 | 333 | |
|
335 | 334 | def headrevs(self): |
|
336 | 335 | if self.filteredrevs: |
|
337 | 336 | try: |
|
338 | 337 | return self.index.headrevsfiltered(self.filteredrevs) |
|
339 | 338 | # AttributeError covers non-c-extension environments and |
|
340 | 339 | # old c extensions without filter handling. |
|
341 | 340 | except AttributeError: |
|
342 | 341 | return self._headrevs() |
|
343 | 342 | |
|
344 | 343 | return super(changelog, self).headrevs() |
|
345 | 344 | |
|
346 | 345 | def strip(self, *args, **kwargs): |
|
347 | 346 | # XXX make something better than assert |
|
348 | 347 | # We can't expect proper strip behavior if we are filtered. |
|
349 | 348 | assert not self.filteredrevs |
|
350 | 349 | super(changelog, self).strip(*args, **kwargs) |
|
351 | 350 | |
|
352 | 351 | def rev(self, node): |
|
353 | 352 | """filtered version of revlog.rev""" |
|
354 | 353 | r = super(changelog, self).rev(node) |
|
355 | 354 | if r in self.filteredrevs: |
|
356 | 355 | raise error.FilteredLookupError(hex(node), self.indexfile, |
|
357 | 356 | _('filtered node')) |
|
358 | 357 | return r |
|
359 | 358 | |
|
360 | 359 | def node(self, rev): |
|
361 | 360 | """filtered version of revlog.node""" |
|
362 | 361 | if rev in self.filteredrevs: |
|
363 | 362 | raise error.FilteredIndexError(rev) |
|
364 | 363 | return super(changelog, self).node(rev) |
|
365 | 364 | |
|
366 | 365 | def linkrev(self, rev): |
|
367 | 366 | """filtered version of revlog.linkrev""" |
|
368 | 367 | if rev in self.filteredrevs: |
|
369 | 368 | raise error.FilteredIndexError(rev) |
|
370 | 369 | return super(changelog, self).linkrev(rev) |
|
371 | 370 | |
|
372 | 371 | def parentrevs(self, rev): |
|
373 | 372 | """filtered version of revlog.parentrevs""" |
|
374 | 373 | if rev in self.filteredrevs: |
|
375 | 374 | raise error.FilteredIndexError(rev) |
|
376 | 375 | return super(changelog, self).parentrevs(rev) |
|
377 | 376 | |
|
378 | 377 | def flags(self, rev): |
|
379 | 378 | """filtered version of revlog.flags""" |
|
380 | 379 | if rev in self.filteredrevs: |
|
381 | 380 | raise error.FilteredIndexError(rev) |
|
382 | 381 | return super(changelog, self).flags(rev) |
|
383 | 382 | |
|
384 | 383 | def delayupdate(self, tr): |
|
385 | 384 | "delay visibility of index updates to other readers" |
|
386 | 385 | |
|
387 | 386 | if not self._delayed: |
|
388 | 387 | if len(self) == 0: |
|
389 | 388 | self._divert = True |
|
390 | 389 | if self._realopener.exists(self.indexfile + '.a'): |
|
391 | 390 | self._realopener.unlink(self.indexfile + '.a') |
|
392 | 391 | self.opener = _divertopener(self._realopener, self.indexfile) |
|
393 | 392 | else: |
|
394 | 393 | self._delaybuf = [] |
|
395 | 394 | self.opener = _delayopener(self._realopener, self.indexfile, |
|
396 | 395 | self._delaybuf) |
|
397 | 396 | self._delayed = True |
|
398 | 397 | tr.addpending('cl-%i' % id(self), self._writepending) |
|
399 | 398 | tr.addfinalize('cl-%i' % id(self), self._finalize) |
|
400 | 399 | |
|
401 | 400 | def _finalize(self, tr): |
|
402 | 401 | "finalize index updates" |
|
403 | 402 | self._delayed = False |
|
404 | 403 | self.opener = self._realopener |
|
405 | 404 | # move redirected index data back into place |
|
406 | 405 | if self._divert: |
|
407 | 406 | assert not self._delaybuf |
|
408 | 407 | tmpname = self.indexfile + ".a" |
|
409 | 408 | nfile = self.opener.open(tmpname) |
|
410 | 409 | nfile.close() |
|
411 | 410 | self.opener.rename(tmpname, self.indexfile, checkambig=True) |
|
412 | 411 | elif self._delaybuf: |
|
413 | 412 | fp = self.opener(self.indexfile, 'a', checkambig=True) |
|
414 | 413 | fp.write("".join(self._delaybuf)) |
|
415 | 414 | fp.close() |
|
416 | 415 | self._delaybuf = None |
|
417 | 416 | self._divert = False |
|
418 | 417 | # split when we're done |
|
419 | 418 | self.checkinlinesize(tr) |
|
420 | 419 | |
|
421 | 420 | def _writepending(self, tr): |
|
422 | 421 | "create a file containing the unfinalized state for pretxnchangegroup" |
|
423 | 422 | if self._delaybuf: |
|
424 | 423 | # make a temporary copy of the index |
|
425 | 424 | fp1 = self._realopener(self.indexfile) |
|
426 | 425 | pendingfilename = self.indexfile + ".a" |
|
427 | 426 | # register as a temp file to ensure cleanup on failure |
|
428 | 427 | tr.registertmp(pendingfilename) |
|
429 | 428 | # write existing data |
|
430 | 429 | fp2 = self._realopener(pendingfilename, "w") |
|
431 | 430 | fp2.write(fp1.read()) |
|
432 | 431 | # add pending data |
|
433 | 432 | fp2.write("".join(self._delaybuf)) |
|
434 | 433 | fp2.close() |
|
435 | 434 | # switch modes so finalize can simply rename |
|
436 | 435 | self._delaybuf = None |
|
437 | 436 | self._divert = True |
|
438 | 437 | self.opener = _divertopener(self._realopener, self.indexfile) |
|
439 | 438 | |
|
440 | 439 | if self._divert: |
|
441 | 440 | return True |
|
442 | 441 | |
|
443 | 442 | return False |
|
444 | 443 | |
|
445 | 444 | def checkinlinesize(self, tr, fp=None): |
|
446 | 445 | if not self._delayed: |
|
447 | 446 | revlog.revlog.checkinlinesize(self, tr, fp) |
|
448 | 447 | |
|
449 | 448 | def read(self, node): |
|
450 | 449 | """Obtain data from a parsed changelog revision. |
|
451 | 450 | |
|
452 | 451 | Returns a 6-tuple of: |
|
453 | 452 | |
|
454 | 453 | - manifest node in binary |
|
455 | 454 | - author/user as a localstr |
|
456 | 455 | - date as a 2-tuple of (time, timezone) |
|
457 | 456 | - list of files |
|
458 | 457 | - commit message as a localstr |
|
459 | 458 | - dict of extra metadata |
|
460 | 459 | |
|
461 | 460 | Unless you need to access all fields, consider calling |
|
462 | 461 | ``changelogrevision`` instead, as it is faster for partial object |
|
463 | 462 | access. |
|
464 | 463 | """ |
|
465 | 464 | c = changelogrevision(self.revision(node)) |
|
466 | 465 | return ( |
|
467 | 466 | c.manifest, |
|
468 | 467 | c.user, |
|
469 | 468 | c.date, |
|
470 | 469 | c.files, |
|
471 | 470 | c.description, |
|
472 | 471 | c.extra |
|
473 | 472 | ) |
|
474 | 473 | |
|
475 | 474 | def changelogrevision(self, nodeorrev): |
|
476 | 475 | """Obtain a ``changelogrevision`` for a node or revision.""" |
|
477 | 476 | return changelogrevision(self.revision(nodeorrev)) |
|
478 | 477 | |
|
479 | 478 | def readfiles(self, node): |
|
480 | 479 | """ |
|
481 | 480 | short version of read that only returns the files modified by the cset |
|
482 | 481 | """ |
|
483 | 482 | text = self.revision(node) |
|
484 | 483 | if not text: |
|
485 | 484 | return [] |
|
486 | 485 | last = text.index("\n\n") |
|
487 | 486 | l = text[:last].split('\n') |
|
488 | 487 | return l[3:] |
|
489 | 488 | |
|
490 | 489 | def add(self, manifest, files, desc, transaction, p1, p2, |
|
491 | 490 | user, date=None, extra=None): |
|
492 | 491 | # Convert to UTF-8 encoded bytestrings as the very first |
|
493 | 492 | # thing: calling any method on a localstr object will turn it |
|
494 | 493 | # into a str object and the cached UTF-8 string is thus lost. |
|
495 | 494 | user, desc = encoding.fromlocal(user), encoding.fromlocal(desc) |
|
496 | 495 | |
|
497 | 496 | user = user.strip() |
|
498 | 497 | # An empty username or a username with a "\n" will make the |
|
499 | 498 | # revision text contain two "\n\n" sequences -> corrupt |
|
500 | 499 | # repository since read cannot unpack the revision. |
|
501 | 500 | if not user: |
|
502 | 501 | raise error.RevlogError(_("empty username")) |
|
503 | 502 | if "\n" in user: |
|
504 | 503 | raise error.RevlogError(_("username %s contains a newline") |
|
505 | 504 | % repr(user)) |
|
506 | 505 | |
|
507 | 506 | desc = stripdesc(desc) |
|
508 | 507 | |
|
509 | 508 | if date: |
|
510 | 509 | parseddate = "%d %d" % util.parsedate(date) |
|
511 | 510 | else: |
|
512 | 511 | parseddate = "%d %d" % util.makedate() |
|
513 | 512 | if extra: |
|
514 | 513 | branch = extra.get("branch") |
|
515 | 514 | if branch in ("default", ""): |
|
516 | 515 | del extra["branch"] |
|
517 | 516 | elif branch in (".", "null", "tip"): |
|
518 | 517 | raise error.RevlogError(_('the name \'%s\' is reserved') |
|
519 | 518 | % branch) |
|
520 | 519 | if extra: |
|
521 | 520 | extra = encodeextra(extra) |
|
522 | 521 | parseddate = "%s %s" % (parseddate, extra) |
|
523 | 522 | l = [hex(manifest), user, parseddate] + sorted(files) + ["", desc] |
|
524 | 523 | text = "\n".join(l) |
|
525 | 524 | return self.addrevision(text, transaction, len(self), p1, p2) |
|
526 | 525 | |
|
527 | 526 | def branchinfo(self, rev): |
|
528 | 527 | """return the branch name and open/close state of a revision |
|
529 | 528 | |
|
530 | 529 | This function exists because creating a changectx object |
|
531 | 530 | just to access this is costly.""" |
|
532 | 531 | extra = self.read(rev)[5] |
|
533 | 532 | return encoding.tolocal(extra.get("branch")), 'close' in extra |
|
534 | 533 | |
|
535 | 534 | def _addrevision(self, node, rawtext, transaction, *args, **kwargs): |
|
536 | 535 | # overlay over the standard revlog._addrevision to track the new |
|
537 | 536 | # revision on the transaction. |
|
538 | 537 | rev = len(self) |
|
539 | if node == wdirid: # nullid is checked in super method | |
|
540 | raise error.RevlogError(_("%s: attempt to add wdir revision") % | |
|
541 | (self.indexfile)) | |
|
542 | 538 | node = super(changelog, self)._addrevision(node, rawtext, transaction, |
|
543 | 539 | *args, **kwargs) |
|
544 | 540 | revs = transaction.changes.get('revs') |
|
545 | 541 | if revs is not None: |
|
546 | 542 | revs.add(rev) |
|
547 | 543 | return node |
@@ -1,2218 +1,2222 | |||
|
1 | 1 | # revlog.py - storage back-end for mercurial |
|
2 | 2 | # |
|
3 | 3 | # Copyright 2005-2007 Matt Mackall <mpm@selenic.com> |
|
4 | 4 | # |
|
5 | 5 | # This software may be used and distributed according to the terms of the |
|
6 | 6 | # GNU General Public License version 2 or any later version. |
|
7 | 7 | |
|
8 | 8 | """Storage back-end for Mercurial. |
|
9 | 9 | |
|
10 | 10 | This provides efficient delta storage with O(1) retrieve and append |
|
11 | 11 | and O(changes) merge between branches. |
|
12 | 12 | """ |
|
13 | 13 | |
|
14 | 14 | from __future__ import absolute_import |
|
15 | 15 | |
|
16 | 16 | import binascii |
|
17 | 17 | import collections |
|
18 | 18 | import errno |
|
19 | 19 | import hashlib |
|
20 | 20 | import os |
|
21 | 21 | import struct |
|
22 | 22 | import zlib |
|
23 | 23 | |
|
24 | 24 | # import stuff from node for others to import from revlog |
|
25 | 25 | from .node import ( |
|
26 | 26 | bin, |
|
27 | 27 | hex, |
|
28 | 28 | nullid, |
|
29 | 29 | nullrev, |
|
30 | 30 | wdirhex, |
|
31 | 31 | wdirid, |
|
32 | 32 | wdirrev, |
|
33 | 33 | ) |
|
34 | 34 | from .i18n import _ |
|
35 | 35 | from . import ( |
|
36 | 36 | ancestor, |
|
37 | 37 | error, |
|
38 | 38 | mdiff, |
|
39 | 39 | policy, |
|
40 | 40 | pycompat, |
|
41 | 41 | templatefilters, |
|
42 | 42 | util, |
|
43 | 43 | ) |
|
44 | 44 | |
|
45 | 45 | parsers = policy.importmod(r'parsers') |
|
46 | 46 | |
|
47 | 47 | # Aliased for performance. |
|
48 | 48 | _zlibdecompress = zlib.decompress |
|
49 | 49 | |
|
50 | 50 | # revlog header flags |
|
51 | 51 | REVLOGV0 = 0 |
|
52 | 52 | REVLOGV1 = 1 |
|
53 | 53 | # Dummy value until file format is finalized. |
|
54 | 54 | # Reminder: change the bounds check in revlog.__init__ when this is changed. |
|
55 | 55 | REVLOGV2 = 0xDEAD |
|
56 | 56 | FLAG_INLINE_DATA = (1 << 16) |
|
57 | 57 | FLAG_GENERALDELTA = (1 << 17) |
|
58 | 58 | REVLOG_DEFAULT_FLAGS = FLAG_INLINE_DATA |
|
59 | 59 | REVLOG_DEFAULT_FORMAT = REVLOGV1 |
|
60 | 60 | REVLOG_DEFAULT_VERSION = REVLOG_DEFAULT_FORMAT | REVLOG_DEFAULT_FLAGS |
|
61 | 61 | REVLOGV1_FLAGS = FLAG_INLINE_DATA | FLAG_GENERALDELTA |
|
62 | 62 | REVLOGV2_FLAGS = REVLOGV1_FLAGS |
|
63 | 63 | |
|
64 | 64 | # revlog index flags |
|
65 | 65 | REVIDX_ISCENSORED = (1 << 15) # revision has censor metadata, must be verified |
|
66 | 66 | REVIDX_ELLIPSIS = (1 << 14) # revision hash does not match data (narrowhg) |
|
67 | 67 | REVIDX_EXTSTORED = (1 << 13) # revision data is stored externally |
|
68 | 68 | REVIDX_DEFAULT_FLAGS = 0 |
|
69 | 69 | # stable order in which flags need to be processed and their processors applied |
|
70 | 70 | REVIDX_FLAGS_ORDER = [ |
|
71 | 71 | REVIDX_ISCENSORED, |
|
72 | 72 | REVIDX_ELLIPSIS, |
|
73 | 73 | REVIDX_EXTSTORED, |
|
74 | 74 | ] |
|
75 | 75 | REVIDX_KNOWN_FLAGS = util.bitsfrom(REVIDX_FLAGS_ORDER) |
|
76 | 76 | |
|
77 | 77 | # max size of revlog with inline data |
|
78 | 78 | _maxinline = 131072 |
|
79 | 79 | _chunksize = 1048576 |
|
80 | 80 | |
|
81 | 81 | RevlogError = error.RevlogError |
|
82 | 82 | LookupError = error.LookupError |
|
83 | 83 | CensoredNodeError = error.CensoredNodeError |
|
84 | 84 | ProgrammingError = error.ProgrammingError |
|
85 | 85 | |
|
86 | 86 | # Store flag processors (cf. 'addflagprocessor()' to register) |
|
87 | 87 | _flagprocessors = { |
|
88 | 88 | REVIDX_ISCENSORED: None, |
|
89 | 89 | } |
|
90 | 90 | |
|
91 | 91 | def addflagprocessor(flag, processor): |
|
92 | 92 | """Register a flag processor on a revision data flag. |
|
93 | 93 | |
|
94 | 94 | Invariant: |
|
95 | 95 | - Flags need to be defined in REVIDX_KNOWN_FLAGS and REVIDX_FLAGS_ORDER. |
|
96 | 96 | - Only one flag processor can be registered on a specific flag. |
|
97 | 97 | - flagprocessors must be 3-tuples of functions (read, write, raw) with the |
|
98 | 98 | following signatures: |
|
99 | 99 | - (read) f(self, rawtext) -> text, bool |
|
100 | 100 | - (write) f(self, text) -> rawtext, bool |
|
101 | 101 | - (raw) f(self, rawtext) -> bool |
|
102 | 102 | "text" is presented to the user. "rawtext" is stored in revlog data, not |
|
103 | 103 | directly visible to the user. |
|
104 | 104 | The boolean returned by these transforms is used to determine whether |
|
105 | 105 | the returned text can be used for hash integrity checking. For example, |
|
106 | 106 | if "write" returns False, then "text" is used to generate hash. If |
|
107 | 107 | "write" returns True, that basically means "rawtext" returned by "write" |
|
108 | 108 | should be used to generate hash. Usually, "write" and "read" return |
|
109 | 109 | different booleans. And "raw" returns a same boolean as "write". |
|
110 | 110 | |
|
111 | 111 | Note: The 'raw' transform is used for changegroup generation and in some |
|
112 | 112 | debug commands. In this case the transform only indicates whether the |
|
113 | 113 | contents can be used for hash integrity checks. |
|
114 | 114 | """ |
|
115 | 115 | if not flag & REVIDX_KNOWN_FLAGS: |
|
116 | 116 | msg = _("cannot register processor on unknown flag '%#x'.") % (flag) |
|
117 | 117 | raise ProgrammingError(msg) |
|
118 | 118 | if flag not in REVIDX_FLAGS_ORDER: |
|
119 | 119 | msg = _("flag '%#x' undefined in REVIDX_FLAGS_ORDER.") % (flag) |
|
120 | 120 | raise ProgrammingError(msg) |
|
121 | 121 | if flag in _flagprocessors: |
|
122 | 122 | msg = _("cannot register multiple processors on flag '%#x'.") % (flag) |
|
123 | 123 | raise error.Abort(msg) |
|
124 | 124 | _flagprocessors[flag] = processor |
|
125 | 125 | |
|
126 | 126 | def getoffset(q): |
|
127 | 127 | return int(q >> 16) |
|
128 | 128 | |
|
129 | 129 | def gettype(q): |
|
130 | 130 | return int(q & 0xFFFF) |
|
131 | 131 | |
|
132 | 132 | def offset_type(offset, type): |
|
133 | 133 | if (type & ~REVIDX_KNOWN_FLAGS) != 0: |
|
134 | 134 | raise ValueError('unknown revlog index flags') |
|
135 | 135 | return int(int(offset) << 16 | type) |
|
136 | 136 | |
|
137 | 137 | _nullhash = hashlib.sha1(nullid) |
|
138 | 138 | |
|
139 | 139 | def hash(text, p1, p2): |
|
140 | 140 | """generate a hash from the given text and its parent hashes |
|
141 | 141 | |
|
142 | 142 | This hash combines both the current file contents and its history |
|
143 | 143 | in a manner that makes it easy to distinguish nodes with the same |
|
144 | 144 | content in the revision graph. |
|
145 | 145 | """ |
|
146 | 146 | # As of now, if one of the parent node is null, p2 is null |
|
147 | 147 | if p2 == nullid: |
|
148 | 148 | # deep copy of a hash is faster than creating one |
|
149 | 149 | s = _nullhash.copy() |
|
150 | 150 | s.update(p1) |
|
151 | 151 | else: |
|
152 | 152 | # none of the parent nodes are nullid |
|
153 | 153 | if p1 < p2: |
|
154 | 154 | a = p1 |
|
155 | 155 | b = p2 |
|
156 | 156 | else: |
|
157 | 157 | a = p2 |
|
158 | 158 | b = p1 |
|
159 | 159 | s = hashlib.sha1(a) |
|
160 | 160 | s.update(b) |
|
161 | 161 | s.update(text) |
|
162 | 162 | return s.digest() |
|
163 | 163 | |
|
164 | 164 | # index v0: |
|
165 | 165 | # 4 bytes: offset |
|
166 | 166 | # 4 bytes: compressed length |
|
167 | 167 | # 4 bytes: base rev |
|
168 | 168 | # 4 bytes: link rev |
|
169 | 169 | # 20 bytes: parent 1 nodeid |
|
170 | 170 | # 20 bytes: parent 2 nodeid |
|
171 | 171 | # 20 bytes: nodeid |
|
172 | 172 | indexformatv0 = struct.Struct(">4l20s20s20s") |
|
173 | 173 | indexformatv0_pack = indexformatv0.pack |
|
174 | 174 | indexformatv0_unpack = indexformatv0.unpack |
|
175 | 175 | |
|
176 | 176 | class revlogoldio(object): |
|
177 | 177 | def __init__(self): |
|
178 | 178 | self.size = indexformatv0.size |
|
179 | 179 | |
|
180 | 180 | def parseindex(self, data, inline): |
|
181 | 181 | s = self.size |
|
182 | 182 | index = [] |
|
183 | 183 | nodemap = {nullid: nullrev} |
|
184 | 184 | n = off = 0 |
|
185 | 185 | l = len(data) |
|
186 | 186 | while off + s <= l: |
|
187 | 187 | cur = data[off:off + s] |
|
188 | 188 | off += s |
|
189 | 189 | e = indexformatv0_unpack(cur) |
|
190 | 190 | # transform to revlogv1 format |
|
191 | 191 | e2 = (offset_type(e[0], 0), e[1], -1, e[2], e[3], |
|
192 | 192 | nodemap.get(e[4], nullrev), nodemap.get(e[5], nullrev), e[6]) |
|
193 | 193 | index.append(e2) |
|
194 | 194 | nodemap[e[6]] = n |
|
195 | 195 | n += 1 |
|
196 | 196 | |
|
197 | 197 | # add the magic null revision at -1 |
|
198 | 198 | index.append((0, 0, 0, -1, -1, -1, -1, nullid)) |
|
199 | 199 | |
|
200 | 200 | return index, nodemap, None |
|
201 | 201 | |
|
202 | 202 | def packentry(self, entry, node, version, rev): |
|
203 | 203 | if gettype(entry[0]): |
|
204 | 204 | raise RevlogError(_('index entry flags need revlog version 1')) |
|
205 | 205 | e2 = (getoffset(entry[0]), entry[1], entry[3], entry[4], |
|
206 | 206 | node(entry[5]), node(entry[6]), entry[7]) |
|
207 | 207 | return indexformatv0_pack(*e2) |
|
208 | 208 | |
|
209 | 209 | # index ng: |
|
210 | 210 | # 6 bytes: offset |
|
211 | 211 | # 2 bytes: flags |
|
212 | 212 | # 4 bytes: compressed length |
|
213 | 213 | # 4 bytes: uncompressed length |
|
214 | 214 | # 4 bytes: base rev |
|
215 | 215 | # 4 bytes: link rev |
|
216 | 216 | # 4 bytes: parent 1 rev |
|
217 | 217 | # 4 bytes: parent 2 rev |
|
218 | 218 | # 32 bytes: nodeid |
|
219 | 219 | indexformatng = struct.Struct(">Qiiiiii20s12x") |
|
220 | 220 | indexformatng_pack = indexformatng.pack |
|
221 | 221 | versionformat = struct.Struct(">I") |
|
222 | 222 | versionformat_pack = versionformat.pack |
|
223 | 223 | versionformat_unpack = versionformat.unpack |
|
224 | 224 | |
|
225 | 225 | # corresponds to uncompressed length of indexformatng (2 gigs, 4-byte |
|
226 | 226 | # signed integer) |
|
227 | 227 | _maxentrysize = 0x7fffffff |
|
228 | 228 | |
|
229 | 229 | class revlogio(object): |
|
230 | 230 | def __init__(self): |
|
231 | 231 | self.size = indexformatng.size |
|
232 | 232 | |
|
233 | 233 | def parseindex(self, data, inline): |
|
234 | 234 | # call the C implementation to parse the index data |
|
235 | 235 | index, cache = parsers.parse_index2(data, inline) |
|
236 | 236 | return index, getattr(index, 'nodemap', None), cache |
|
237 | 237 | |
|
238 | 238 | def packentry(self, entry, node, version, rev): |
|
239 | 239 | p = indexformatng_pack(*entry) |
|
240 | 240 | if rev == 0: |
|
241 | 241 | p = versionformat_pack(version) + p[4:] |
|
242 | 242 | return p |
|
243 | 243 | |
|
244 | 244 | class revlog(object): |
|
245 | 245 | """ |
|
246 | 246 | the underlying revision storage object |
|
247 | 247 | |
|
248 | 248 | A revlog consists of two parts, an index and the revision data. |
|
249 | 249 | |
|
250 | 250 | The index is a file with a fixed record size containing |
|
251 | 251 | information on each revision, including its nodeid (hash), the |
|
252 | 252 | nodeids of its parents, the position and offset of its data within |
|
253 | 253 | the data file, and the revision it's based on. Finally, each entry |
|
254 | 254 | contains a linkrev entry that can serve as a pointer to external |
|
255 | 255 | data. |
|
256 | 256 | |
|
257 | 257 | The revision data itself is a linear collection of data chunks. |
|
258 | 258 | Each chunk represents a revision and is usually represented as a |
|
259 | 259 | delta against the previous chunk. To bound lookup time, runs of |
|
260 | 260 | deltas are limited to about 2 times the length of the original |
|
261 | 261 | version data. This makes retrieval of a version proportional to |
|
262 | 262 | its size, or O(1) relative to the number of revisions. |
|
263 | 263 | |
|
264 | 264 | Both pieces of the revlog are written to in an append-only |
|
265 | 265 | fashion, which means we never need to rewrite a file to insert or |
|
266 | 266 | remove data, and can use some simple techniques to avoid the need |
|
267 | 267 | for locking while reading. |
|
268 | 268 | |
|
269 | 269 | If checkambig, indexfile is opened with checkambig=True at |
|
270 | 270 | writing, to avoid file stat ambiguity. |
|
271 | 271 | """ |
|
272 | 272 | def __init__(self, opener, indexfile, datafile=None, checkambig=False): |
|
273 | 273 | """ |
|
274 | 274 | create a revlog object |
|
275 | 275 | |
|
276 | 276 | opener is a function that abstracts the file opening operation |
|
277 | 277 | and can be used to implement COW semantics or the like. |
|
278 | 278 | """ |
|
279 | 279 | self.indexfile = indexfile |
|
280 | 280 | self.datafile = datafile or (indexfile[:-2] + ".d") |
|
281 | 281 | self.opener = opener |
|
282 | 282 | # When True, indexfile is opened with checkambig=True at writing, to |
|
283 | 283 | # avoid file stat ambiguity. |
|
284 | 284 | self._checkambig = checkambig |
|
285 | 285 | # 3-tuple of (node, rev, text) for a raw revision. |
|
286 | 286 | self._cache = None |
|
287 | 287 | # Maps rev to chain base rev. |
|
288 | 288 | self._chainbasecache = util.lrucachedict(100) |
|
289 | 289 | # 2-tuple of (offset, data) of raw data from the revlog at an offset. |
|
290 | 290 | self._chunkcache = (0, '') |
|
291 | 291 | # How much data to read and cache into the raw revlog data cache. |
|
292 | 292 | self._chunkcachesize = 65536 |
|
293 | 293 | self._maxchainlen = None |
|
294 | 294 | self._aggressivemergedeltas = False |
|
295 | 295 | self.index = [] |
|
296 | 296 | # Mapping of partial identifiers to full nodes. |
|
297 | 297 | self._pcache = {} |
|
298 | 298 | # Mapping of revision integer to full node. |
|
299 | 299 | self._nodecache = {nullid: nullrev} |
|
300 | 300 | self._nodepos = None |
|
301 | 301 | self._compengine = 'zlib' |
|
302 | 302 | self._maxdeltachainspan = -1 |
|
303 | 303 | |
|
304 | 304 | v = REVLOG_DEFAULT_VERSION |
|
305 | 305 | opts = getattr(opener, 'options', None) |
|
306 | 306 | if opts is not None: |
|
307 | 307 | if 'revlogv2' in opts: |
|
308 | 308 | # version 2 revlogs always use generaldelta. |
|
309 | 309 | v = REVLOGV2 | FLAG_GENERALDELTA | FLAG_INLINE_DATA |
|
310 | 310 | elif 'revlogv1' in opts: |
|
311 | 311 | if 'generaldelta' in opts: |
|
312 | 312 | v |= FLAG_GENERALDELTA |
|
313 | 313 | else: |
|
314 | 314 | v = 0 |
|
315 | 315 | if 'chunkcachesize' in opts: |
|
316 | 316 | self._chunkcachesize = opts['chunkcachesize'] |
|
317 | 317 | if 'maxchainlen' in opts: |
|
318 | 318 | self._maxchainlen = opts['maxchainlen'] |
|
319 | 319 | if 'aggressivemergedeltas' in opts: |
|
320 | 320 | self._aggressivemergedeltas = opts['aggressivemergedeltas'] |
|
321 | 321 | self._lazydeltabase = bool(opts.get('lazydeltabase', False)) |
|
322 | 322 | if 'compengine' in opts: |
|
323 | 323 | self._compengine = opts['compengine'] |
|
324 | 324 | if 'maxdeltachainspan' in opts: |
|
325 | 325 | self._maxdeltachainspan = opts['maxdeltachainspan'] |
|
326 | 326 | |
|
327 | 327 | if self._chunkcachesize <= 0: |
|
328 | 328 | raise RevlogError(_('revlog chunk cache size %r is not greater ' |
|
329 | 329 | 'than 0') % self._chunkcachesize) |
|
330 | 330 | elif self._chunkcachesize & (self._chunkcachesize - 1): |
|
331 | 331 | raise RevlogError(_('revlog chunk cache size %r is not a power ' |
|
332 | 332 | 'of 2') % self._chunkcachesize) |
|
333 | 333 | |
|
334 | 334 | indexdata = '' |
|
335 | 335 | self._initempty = True |
|
336 | 336 | try: |
|
337 | 337 | f = self.opener(self.indexfile) |
|
338 | 338 | indexdata = f.read() |
|
339 | 339 | f.close() |
|
340 | 340 | if len(indexdata) > 0: |
|
341 | 341 | v = versionformat_unpack(indexdata[:4])[0] |
|
342 | 342 | self._initempty = False |
|
343 | 343 | except IOError as inst: |
|
344 | 344 | if inst.errno != errno.ENOENT: |
|
345 | 345 | raise |
|
346 | 346 | |
|
347 | 347 | self.version = v |
|
348 | 348 | self._inline = v & FLAG_INLINE_DATA |
|
349 | 349 | self._generaldelta = v & FLAG_GENERALDELTA |
|
350 | 350 | flags = v & ~0xFFFF |
|
351 | 351 | fmt = v & 0xFFFF |
|
352 | 352 | if fmt == REVLOGV0: |
|
353 | 353 | if flags: |
|
354 | 354 | raise RevlogError(_('unknown flags (%#04x) in version %d ' |
|
355 | 355 | 'revlog %s') % |
|
356 | 356 | (flags >> 16, fmt, self.indexfile)) |
|
357 | 357 | elif fmt == REVLOGV1: |
|
358 | 358 | if flags & ~REVLOGV1_FLAGS: |
|
359 | 359 | raise RevlogError(_('unknown flags (%#04x) in version %d ' |
|
360 | 360 | 'revlog %s') % |
|
361 | 361 | (flags >> 16, fmt, self.indexfile)) |
|
362 | 362 | elif fmt == REVLOGV2: |
|
363 | 363 | if flags & ~REVLOGV2_FLAGS: |
|
364 | 364 | raise RevlogError(_('unknown flags (%#04x) in version %d ' |
|
365 | 365 | 'revlog %s') % |
|
366 | 366 | (flags >> 16, fmt, self.indexfile)) |
|
367 | 367 | else: |
|
368 | 368 | raise RevlogError(_('unknown version (%d) in revlog %s') % |
|
369 | 369 | (fmt, self.indexfile)) |
|
370 | 370 | |
|
371 | 371 | self.storedeltachains = True |
|
372 | 372 | |
|
373 | 373 | self._io = revlogio() |
|
374 | 374 | if self.version == REVLOGV0: |
|
375 | 375 | self._io = revlogoldio() |
|
376 | 376 | try: |
|
377 | 377 | d = self._io.parseindex(indexdata, self._inline) |
|
378 | 378 | except (ValueError, IndexError): |
|
379 | 379 | raise RevlogError(_("index %s is corrupted") % (self.indexfile)) |
|
380 | 380 | self.index, nodemap, self._chunkcache = d |
|
381 | 381 | if nodemap is not None: |
|
382 | 382 | self.nodemap = self._nodecache = nodemap |
|
383 | 383 | if not self._chunkcache: |
|
384 | 384 | self._chunkclear() |
|
385 | 385 | # revnum -> (chain-length, sum-delta-length) |
|
386 | 386 | self._chaininfocache = {} |
|
387 | 387 | # revlog header -> revlog compressor |
|
388 | 388 | self._decompressors = {} |
|
389 | 389 | |
|
390 | 390 | @util.propertycache |
|
391 | 391 | def _compressor(self): |
|
392 | 392 | return util.compengines[self._compengine].revlogcompressor() |
|
393 | 393 | |
|
394 | 394 | def tip(self): |
|
395 | 395 | return self.node(len(self.index) - 2) |
|
396 | 396 | def __contains__(self, rev): |
|
397 | 397 | return 0 <= rev < len(self) |
|
398 | 398 | def __len__(self): |
|
399 | 399 | return len(self.index) - 1 |
|
400 | 400 | def __iter__(self): |
|
401 | 401 | return iter(xrange(len(self))) |
|
402 | 402 | def revs(self, start=0, stop=None): |
|
403 | 403 | """iterate over all rev in this revlog (from start to stop)""" |
|
404 | 404 | step = 1 |
|
405 | 405 | if stop is not None: |
|
406 | 406 | if start > stop: |
|
407 | 407 | step = -1 |
|
408 | 408 | stop += step |
|
409 | 409 | else: |
|
410 | 410 | stop = len(self) |
|
411 | 411 | return xrange(start, stop, step) |
|
412 | 412 | |
|
413 | 413 | @util.propertycache |
|
414 | 414 | def nodemap(self): |
|
415 | 415 | self.rev(self.node(0)) |
|
416 | 416 | return self._nodecache |
|
417 | 417 | |
|
418 | 418 | def hasnode(self, node): |
|
419 | 419 | try: |
|
420 | 420 | self.rev(node) |
|
421 | 421 | return True |
|
422 | 422 | except KeyError: |
|
423 | 423 | return False |
|
424 | 424 | |
|
425 | 425 | def clearcaches(self): |
|
426 | 426 | self._cache = None |
|
427 | 427 | self._chainbasecache.clear() |
|
428 | 428 | self._chunkcache = (0, '') |
|
429 | 429 | self._pcache = {} |
|
430 | 430 | |
|
431 | 431 | try: |
|
432 | 432 | self._nodecache.clearcaches() |
|
433 | 433 | except AttributeError: |
|
434 | 434 | self._nodecache = {nullid: nullrev} |
|
435 | 435 | self._nodepos = None |
|
436 | 436 | |
|
437 | 437 | def rev(self, node): |
|
438 | 438 | try: |
|
439 | 439 | return self._nodecache[node] |
|
440 | 440 | except TypeError: |
|
441 | 441 | raise |
|
442 | 442 | except RevlogError: |
|
443 | 443 | # parsers.c radix tree lookup failed |
|
444 | 444 | if node == wdirid: |
|
445 | 445 | raise error.WdirUnsupported |
|
446 | 446 | raise LookupError(node, self.indexfile, _('no node')) |
|
447 | 447 | except KeyError: |
|
448 | 448 | # pure python cache lookup failed |
|
449 | 449 | n = self._nodecache |
|
450 | 450 | i = self.index |
|
451 | 451 | p = self._nodepos |
|
452 | 452 | if p is None: |
|
453 | 453 | p = len(i) - 2 |
|
454 | 454 | for r in xrange(p, -1, -1): |
|
455 | 455 | v = i[r][7] |
|
456 | 456 | n[v] = r |
|
457 | 457 | if v == node: |
|
458 | 458 | self._nodepos = r - 1 |
|
459 | 459 | return r |
|
460 | 460 | if node == wdirid: |
|
461 | 461 | raise error.WdirUnsupported |
|
462 | 462 | raise LookupError(node, self.indexfile, _('no node')) |
|
463 | 463 | |
|
464 | 464 | # Accessors for index entries. |
|
465 | 465 | |
|
466 | 466 | # First tuple entry is 8 bytes. First 6 bytes are offset. Last 2 bytes |
|
467 | 467 | # are flags. |
|
468 | 468 | def start(self, rev): |
|
469 | 469 | return int(self.index[rev][0] >> 16) |
|
470 | 470 | |
|
471 | 471 | def flags(self, rev): |
|
472 | 472 | return self.index[rev][0] & 0xFFFF |
|
473 | 473 | |
|
474 | 474 | def length(self, rev): |
|
475 | 475 | return self.index[rev][1] |
|
476 | 476 | |
|
477 | 477 | def rawsize(self, rev): |
|
478 | 478 | """return the length of the uncompressed text for a given revision""" |
|
479 | 479 | l = self.index[rev][2] |
|
480 | 480 | if l >= 0: |
|
481 | 481 | return l |
|
482 | 482 | |
|
483 | 483 | t = self.revision(rev, raw=True) |
|
484 | 484 | return len(t) |
|
485 | 485 | |
|
486 | 486 | def size(self, rev): |
|
487 | 487 | """length of non-raw text (processed by a "read" flag processor)""" |
|
488 | 488 | # fast path: if no "read" flag processor could change the content, |
|
489 | 489 | # size is rawsize. note: ELLIPSIS is known to not change the content. |
|
490 | 490 | flags = self.flags(rev) |
|
491 | 491 | if flags & (REVIDX_KNOWN_FLAGS ^ REVIDX_ELLIPSIS) == 0: |
|
492 | 492 | return self.rawsize(rev) |
|
493 | 493 | |
|
494 | 494 | return len(self.revision(rev, raw=False)) |
|
495 | 495 | |
|
496 | 496 | def chainbase(self, rev): |
|
497 | 497 | base = self._chainbasecache.get(rev) |
|
498 | 498 | if base is not None: |
|
499 | 499 | return base |
|
500 | 500 | |
|
501 | 501 | index = self.index |
|
502 | 502 | base = index[rev][3] |
|
503 | 503 | while base != rev: |
|
504 | 504 | rev = base |
|
505 | 505 | base = index[rev][3] |
|
506 | 506 | |
|
507 | 507 | self._chainbasecache[rev] = base |
|
508 | 508 | return base |
|
509 | 509 | |
|
510 | 510 | def linkrev(self, rev): |
|
511 | 511 | return self.index[rev][4] |
|
512 | 512 | |
|
513 | 513 | def parentrevs(self, rev): |
|
514 | 514 | try: |
|
515 | 515 | return self.index[rev][5:7] |
|
516 | 516 | except IndexError: |
|
517 | 517 | if rev == wdirrev: |
|
518 | 518 | raise error.WdirUnsupported |
|
519 | 519 | raise |
|
520 | 520 | |
|
521 | 521 | def node(self, rev): |
|
522 | 522 | try: |
|
523 | 523 | return self.index[rev][7] |
|
524 | 524 | except IndexError: |
|
525 | 525 | if rev == wdirrev: |
|
526 | 526 | raise error.WdirUnsupported |
|
527 | 527 | raise |
|
528 | 528 | |
|
529 | 529 | # Derived from index values. |
|
530 | 530 | |
|
531 | 531 | def end(self, rev): |
|
532 | 532 | return self.start(rev) + self.length(rev) |
|
533 | 533 | |
|
534 | 534 | def parents(self, node): |
|
535 | 535 | i = self.index |
|
536 | 536 | d = i[self.rev(node)] |
|
537 | 537 | return i[d[5]][7], i[d[6]][7] # map revisions to nodes inline |
|
538 | 538 | |
|
539 | 539 | def chainlen(self, rev): |
|
540 | 540 | return self._chaininfo(rev)[0] |
|
541 | 541 | |
|
542 | 542 | def _chaininfo(self, rev): |
|
543 | 543 | chaininfocache = self._chaininfocache |
|
544 | 544 | if rev in chaininfocache: |
|
545 | 545 | return chaininfocache[rev] |
|
546 | 546 | index = self.index |
|
547 | 547 | generaldelta = self._generaldelta |
|
548 | 548 | iterrev = rev |
|
549 | 549 | e = index[iterrev] |
|
550 | 550 | clen = 0 |
|
551 | 551 | compresseddeltalen = 0 |
|
552 | 552 | while iterrev != e[3]: |
|
553 | 553 | clen += 1 |
|
554 | 554 | compresseddeltalen += e[1] |
|
555 | 555 | if generaldelta: |
|
556 | 556 | iterrev = e[3] |
|
557 | 557 | else: |
|
558 | 558 | iterrev -= 1 |
|
559 | 559 | if iterrev in chaininfocache: |
|
560 | 560 | t = chaininfocache[iterrev] |
|
561 | 561 | clen += t[0] |
|
562 | 562 | compresseddeltalen += t[1] |
|
563 | 563 | break |
|
564 | 564 | e = index[iterrev] |
|
565 | 565 | else: |
|
566 | 566 | # Add text length of base since decompressing that also takes |
|
567 | 567 | # work. For cache hits the length is already included. |
|
568 | 568 | compresseddeltalen += e[1] |
|
569 | 569 | r = (clen, compresseddeltalen) |
|
570 | 570 | chaininfocache[rev] = r |
|
571 | 571 | return r |
|
572 | 572 | |
|
573 | 573 | def _deltachain(self, rev, stoprev=None): |
|
574 | 574 | """Obtain the delta chain for a revision. |
|
575 | 575 | |
|
576 | 576 | ``stoprev`` specifies a revision to stop at. If not specified, we |
|
577 | 577 | stop at the base of the chain. |
|
578 | 578 | |
|
579 | 579 | Returns a 2-tuple of (chain, stopped) where ``chain`` is a list of |
|
580 | 580 | revs in ascending order and ``stopped`` is a bool indicating whether |
|
581 | 581 | ``stoprev`` was hit. |
|
582 | 582 | """ |
|
583 | 583 | # Try C implementation. |
|
584 | 584 | try: |
|
585 | 585 | return self.index.deltachain(rev, stoprev, self._generaldelta) |
|
586 | 586 | except AttributeError: |
|
587 | 587 | pass |
|
588 | 588 | |
|
589 | 589 | chain = [] |
|
590 | 590 | |
|
591 | 591 | # Alias to prevent attribute lookup in tight loop. |
|
592 | 592 | index = self.index |
|
593 | 593 | generaldelta = self._generaldelta |
|
594 | 594 | |
|
595 | 595 | iterrev = rev |
|
596 | 596 | e = index[iterrev] |
|
597 | 597 | while iterrev != e[3] and iterrev != stoprev: |
|
598 | 598 | chain.append(iterrev) |
|
599 | 599 | if generaldelta: |
|
600 | 600 | iterrev = e[3] |
|
601 | 601 | else: |
|
602 | 602 | iterrev -= 1 |
|
603 | 603 | e = index[iterrev] |
|
604 | 604 | |
|
605 | 605 | if iterrev == stoprev: |
|
606 | 606 | stopped = True |
|
607 | 607 | else: |
|
608 | 608 | chain.append(iterrev) |
|
609 | 609 | stopped = False |
|
610 | 610 | |
|
611 | 611 | chain.reverse() |
|
612 | 612 | return chain, stopped |
|
613 | 613 | |
|
614 | 614 | def ancestors(self, revs, stoprev=0, inclusive=False): |
|
615 | 615 | """Generate the ancestors of 'revs' in reverse topological order. |
|
616 | 616 | Does not generate revs lower than stoprev. |
|
617 | 617 | |
|
618 | 618 | See the documentation for ancestor.lazyancestors for more details.""" |
|
619 | 619 | |
|
620 | 620 | return ancestor.lazyancestors(self.parentrevs, revs, stoprev=stoprev, |
|
621 | 621 | inclusive=inclusive) |
|
622 | 622 | |
|
623 | 623 | def descendants(self, revs): |
|
624 | 624 | """Generate the descendants of 'revs' in revision order. |
|
625 | 625 | |
|
626 | 626 | Yield a sequence of revision numbers starting with a child of |
|
627 | 627 | some rev in revs, i.e., each revision is *not* considered a |
|
628 | 628 | descendant of itself. Results are ordered by revision number (a |
|
629 | 629 | topological sort).""" |
|
630 | 630 | first = min(revs) |
|
631 | 631 | if first == nullrev: |
|
632 | 632 | for i in self: |
|
633 | 633 | yield i |
|
634 | 634 | return |
|
635 | 635 | |
|
636 | 636 | seen = set(revs) |
|
637 | 637 | for i in self.revs(start=first + 1): |
|
638 | 638 | for x in self.parentrevs(i): |
|
639 | 639 | if x != nullrev and x in seen: |
|
640 | 640 | seen.add(i) |
|
641 | 641 | yield i |
|
642 | 642 | break |
|
643 | 643 | |
|
644 | 644 | def findcommonmissing(self, common=None, heads=None): |
|
645 | 645 | """Return a tuple of the ancestors of common and the ancestors of heads |
|
646 | 646 | that are not ancestors of common. In revset terminology, we return the |
|
647 | 647 | tuple: |
|
648 | 648 | |
|
649 | 649 | ::common, (::heads) - (::common) |
|
650 | 650 | |
|
651 | 651 | The list is sorted by revision number, meaning it is |
|
652 | 652 | topologically sorted. |
|
653 | 653 | |
|
654 | 654 | 'heads' and 'common' are both lists of node IDs. If heads is |
|
655 | 655 | not supplied, uses all of the revlog's heads. If common is not |
|
656 | 656 | supplied, uses nullid.""" |
|
657 | 657 | if common is None: |
|
658 | 658 | common = [nullid] |
|
659 | 659 | if heads is None: |
|
660 | 660 | heads = self.heads() |
|
661 | 661 | |
|
662 | 662 | common = [self.rev(n) for n in common] |
|
663 | 663 | heads = [self.rev(n) for n in heads] |
|
664 | 664 | |
|
665 | 665 | # we want the ancestors, but inclusive |
|
666 | 666 | class lazyset(object): |
|
667 | 667 | def __init__(self, lazyvalues): |
|
668 | 668 | self.addedvalues = set() |
|
669 | 669 | self.lazyvalues = lazyvalues |
|
670 | 670 | |
|
671 | 671 | def __contains__(self, value): |
|
672 | 672 | return value in self.addedvalues or value in self.lazyvalues |
|
673 | 673 | |
|
674 | 674 | def __iter__(self): |
|
675 | 675 | added = self.addedvalues |
|
676 | 676 | for r in added: |
|
677 | 677 | yield r |
|
678 | 678 | for r in self.lazyvalues: |
|
679 | 679 | if not r in added: |
|
680 | 680 | yield r |
|
681 | 681 | |
|
682 | 682 | def add(self, value): |
|
683 | 683 | self.addedvalues.add(value) |
|
684 | 684 | |
|
685 | 685 | def update(self, values): |
|
686 | 686 | self.addedvalues.update(values) |
|
687 | 687 | |
|
688 | 688 | has = lazyset(self.ancestors(common)) |
|
689 | 689 | has.add(nullrev) |
|
690 | 690 | has.update(common) |
|
691 | 691 | |
|
692 | 692 | # take all ancestors from heads that aren't in has |
|
693 | 693 | missing = set() |
|
694 | 694 | visit = collections.deque(r for r in heads if r not in has) |
|
695 | 695 | while visit: |
|
696 | 696 | r = visit.popleft() |
|
697 | 697 | if r in missing: |
|
698 | 698 | continue |
|
699 | 699 | else: |
|
700 | 700 | missing.add(r) |
|
701 | 701 | for p in self.parentrevs(r): |
|
702 | 702 | if p not in has: |
|
703 | 703 | visit.append(p) |
|
704 | 704 | missing = list(missing) |
|
705 | 705 | missing.sort() |
|
706 | 706 | return has, [self.node(miss) for miss in missing] |
|
707 | 707 | |
|
708 | 708 | def incrementalmissingrevs(self, common=None): |
|
709 | 709 | """Return an object that can be used to incrementally compute the |
|
710 | 710 | revision numbers of the ancestors of arbitrary sets that are not |
|
711 | 711 | ancestors of common. This is an ancestor.incrementalmissingancestors |
|
712 | 712 | object. |
|
713 | 713 | |
|
714 | 714 | 'common' is a list of revision numbers. If common is not supplied, uses |
|
715 | 715 | nullrev. |
|
716 | 716 | """ |
|
717 | 717 | if common is None: |
|
718 | 718 | common = [nullrev] |
|
719 | 719 | |
|
720 | 720 | return ancestor.incrementalmissingancestors(self.parentrevs, common) |
|
721 | 721 | |
|
722 | 722 | def findmissingrevs(self, common=None, heads=None): |
|
723 | 723 | """Return the revision numbers of the ancestors of heads that |
|
724 | 724 | are not ancestors of common. |
|
725 | 725 | |
|
726 | 726 | More specifically, return a list of revision numbers corresponding to |
|
727 | 727 | nodes N such that every N satisfies the following constraints: |
|
728 | 728 | |
|
729 | 729 | 1. N is an ancestor of some node in 'heads' |
|
730 | 730 | 2. N is not an ancestor of any node in 'common' |
|
731 | 731 | |
|
732 | 732 | The list is sorted by revision number, meaning it is |
|
733 | 733 | topologically sorted. |
|
734 | 734 | |
|
735 | 735 | 'heads' and 'common' are both lists of revision numbers. If heads is |
|
736 | 736 | not supplied, uses all of the revlog's heads. If common is not |
|
737 | 737 | supplied, uses nullid.""" |
|
738 | 738 | if common is None: |
|
739 | 739 | common = [nullrev] |
|
740 | 740 | if heads is None: |
|
741 | 741 | heads = self.headrevs() |
|
742 | 742 | |
|
743 | 743 | inc = self.incrementalmissingrevs(common=common) |
|
744 | 744 | return inc.missingancestors(heads) |
|
745 | 745 | |
|
746 | 746 | def findmissing(self, common=None, heads=None): |
|
747 | 747 | """Return the ancestors of heads that are not ancestors of common. |
|
748 | 748 | |
|
749 | 749 | More specifically, return a list of nodes N such that every N |
|
750 | 750 | satisfies the following constraints: |
|
751 | 751 | |
|
752 | 752 | 1. N is an ancestor of some node in 'heads' |
|
753 | 753 | 2. N is not an ancestor of any node in 'common' |
|
754 | 754 | |
|
755 | 755 | The list is sorted by revision number, meaning it is |
|
756 | 756 | topologically sorted. |
|
757 | 757 | |
|
758 | 758 | 'heads' and 'common' are both lists of node IDs. If heads is |
|
759 | 759 | not supplied, uses all of the revlog's heads. If common is not |
|
760 | 760 | supplied, uses nullid.""" |
|
761 | 761 | if common is None: |
|
762 | 762 | common = [nullid] |
|
763 | 763 | if heads is None: |
|
764 | 764 | heads = self.heads() |
|
765 | 765 | |
|
766 | 766 | common = [self.rev(n) for n in common] |
|
767 | 767 | heads = [self.rev(n) for n in heads] |
|
768 | 768 | |
|
769 | 769 | inc = self.incrementalmissingrevs(common=common) |
|
770 | 770 | return [self.node(r) for r in inc.missingancestors(heads)] |
|
771 | 771 | |
|
772 | 772 | def nodesbetween(self, roots=None, heads=None): |
|
773 | 773 | """Return a topological path from 'roots' to 'heads'. |
|
774 | 774 | |
|
775 | 775 | Return a tuple (nodes, outroots, outheads) where 'nodes' is a |
|
776 | 776 | topologically sorted list of all nodes N that satisfy both of |
|
777 | 777 | these constraints: |
|
778 | 778 | |
|
779 | 779 | 1. N is a descendant of some node in 'roots' |
|
780 | 780 | 2. N is an ancestor of some node in 'heads' |
|
781 | 781 | |
|
782 | 782 | Every node is considered to be both a descendant and an ancestor |
|
783 | 783 | of itself, so every reachable node in 'roots' and 'heads' will be |
|
784 | 784 | included in 'nodes'. |
|
785 | 785 | |
|
786 | 786 | 'outroots' is the list of reachable nodes in 'roots', i.e., the |
|
787 | 787 | subset of 'roots' that is returned in 'nodes'. Likewise, |
|
788 | 788 | 'outheads' is the subset of 'heads' that is also in 'nodes'. |
|
789 | 789 | |
|
790 | 790 | 'roots' and 'heads' are both lists of node IDs. If 'roots' is |
|
791 | 791 | unspecified, uses nullid as the only root. If 'heads' is |
|
792 | 792 | unspecified, uses list of all of the revlog's heads.""" |
|
793 | 793 | nonodes = ([], [], []) |
|
794 | 794 | if roots is not None: |
|
795 | 795 | roots = list(roots) |
|
796 | 796 | if not roots: |
|
797 | 797 | return nonodes |
|
798 | 798 | lowestrev = min([self.rev(n) for n in roots]) |
|
799 | 799 | else: |
|
800 | 800 | roots = [nullid] # Everybody's a descendant of nullid |
|
801 | 801 | lowestrev = nullrev |
|
802 | 802 | if (lowestrev == nullrev) and (heads is None): |
|
803 | 803 | # We want _all_ the nodes! |
|
804 | 804 | return ([self.node(r) for r in self], [nullid], list(self.heads())) |
|
805 | 805 | if heads is None: |
|
806 | 806 | # All nodes are ancestors, so the latest ancestor is the last |
|
807 | 807 | # node. |
|
808 | 808 | highestrev = len(self) - 1 |
|
809 | 809 | # Set ancestors to None to signal that every node is an ancestor. |
|
810 | 810 | ancestors = None |
|
811 | 811 | # Set heads to an empty dictionary for later discovery of heads |
|
812 | 812 | heads = {} |
|
813 | 813 | else: |
|
814 | 814 | heads = list(heads) |
|
815 | 815 | if not heads: |
|
816 | 816 | return nonodes |
|
817 | 817 | ancestors = set() |
|
818 | 818 | # Turn heads into a dictionary so we can remove 'fake' heads. |
|
819 | 819 | # Also, later we will be using it to filter out the heads we can't |
|
820 | 820 | # find from roots. |
|
821 | 821 | heads = dict.fromkeys(heads, False) |
|
822 | 822 | # Start at the top and keep marking parents until we're done. |
|
823 | 823 | nodestotag = set(heads) |
|
824 | 824 | # Remember where the top was so we can use it as a limit later. |
|
825 | 825 | highestrev = max([self.rev(n) for n in nodestotag]) |
|
826 | 826 | while nodestotag: |
|
827 | 827 | # grab a node to tag |
|
828 | 828 | n = nodestotag.pop() |
|
829 | 829 | # Never tag nullid |
|
830 | 830 | if n == nullid: |
|
831 | 831 | continue |
|
832 | 832 | # A node's revision number represents its place in a |
|
833 | 833 | # topologically sorted list of nodes. |
|
834 | 834 | r = self.rev(n) |
|
835 | 835 | if r >= lowestrev: |
|
836 | 836 | if n not in ancestors: |
|
837 | 837 | # If we are possibly a descendant of one of the roots |
|
838 | 838 | # and we haven't already been marked as an ancestor |
|
839 | 839 | ancestors.add(n) # Mark as ancestor |
|
840 | 840 | # Add non-nullid parents to list of nodes to tag. |
|
841 | 841 | nodestotag.update([p for p in self.parents(n) if |
|
842 | 842 | p != nullid]) |
|
843 | 843 | elif n in heads: # We've seen it before, is it a fake head? |
|
844 | 844 | # So it is, real heads should not be the ancestors of |
|
845 | 845 | # any other heads. |
|
846 | 846 | heads.pop(n) |
|
847 | 847 | if not ancestors: |
|
848 | 848 | return nonodes |
|
849 | 849 | # Now that we have our set of ancestors, we want to remove any |
|
850 | 850 | # roots that are not ancestors. |
|
851 | 851 | |
|
852 | 852 | # If one of the roots was nullid, everything is included anyway. |
|
853 | 853 | if lowestrev > nullrev: |
|
854 | 854 | # But, since we weren't, let's recompute the lowest rev to not |
|
855 | 855 | # include roots that aren't ancestors. |
|
856 | 856 | |
|
857 | 857 | # Filter out roots that aren't ancestors of heads |
|
858 | 858 | roots = [root for root in roots if root in ancestors] |
|
859 | 859 | # Recompute the lowest revision |
|
860 | 860 | if roots: |
|
861 | 861 | lowestrev = min([self.rev(root) for root in roots]) |
|
862 | 862 | else: |
|
863 | 863 | # No more roots? Return empty list |
|
864 | 864 | return nonodes |
|
865 | 865 | else: |
|
866 | 866 | # We are descending from nullid, and don't need to care about |
|
867 | 867 | # any other roots. |
|
868 | 868 | lowestrev = nullrev |
|
869 | 869 | roots = [nullid] |
|
870 | 870 | # Transform our roots list into a set. |
|
871 | 871 | descendants = set(roots) |
|
872 | 872 | # Also, keep the original roots so we can filter out roots that aren't |
|
873 | 873 | # 'real' roots (i.e. are descended from other roots). |
|
874 | 874 | roots = descendants.copy() |
|
875 | 875 | # Our topologically sorted list of output nodes. |
|
876 | 876 | orderedout = [] |
|
877 | 877 | # Don't start at nullid since we don't want nullid in our output list, |
|
878 | 878 | # and if nullid shows up in descendants, empty parents will look like |
|
879 | 879 | # they're descendants. |
|
880 | 880 | for r in self.revs(start=max(lowestrev, 0), stop=highestrev + 1): |
|
881 | 881 | n = self.node(r) |
|
882 | 882 | isdescendant = False |
|
883 | 883 | if lowestrev == nullrev: # Everybody is a descendant of nullid |
|
884 | 884 | isdescendant = True |
|
885 | 885 | elif n in descendants: |
|
886 | 886 | # n is already a descendant |
|
887 | 887 | isdescendant = True |
|
888 | 888 | # This check only needs to be done here because all the roots |
|
889 | 889 | # will start being marked is descendants before the loop. |
|
890 | 890 | if n in roots: |
|
891 | 891 | # If n was a root, check if it's a 'real' root. |
|
892 | 892 | p = tuple(self.parents(n)) |
|
893 | 893 | # If any of its parents are descendants, it's not a root. |
|
894 | 894 | if (p[0] in descendants) or (p[1] in descendants): |
|
895 | 895 | roots.remove(n) |
|
896 | 896 | else: |
|
897 | 897 | p = tuple(self.parents(n)) |
|
898 | 898 | # A node is a descendant if either of its parents are |
|
899 | 899 | # descendants. (We seeded the dependents list with the roots |
|
900 | 900 | # up there, remember?) |
|
901 | 901 | if (p[0] in descendants) or (p[1] in descendants): |
|
902 | 902 | descendants.add(n) |
|
903 | 903 | isdescendant = True |
|
904 | 904 | if isdescendant and ((ancestors is None) or (n in ancestors)): |
|
905 | 905 | # Only include nodes that are both descendants and ancestors. |
|
906 | 906 | orderedout.append(n) |
|
907 | 907 | if (ancestors is not None) and (n in heads): |
|
908 | 908 | # We're trying to figure out which heads are reachable |
|
909 | 909 | # from roots. |
|
910 | 910 | # Mark this head as having been reached |
|
911 | 911 | heads[n] = True |
|
912 | 912 | elif ancestors is None: |
|
913 | 913 | # Otherwise, we're trying to discover the heads. |
|
914 | 914 | # Assume this is a head because if it isn't, the next step |
|
915 | 915 | # will eventually remove it. |
|
916 | 916 | heads[n] = True |
|
917 | 917 | # But, obviously its parents aren't. |
|
918 | 918 | for p in self.parents(n): |
|
919 | 919 | heads.pop(p, None) |
|
920 | 920 | heads = [head for head, flag in heads.iteritems() if flag] |
|
921 | 921 | roots = list(roots) |
|
922 | 922 | assert orderedout |
|
923 | 923 | assert roots |
|
924 | 924 | assert heads |
|
925 | 925 | return (orderedout, roots, heads) |
|
926 | 926 | |
|
927 | 927 | def headrevs(self): |
|
928 | 928 | try: |
|
929 | 929 | return self.index.headrevs() |
|
930 | 930 | except AttributeError: |
|
931 | 931 | return self._headrevs() |
|
932 | 932 | |
|
933 | 933 | def computephases(self, roots): |
|
934 | 934 | return self.index.computephasesmapsets(roots) |
|
935 | 935 | |
|
936 | 936 | def _headrevs(self): |
|
937 | 937 | count = len(self) |
|
938 | 938 | if not count: |
|
939 | 939 | return [nullrev] |
|
940 | 940 | # we won't iter over filtered rev so nobody is a head at start |
|
941 | 941 | ishead = [0] * (count + 1) |
|
942 | 942 | index = self.index |
|
943 | 943 | for r in self: |
|
944 | 944 | ishead[r] = 1 # I may be an head |
|
945 | 945 | e = index[r] |
|
946 | 946 | ishead[e[5]] = ishead[e[6]] = 0 # my parent are not |
|
947 | 947 | return [r for r, val in enumerate(ishead) if val] |
|
948 | 948 | |
|
949 | 949 | def heads(self, start=None, stop=None): |
|
950 | 950 | """return the list of all nodes that have no children |
|
951 | 951 | |
|
952 | 952 | if start is specified, only heads that are descendants of |
|
953 | 953 | start will be returned |
|
954 | 954 | if stop is specified, it will consider all the revs from stop |
|
955 | 955 | as if they had no children |
|
956 | 956 | """ |
|
957 | 957 | if start is None and stop is None: |
|
958 | 958 | if not len(self): |
|
959 | 959 | return [nullid] |
|
960 | 960 | return [self.node(r) for r in self.headrevs()] |
|
961 | 961 | |
|
962 | 962 | if start is None: |
|
963 | 963 | start = nullid |
|
964 | 964 | if stop is None: |
|
965 | 965 | stop = [] |
|
966 | 966 | stoprevs = set([self.rev(n) for n in stop]) |
|
967 | 967 | startrev = self.rev(start) |
|
968 | 968 | reachable = {startrev} |
|
969 | 969 | heads = {startrev} |
|
970 | 970 | |
|
971 | 971 | parentrevs = self.parentrevs |
|
972 | 972 | for r in self.revs(start=startrev + 1): |
|
973 | 973 | for p in parentrevs(r): |
|
974 | 974 | if p in reachable: |
|
975 | 975 | if r not in stoprevs: |
|
976 | 976 | reachable.add(r) |
|
977 | 977 | heads.add(r) |
|
978 | 978 | if p in heads and p not in stoprevs: |
|
979 | 979 | heads.remove(p) |
|
980 | 980 | |
|
981 | 981 | return [self.node(r) for r in heads] |
|
982 | 982 | |
|
983 | 983 | def children(self, node): |
|
984 | 984 | """find the children of a given node""" |
|
985 | 985 | c = [] |
|
986 | 986 | p = self.rev(node) |
|
987 | 987 | for r in self.revs(start=p + 1): |
|
988 | 988 | prevs = [pr for pr in self.parentrevs(r) if pr != nullrev] |
|
989 | 989 | if prevs: |
|
990 | 990 | for pr in prevs: |
|
991 | 991 | if pr == p: |
|
992 | 992 | c.append(self.node(r)) |
|
993 | 993 | elif p == nullrev: |
|
994 | 994 | c.append(self.node(r)) |
|
995 | 995 | return c |
|
996 | 996 | |
|
997 | 997 | def descendant(self, start, end): |
|
998 | 998 | if start == nullrev: |
|
999 | 999 | return True |
|
1000 | 1000 | for i in self.descendants([start]): |
|
1001 | 1001 | if i == end: |
|
1002 | 1002 | return True |
|
1003 | 1003 | elif i > end: |
|
1004 | 1004 | break |
|
1005 | 1005 | return False |
|
1006 | 1006 | |
|
1007 | 1007 | def commonancestorsheads(self, a, b): |
|
1008 | 1008 | """calculate all the heads of the common ancestors of nodes a and b""" |
|
1009 | 1009 | a, b = self.rev(a), self.rev(b) |
|
1010 | 1010 | try: |
|
1011 | 1011 | ancs = self.index.commonancestorsheads(a, b) |
|
1012 | 1012 | except (AttributeError, OverflowError): # C implementation failed |
|
1013 | 1013 | ancs = ancestor.commonancestorsheads(self.parentrevs, a, b) |
|
1014 | 1014 | return pycompat.maplist(self.node, ancs) |
|
1015 | 1015 | |
|
1016 | 1016 | def isancestor(self, a, b): |
|
1017 | 1017 | """return True if node a is an ancestor of node b |
|
1018 | 1018 | |
|
1019 | 1019 | The implementation of this is trivial but the use of |
|
1020 | 1020 | commonancestorsheads is not.""" |
|
1021 | 1021 | return a in self.commonancestorsheads(a, b) |
|
1022 | 1022 | |
|
1023 | 1023 | def ancestor(self, a, b): |
|
1024 | 1024 | """calculate the "best" common ancestor of nodes a and b""" |
|
1025 | 1025 | |
|
1026 | 1026 | a, b = self.rev(a), self.rev(b) |
|
1027 | 1027 | try: |
|
1028 | 1028 | ancs = self.index.ancestors(a, b) |
|
1029 | 1029 | except (AttributeError, OverflowError): |
|
1030 | 1030 | ancs = ancestor.ancestors(self.parentrevs, a, b) |
|
1031 | 1031 | if ancs: |
|
1032 | 1032 | # choose a consistent winner when there's a tie |
|
1033 | 1033 | return min(map(self.node, ancs)) |
|
1034 | 1034 | return nullid |
|
1035 | 1035 | |
|
1036 | 1036 | def _match(self, id): |
|
1037 | 1037 | if isinstance(id, int): |
|
1038 | 1038 | # rev |
|
1039 | 1039 | return self.node(id) |
|
1040 | 1040 | if len(id) == 20: |
|
1041 | 1041 | # possibly a binary node |
|
1042 | 1042 | # odds of a binary node being all hex in ASCII are 1 in 10**25 |
|
1043 | 1043 | try: |
|
1044 | 1044 | node = id |
|
1045 | 1045 | self.rev(node) # quick search the index |
|
1046 | 1046 | return node |
|
1047 | 1047 | except LookupError: |
|
1048 | 1048 | pass # may be partial hex id |
|
1049 | 1049 | try: |
|
1050 | 1050 | # str(rev) |
|
1051 | 1051 | rev = int(id) |
|
1052 | 1052 | if str(rev) != id: |
|
1053 | 1053 | raise ValueError |
|
1054 | 1054 | if rev < 0: |
|
1055 | 1055 | rev = len(self) + rev |
|
1056 | 1056 | if rev < 0 or rev >= len(self): |
|
1057 | 1057 | raise ValueError |
|
1058 | 1058 | return self.node(rev) |
|
1059 | 1059 | except (ValueError, OverflowError): |
|
1060 | 1060 | pass |
|
1061 | 1061 | if len(id) == 40: |
|
1062 | 1062 | try: |
|
1063 | 1063 | # a full hex nodeid? |
|
1064 | 1064 | node = bin(id) |
|
1065 | 1065 | self.rev(node) |
|
1066 | 1066 | return node |
|
1067 | 1067 | except (TypeError, LookupError): |
|
1068 | 1068 | pass |
|
1069 | 1069 | |
|
1070 | 1070 | def _partialmatch(self, id): |
|
1071 | 1071 | maybewdir = wdirhex.startswith(id) |
|
1072 | 1072 | try: |
|
1073 | 1073 | partial = self.index.partialmatch(id) |
|
1074 | 1074 | if partial and self.hasnode(partial): |
|
1075 | 1075 | if maybewdir: |
|
1076 | 1076 | # single 'ff...' match in radix tree, ambiguous with wdir |
|
1077 | 1077 | raise RevlogError |
|
1078 | 1078 | return partial |
|
1079 | 1079 | if maybewdir: |
|
1080 | 1080 | # no 'ff...' match in radix tree, wdir identified |
|
1081 | 1081 | raise error.WdirUnsupported |
|
1082 | 1082 | return None |
|
1083 | 1083 | except RevlogError: |
|
1084 | 1084 | # parsers.c radix tree lookup gave multiple matches |
|
1085 | 1085 | # fast path: for unfiltered changelog, radix tree is accurate |
|
1086 | 1086 | if not getattr(self, 'filteredrevs', None): |
|
1087 | 1087 | raise LookupError(id, self.indexfile, |
|
1088 | 1088 | _('ambiguous identifier')) |
|
1089 | 1089 | # fall through to slow path that filters hidden revisions |
|
1090 | 1090 | except (AttributeError, ValueError): |
|
1091 | 1091 | # we are pure python, or key was too short to search radix tree |
|
1092 | 1092 | pass |
|
1093 | 1093 | |
|
1094 | 1094 | if id in self._pcache: |
|
1095 | 1095 | return self._pcache[id] |
|
1096 | 1096 | |
|
1097 | 1097 | if len(id) < 40: |
|
1098 | 1098 | try: |
|
1099 | 1099 | # hex(node)[:...] |
|
1100 | 1100 | l = len(id) // 2 # grab an even number of digits |
|
1101 | 1101 | prefix = bin(id[:l * 2]) |
|
1102 | 1102 | nl = [e[7] for e in self.index if e[7].startswith(prefix)] |
|
1103 | 1103 | nl = [n for n in nl if hex(n).startswith(id) and |
|
1104 | 1104 | self.hasnode(n)] |
|
1105 | 1105 | if len(nl) > 0: |
|
1106 | 1106 | if len(nl) == 1 and not maybewdir: |
|
1107 | 1107 | self._pcache[id] = nl[0] |
|
1108 | 1108 | return nl[0] |
|
1109 | 1109 | raise LookupError(id, self.indexfile, |
|
1110 | 1110 | _('ambiguous identifier')) |
|
1111 | 1111 | if maybewdir: |
|
1112 | 1112 | raise error.WdirUnsupported |
|
1113 | 1113 | return None |
|
1114 | 1114 | except (TypeError, binascii.Error): |
|
1115 | 1115 | pass |
|
1116 | 1116 | |
|
1117 | 1117 | def lookup(self, id): |
|
1118 | 1118 | """locate a node based on: |
|
1119 | 1119 | - revision number or str(revision number) |
|
1120 | 1120 | - nodeid or subset of hex nodeid |
|
1121 | 1121 | """ |
|
1122 | 1122 | n = self._match(id) |
|
1123 | 1123 | if n is not None: |
|
1124 | 1124 | return n |
|
1125 | 1125 | n = self._partialmatch(id) |
|
1126 | 1126 | if n: |
|
1127 | 1127 | return n |
|
1128 | 1128 | |
|
1129 | 1129 | raise LookupError(id, self.indexfile, _('no match found')) |
|
1130 | 1130 | |
|
1131 | 1131 | def cmp(self, node, text): |
|
1132 | 1132 | """compare text with a given file revision |
|
1133 | 1133 | |
|
1134 | 1134 | returns True if text is different than what is stored. |
|
1135 | 1135 | """ |
|
1136 | 1136 | p1, p2 = self.parents(node) |
|
1137 | 1137 | return hash(text, p1, p2) != node |
|
1138 | 1138 | |
|
1139 | 1139 | def _cachesegment(self, offset, data): |
|
1140 | 1140 | """Add a segment to the revlog cache. |
|
1141 | 1141 | |
|
1142 | 1142 | Accepts an absolute offset and the data that is at that location. |
|
1143 | 1143 | """ |
|
1144 | 1144 | o, d = self._chunkcache |
|
1145 | 1145 | # try to add to existing cache |
|
1146 | 1146 | if o + len(d) == offset and len(d) + len(data) < _chunksize: |
|
1147 | 1147 | self._chunkcache = o, d + data |
|
1148 | 1148 | else: |
|
1149 | 1149 | self._chunkcache = offset, data |
|
1150 | 1150 | |
|
1151 | 1151 | def _readsegment(self, offset, length, df=None): |
|
1152 | 1152 | """Load a segment of raw data from the revlog. |
|
1153 | 1153 | |
|
1154 | 1154 | Accepts an absolute offset, length to read, and an optional existing |
|
1155 | 1155 | file handle to read from. |
|
1156 | 1156 | |
|
1157 | 1157 | If an existing file handle is passed, it will be seeked and the |
|
1158 | 1158 | original seek position will NOT be restored. |
|
1159 | 1159 | |
|
1160 | 1160 | Returns a str or buffer of raw byte data. |
|
1161 | 1161 | """ |
|
1162 | 1162 | if df is not None: |
|
1163 | 1163 | closehandle = False |
|
1164 | 1164 | else: |
|
1165 | 1165 | if self._inline: |
|
1166 | 1166 | df = self.opener(self.indexfile) |
|
1167 | 1167 | else: |
|
1168 | 1168 | df = self.opener(self.datafile) |
|
1169 | 1169 | closehandle = True |
|
1170 | 1170 | |
|
1171 | 1171 | # Cache data both forward and backward around the requested |
|
1172 | 1172 | # data, in a fixed size window. This helps speed up operations |
|
1173 | 1173 | # involving reading the revlog backwards. |
|
1174 | 1174 | cachesize = self._chunkcachesize |
|
1175 | 1175 | realoffset = offset & ~(cachesize - 1) |
|
1176 | 1176 | reallength = (((offset + length + cachesize) & ~(cachesize - 1)) |
|
1177 | 1177 | - realoffset) |
|
1178 | 1178 | df.seek(realoffset) |
|
1179 | 1179 | d = df.read(reallength) |
|
1180 | 1180 | if closehandle: |
|
1181 | 1181 | df.close() |
|
1182 | 1182 | self._cachesegment(realoffset, d) |
|
1183 | 1183 | if offset != realoffset or reallength != length: |
|
1184 | 1184 | return util.buffer(d, offset - realoffset, length) |
|
1185 | 1185 | return d |
|
1186 | 1186 | |
|
1187 | 1187 | def _getsegment(self, offset, length, df=None): |
|
1188 | 1188 | """Obtain a segment of raw data from the revlog. |
|
1189 | 1189 | |
|
1190 | 1190 | Accepts an absolute offset, length of bytes to obtain, and an |
|
1191 | 1191 | optional file handle to the already-opened revlog. If the file |
|
1192 | 1192 | handle is used, it's original seek position will not be preserved. |
|
1193 | 1193 | |
|
1194 | 1194 | Requests for data may be returned from a cache. |
|
1195 | 1195 | |
|
1196 | 1196 | Returns a str or a buffer instance of raw byte data. |
|
1197 | 1197 | """ |
|
1198 | 1198 | o, d = self._chunkcache |
|
1199 | 1199 | l = len(d) |
|
1200 | 1200 | |
|
1201 | 1201 | # is it in the cache? |
|
1202 | 1202 | cachestart = offset - o |
|
1203 | 1203 | cacheend = cachestart + length |
|
1204 | 1204 | if cachestart >= 0 and cacheend <= l: |
|
1205 | 1205 | if cachestart == 0 and cacheend == l: |
|
1206 | 1206 | return d # avoid a copy |
|
1207 | 1207 | return util.buffer(d, cachestart, cacheend - cachestart) |
|
1208 | 1208 | |
|
1209 | 1209 | return self._readsegment(offset, length, df=df) |
|
1210 | 1210 | |
|
1211 | 1211 | def _getsegmentforrevs(self, startrev, endrev, df=None): |
|
1212 | 1212 | """Obtain a segment of raw data corresponding to a range of revisions. |
|
1213 | 1213 | |
|
1214 | 1214 | Accepts the start and end revisions and an optional already-open |
|
1215 | 1215 | file handle to be used for reading. If the file handle is read, its |
|
1216 | 1216 | seek position will not be preserved. |
|
1217 | 1217 | |
|
1218 | 1218 | Requests for data may be satisfied by a cache. |
|
1219 | 1219 | |
|
1220 | 1220 | Returns a 2-tuple of (offset, data) for the requested range of |
|
1221 | 1221 | revisions. Offset is the integer offset from the beginning of the |
|
1222 | 1222 | revlog and data is a str or buffer of the raw byte data. |
|
1223 | 1223 | |
|
1224 | 1224 | Callers will need to call ``self.start(rev)`` and ``self.length(rev)`` |
|
1225 | 1225 | to determine where each revision's data begins and ends. |
|
1226 | 1226 | """ |
|
1227 | 1227 | # Inlined self.start(startrev) & self.end(endrev) for perf reasons |
|
1228 | 1228 | # (functions are expensive). |
|
1229 | 1229 | index = self.index |
|
1230 | 1230 | istart = index[startrev] |
|
1231 | 1231 | start = int(istart[0] >> 16) |
|
1232 | 1232 | if startrev == endrev: |
|
1233 | 1233 | end = start + istart[1] |
|
1234 | 1234 | else: |
|
1235 | 1235 | iend = index[endrev] |
|
1236 | 1236 | end = int(iend[0] >> 16) + iend[1] |
|
1237 | 1237 | |
|
1238 | 1238 | if self._inline: |
|
1239 | 1239 | start += (startrev + 1) * self._io.size |
|
1240 | 1240 | end += (endrev + 1) * self._io.size |
|
1241 | 1241 | length = end - start |
|
1242 | 1242 | |
|
1243 | 1243 | return start, self._getsegment(start, length, df=df) |
|
1244 | 1244 | |
|
1245 | 1245 | def _chunk(self, rev, df=None): |
|
1246 | 1246 | """Obtain a single decompressed chunk for a revision. |
|
1247 | 1247 | |
|
1248 | 1248 | Accepts an integer revision and an optional already-open file handle |
|
1249 | 1249 | to be used for reading. If used, the seek position of the file will not |
|
1250 | 1250 | be preserved. |
|
1251 | 1251 | |
|
1252 | 1252 | Returns a str holding uncompressed data for the requested revision. |
|
1253 | 1253 | """ |
|
1254 | 1254 | return self.decompress(self._getsegmentforrevs(rev, rev, df=df)[1]) |
|
1255 | 1255 | |
|
1256 | 1256 | def _chunks(self, revs, df=None): |
|
1257 | 1257 | """Obtain decompressed chunks for the specified revisions. |
|
1258 | 1258 | |
|
1259 | 1259 | Accepts an iterable of numeric revisions that are assumed to be in |
|
1260 | 1260 | ascending order. Also accepts an optional already-open file handle |
|
1261 | 1261 | to be used for reading. If used, the seek position of the file will |
|
1262 | 1262 | not be preserved. |
|
1263 | 1263 | |
|
1264 | 1264 | This function is similar to calling ``self._chunk()`` multiple times, |
|
1265 | 1265 | but is faster. |
|
1266 | 1266 | |
|
1267 | 1267 | Returns a list with decompressed data for each requested revision. |
|
1268 | 1268 | """ |
|
1269 | 1269 | if not revs: |
|
1270 | 1270 | return [] |
|
1271 | 1271 | start = self.start |
|
1272 | 1272 | length = self.length |
|
1273 | 1273 | inline = self._inline |
|
1274 | 1274 | iosize = self._io.size |
|
1275 | 1275 | buffer = util.buffer |
|
1276 | 1276 | |
|
1277 | 1277 | l = [] |
|
1278 | 1278 | ladd = l.append |
|
1279 | 1279 | |
|
1280 | 1280 | try: |
|
1281 | 1281 | offset, data = self._getsegmentforrevs(revs[0], revs[-1], df=df) |
|
1282 | 1282 | except OverflowError: |
|
1283 | 1283 | # issue4215 - we can't cache a run of chunks greater than |
|
1284 | 1284 | # 2G on Windows |
|
1285 | 1285 | return [self._chunk(rev, df=df) for rev in revs] |
|
1286 | 1286 | |
|
1287 | 1287 | decomp = self.decompress |
|
1288 | 1288 | for rev in revs: |
|
1289 | 1289 | chunkstart = start(rev) |
|
1290 | 1290 | if inline: |
|
1291 | 1291 | chunkstart += (rev + 1) * iosize |
|
1292 | 1292 | chunklength = length(rev) |
|
1293 | 1293 | ladd(decomp(buffer(data, chunkstart - offset, chunklength))) |
|
1294 | 1294 | |
|
1295 | 1295 | return l |
|
1296 | 1296 | |
|
1297 | 1297 | def _chunkclear(self): |
|
1298 | 1298 | """Clear the raw chunk cache.""" |
|
1299 | 1299 | self._chunkcache = (0, '') |
|
1300 | 1300 | |
|
1301 | 1301 | def deltaparent(self, rev): |
|
1302 | 1302 | """return deltaparent of the given revision""" |
|
1303 | 1303 | base = self.index[rev][3] |
|
1304 | 1304 | if base == rev: |
|
1305 | 1305 | return nullrev |
|
1306 | 1306 | elif self._generaldelta: |
|
1307 | 1307 | return base |
|
1308 | 1308 | else: |
|
1309 | 1309 | return rev - 1 |
|
1310 | 1310 | |
|
1311 | 1311 | def revdiff(self, rev1, rev2): |
|
1312 | 1312 | """return or calculate a delta between two revisions |
|
1313 | 1313 | |
|
1314 | 1314 | The delta calculated is in binary form and is intended to be written to |
|
1315 | 1315 | revlog data directly. So this function needs raw revision data. |
|
1316 | 1316 | """ |
|
1317 | 1317 | if rev1 != nullrev and self.deltaparent(rev2) == rev1: |
|
1318 | 1318 | return bytes(self._chunk(rev2)) |
|
1319 | 1319 | |
|
1320 | 1320 | return mdiff.textdiff(self.revision(rev1, raw=True), |
|
1321 | 1321 | self.revision(rev2, raw=True)) |
|
1322 | 1322 | |
|
1323 | 1323 | def revision(self, nodeorrev, _df=None, raw=False): |
|
1324 | 1324 | """return an uncompressed revision of a given node or revision |
|
1325 | 1325 | number. |
|
1326 | 1326 | |
|
1327 | 1327 | _df - an existing file handle to read from. (internal-only) |
|
1328 | 1328 | raw - an optional argument specifying if the revision data is to be |
|
1329 | 1329 | treated as raw data when applying flag transforms. 'raw' should be set |
|
1330 | 1330 | to True when generating changegroups or in debug commands. |
|
1331 | 1331 | """ |
|
1332 | 1332 | if isinstance(nodeorrev, int): |
|
1333 | 1333 | rev = nodeorrev |
|
1334 | 1334 | node = self.node(rev) |
|
1335 | 1335 | else: |
|
1336 | 1336 | node = nodeorrev |
|
1337 | 1337 | rev = None |
|
1338 | 1338 | |
|
1339 | 1339 | cachedrev = None |
|
1340 | 1340 | flags = None |
|
1341 | 1341 | rawtext = None |
|
1342 | 1342 | if node == nullid: |
|
1343 | 1343 | return "" |
|
1344 | 1344 | if self._cache: |
|
1345 | 1345 | if self._cache[0] == node: |
|
1346 | 1346 | # _cache only stores rawtext |
|
1347 | 1347 | if raw: |
|
1348 | 1348 | return self._cache[2] |
|
1349 | 1349 | # duplicated, but good for perf |
|
1350 | 1350 | if rev is None: |
|
1351 | 1351 | rev = self.rev(node) |
|
1352 | 1352 | if flags is None: |
|
1353 | 1353 | flags = self.flags(rev) |
|
1354 | 1354 | # no extra flags set, no flag processor runs, text = rawtext |
|
1355 | 1355 | if flags == REVIDX_DEFAULT_FLAGS: |
|
1356 | 1356 | return self._cache[2] |
|
1357 | 1357 | # rawtext is reusable. need to run flag processor |
|
1358 | 1358 | rawtext = self._cache[2] |
|
1359 | 1359 | |
|
1360 | 1360 | cachedrev = self._cache[1] |
|
1361 | 1361 | |
|
1362 | 1362 | # look up what we need to read |
|
1363 | 1363 | if rawtext is None: |
|
1364 | 1364 | if rev is None: |
|
1365 | 1365 | rev = self.rev(node) |
|
1366 | 1366 | |
|
1367 | 1367 | chain, stopped = self._deltachain(rev, stoprev=cachedrev) |
|
1368 | 1368 | if stopped: |
|
1369 | 1369 | rawtext = self._cache[2] |
|
1370 | 1370 | |
|
1371 | 1371 | # drop cache to save memory |
|
1372 | 1372 | self._cache = None |
|
1373 | 1373 | |
|
1374 | 1374 | bins = self._chunks(chain, df=_df) |
|
1375 | 1375 | if rawtext is None: |
|
1376 | 1376 | rawtext = bytes(bins[0]) |
|
1377 | 1377 | bins = bins[1:] |
|
1378 | 1378 | |
|
1379 | 1379 | rawtext = mdiff.patches(rawtext, bins) |
|
1380 | 1380 | self._cache = (node, rev, rawtext) |
|
1381 | 1381 | |
|
1382 | 1382 | if flags is None: |
|
1383 | 1383 | if rev is None: |
|
1384 | 1384 | rev = self.rev(node) |
|
1385 | 1385 | flags = self.flags(rev) |
|
1386 | 1386 | |
|
1387 | 1387 | text, validatehash = self._processflags(rawtext, flags, 'read', raw=raw) |
|
1388 | 1388 | if validatehash: |
|
1389 | 1389 | self.checkhash(text, node, rev=rev) |
|
1390 | 1390 | |
|
1391 | 1391 | return text |
|
1392 | 1392 | |
|
1393 | 1393 | def hash(self, text, p1, p2): |
|
1394 | 1394 | """Compute a node hash. |
|
1395 | 1395 | |
|
1396 | 1396 | Available as a function so that subclasses can replace the hash |
|
1397 | 1397 | as needed. |
|
1398 | 1398 | """ |
|
1399 | 1399 | return hash(text, p1, p2) |
|
1400 | 1400 | |
|
1401 | 1401 | def _processflags(self, text, flags, operation, raw=False): |
|
1402 | 1402 | """Inspect revision data flags and applies transforms defined by |
|
1403 | 1403 | registered flag processors. |
|
1404 | 1404 | |
|
1405 | 1405 | ``text`` - the revision data to process |
|
1406 | 1406 | ``flags`` - the revision flags |
|
1407 | 1407 | ``operation`` - the operation being performed (read or write) |
|
1408 | 1408 | ``raw`` - an optional argument describing if the raw transform should be |
|
1409 | 1409 | applied. |
|
1410 | 1410 | |
|
1411 | 1411 | This method processes the flags in the order (or reverse order if |
|
1412 | 1412 | ``operation`` is 'write') defined by REVIDX_FLAGS_ORDER, applying the |
|
1413 | 1413 | flag processors registered for present flags. The order of flags defined |
|
1414 | 1414 | in REVIDX_FLAGS_ORDER needs to be stable to allow non-commutativity. |
|
1415 | 1415 | |
|
1416 | 1416 | Returns a 2-tuple of ``(text, validatehash)`` where ``text`` is the |
|
1417 | 1417 | processed text and ``validatehash`` is a bool indicating whether the |
|
1418 | 1418 | returned text should be checked for hash integrity. |
|
1419 | 1419 | |
|
1420 | 1420 | Note: If the ``raw`` argument is set, it has precedence over the |
|
1421 | 1421 | operation and will only update the value of ``validatehash``. |
|
1422 | 1422 | """ |
|
1423 | 1423 | # fast path: no flag processors will run |
|
1424 | 1424 | if flags == 0: |
|
1425 | 1425 | return text, True |
|
1426 | 1426 | if not operation in ('read', 'write'): |
|
1427 | 1427 | raise ProgrammingError(_("invalid '%s' operation ") % (operation)) |
|
1428 | 1428 | # Check all flags are known. |
|
1429 | 1429 | if flags & ~REVIDX_KNOWN_FLAGS: |
|
1430 | 1430 | raise RevlogError(_("incompatible revision flag '%#x'") % |
|
1431 | 1431 | (flags & ~REVIDX_KNOWN_FLAGS)) |
|
1432 | 1432 | validatehash = True |
|
1433 | 1433 | # Depending on the operation (read or write), the order might be |
|
1434 | 1434 | # reversed due to non-commutative transforms. |
|
1435 | 1435 | orderedflags = REVIDX_FLAGS_ORDER |
|
1436 | 1436 | if operation == 'write': |
|
1437 | 1437 | orderedflags = reversed(orderedflags) |
|
1438 | 1438 | |
|
1439 | 1439 | for flag in orderedflags: |
|
1440 | 1440 | # If a flagprocessor has been registered for a known flag, apply the |
|
1441 | 1441 | # related operation transform and update result tuple. |
|
1442 | 1442 | if flag & flags: |
|
1443 | 1443 | vhash = True |
|
1444 | 1444 | |
|
1445 | 1445 | if flag not in _flagprocessors: |
|
1446 | 1446 | message = _("missing processor for flag '%#x'") % (flag) |
|
1447 | 1447 | raise RevlogError(message) |
|
1448 | 1448 | |
|
1449 | 1449 | processor = _flagprocessors[flag] |
|
1450 | 1450 | if processor is not None: |
|
1451 | 1451 | readtransform, writetransform, rawtransform = processor |
|
1452 | 1452 | |
|
1453 | 1453 | if raw: |
|
1454 | 1454 | vhash = rawtransform(self, text) |
|
1455 | 1455 | elif operation == 'read': |
|
1456 | 1456 | text, vhash = readtransform(self, text) |
|
1457 | 1457 | else: # write operation |
|
1458 | 1458 | text, vhash = writetransform(self, text) |
|
1459 | 1459 | validatehash = validatehash and vhash |
|
1460 | 1460 | |
|
1461 | 1461 | return text, validatehash |
|
1462 | 1462 | |
|
1463 | 1463 | def checkhash(self, text, node, p1=None, p2=None, rev=None): |
|
1464 | 1464 | """Check node hash integrity. |
|
1465 | 1465 | |
|
1466 | 1466 | Available as a function so that subclasses can extend hash mismatch |
|
1467 | 1467 | behaviors as needed. |
|
1468 | 1468 | """ |
|
1469 | 1469 | if p1 is None and p2 is None: |
|
1470 | 1470 | p1, p2 = self.parents(node) |
|
1471 | 1471 | if node != self.hash(text, p1, p2): |
|
1472 | 1472 | revornode = rev |
|
1473 | 1473 | if revornode is None: |
|
1474 | 1474 | revornode = templatefilters.short(hex(node)) |
|
1475 | 1475 | raise RevlogError(_("integrity check failed on %s:%s") |
|
1476 | 1476 | % (self.indexfile, pycompat.bytestr(revornode))) |
|
1477 | 1477 | |
|
1478 | 1478 | def checkinlinesize(self, tr, fp=None): |
|
1479 | 1479 | """Check if the revlog is too big for inline and convert if so. |
|
1480 | 1480 | |
|
1481 | 1481 | This should be called after revisions are added to the revlog. If the |
|
1482 | 1482 | revlog has grown too large to be an inline revlog, it will convert it |
|
1483 | 1483 | to use multiple index and data files. |
|
1484 | 1484 | """ |
|
1485 | 1485 | if not self._inline or (self.start(-2) + self.length(-2)) < _maxinline: |
|
1486 | 1486 | return |
|
1487 | 1487 | |
|
1488 | 1488 | trinfo = tr.find(self.indexfile) |
|
1489 | 1489 | if trinfo is None: |
|
1490 | 1490 | raise RevlogError(_("%s not found in the transaction") |
|
1491 | 1491 | % self.indexfile) |
|
1492 | 1492 | |
|
1493 | 1493 | trindex = trinfo[2] |
|
1494 | 1494 | if trindex is not None: |
|
1495 | 1495 | dataoff = self.start(trindex) |
|
1496 | 1496 | else: |
|
1497 | 1497 | # revlog was stripped at start of transaction, use all leftover data |
|
1498 | 1498 | trindex = len(self) - 1 |
|
1499 | 1499 | dataoff = self.end(-2) |
|
1500 | 1500 | |
|
1501 | 1501 | tr.add(self.datafile, dataoff) |
|
1502 | 1502 | |
|
1503 | 1503 | if fp: |
|
1504 | 1504 | fp.flush() |
|
1505 | 1505 | fp.close() |
|
1506 | 1506 | |
|
1507 | 1507 | df = self.opener(self.datafile, 'w') |
|
1508 | 1508 | try: |
|
1509 | 1509 | for r in self: |
|
1510 | 1510 | df.write(self._getsegmentforrevs(r, r)[1]) |
|
1511 | 1511 | finally: |
|
1512 | 1512 | df.close() |
|
1513 | 1513 | |
|
1514 | 1514 | fp = self.opener(self.indexfile, 'w', atomictemp=True, |
|
1515 | 1515 | checkambig=self._checkambig) |
|
1516 | 1516 | self.version &= ~FLAG_INLINE_DATA |
|
1517 | 1517 | self._inline = False |
|
1518 | 1518 | for i in self: |
|
1519 | 1519 | e = self._io.packentry(self.index[i], self.node, self.version, i) |
|
1520 | 1520 | fp.write(e) |
|
1521 | 1521 | |
|
1522 | 1522 | # if we don't call close, the temp file will never replace the |
|
1523 | 1523 | # real index |
|
1524 | 1524 | fp.close() |
|
1525 | 1525 | |
|
1526 | 1526 | tr.replace(self.indexfile, trindex * self._io.size) |
|
1527 | 1527 | self._chunkclear() |
|
1528 | 1528 | |
|
1529 | 1529 | def addrevision(self, text, transaction, link, p1, p2, cachedelta=None, |
|
1530 | 1530 | node=None, flags=REVIDX_DEFAULT_FLAGS): |
|
1531 | 1531 | """add a revision to the log |
|
1532 | 1532 | |
|
1533 | 1533 | text - the revision data to add |
|
1534 | 1534 | transaction - the transaction object used for rollback |
|
1535 | 1535 | link - the linkrev data to add |
|
1536 | 1536 | p1, p2 - the parent nodeids of the revision |
|
1537 | 1537 | cachedelta - an optional precomputed delta |
|
1538 | 1538 | node - nodeid of revision; typically node is not specified, and it is |
|
1539 | 1539 | computed by default as hash(text, p1, p2), however subclasses might |
|
1540 | 1540 | use different hashing method (and override checkhash() in such case) |
|
1541 | 1541 | flags - the known flags to set on the revision |
|
1542 | 1542 | """ |
|
1543 | 1543 | if link == nullrev: |
|
1544 | 1544 | raise RevlogError(_("attempted to add linkrev -1 to %s") |
|
1545 | 1545 | % self.indexfile) |
|
1546 | 1546 | |
|
1547 | 1547 | if flags: |
|
1548 | 1548 | node = node or self.hash(text, p1, p2) |
|
1549 | 1549 | |
|
1550 | 1550 | rawtext, validatehash = self._processflags(text, flags, 'write') |
|
1551 | 1551 | |
|
1552 | 1552 | # If the flag processor modifies the revision data, ignore any provided |
|
1553 | 1553 | # cachedelta. |
|
1554 | 1554 | if rawtext != text: |
|
1555 | 1555 | cachedelta = None |
|
1556 | 1556 | |
|
1557 | 1557 | if len(rawtext) > _maxentrysize: |
|
1558 | 1558 | raise RevlogError( |
|
1559 | 1559 | _("%s: size of %d bytes exceeds maximum revlog storage of 2GiB") |
|
1560 | 1560 | % (self.indexfile, len(rawtext))) |
|
1561 | 1561 | |
|
1562 | 1562 | node = node or self.hash(rawtext, p1, p2) |
|
1563 | 1563 | if node in self.nodemap: |
|
1564 | 1564 | return node |
|
1565 | 1565 | |
|
1566 | 1566 | if validatehash: |
|
1567 | 1567 | self.checkhash(rawtext, node, p1=p1, p2=p2) |
|
1568 | 1568 | |
|
1569 | 1569 | return self.addrawrevision(rawtext, transaction, link, p1, p2, node, |
|
1570 | 1570 | flags, cachedelta=cachedelta) |
|
1571 | 1571 | |
|
1572 | 1572 | def addrawrevision(self, rawtext, transaction, link, p1, p2, node, flags, |
|
1573 | 1573 | cachedelta=None): |
|
1574 | 1574 | """add a raw revision with known flags, node and parents |
|
1575 | 1575 | useful when reusing a revision not stored in this revlog (ex: received |
|
1576 | 1576 | over wire, or read from an external bundle). |
|
1577 | 1577 | """ |
|
1578 | 1578 | dfh = None |
|
1579 | 1579 | if not self._inline: |
|
1580 | 1580 | dfh = self.opener(self.datafile, "a+") |
|
1581 | 1581 | ifh = self.opener(self.indexfile, "a+", checkambig=self._checkambig) |
|
1582 | 1582 | try: |
|
1583 | 1583 | return self._addrevision(node, rawtext, transaction, link, p1, p2, |
|
1584 | 1584 | flags, cachedelta, ifh, dfh) |
|
1585 | 1585 | finally: |
|
1586 | 1586 | if dfh: |
|
1587 | 1587 | dfh.close() |
|
1588 | 1588 | ifh.close() |
|
1589 | 1589 | |
|
1590 | 1590 | def compress(self, data): |
|
1591 | 1591 | """Generate a possibly-compressed representation of data.""" |
|
1592 | 1592 | if not data: |
|
1593 | 1593 | return '', data |
|
1594 | 1594 | |
|
1595 | 1595 | compressed = self._compressor.compress(data) |
|
1596 | 1596 | |
|
1597 | 1597 | if compressed: |
|
1598 | 1598 | # The revlog compressor added the header in the returned data. |
|
1599 | 1599 | return '', compressed |
|
1600 | 1600 | |
|
1601 | 1601 | if data[0:1] == '\0': |
|
1602 | 1602 | return '', data |
|
1603 | 1603 | return 'u', data |
|
1604 | 1604 | |
|
1605 | 1605 | def decompress(self, data): |
|
1606 | 1606 | """Decompress a revlog chunk. |
|
1607 | 1607 | |
|
1608 | 1608 | The chunk is expected to begin with a header identifying the |
|
1609 | 1609 | format type so it can be routed to an appropriate decompressor. |
|
1610 | 1610 | """ |
|
1611 | 1611 | if not data: |
|
1612 | 1612 | return data |
|
1613 | 1613 | |
|
1614 | 1614 | # Revlogs are read much more frequently than they are written and many |
|
1615 | 1615 | # chunks only take microseconds to decompress, so performance is |
|
1616 | 1616 | # important here. |
|
1617 | 1617 | # |
|
1618 | 1618 | # We can make a few assumptions about revlogs: |
|
1619 | 1619 | # |
|
1620 | 1620 | # 1) the majority of chunks will be compressed (as opposed to inline |
|
1621 | 1621 | # raw data). |
|
1622 | 1622 | # 2) decompressing *any* data will likely by at least 10x slower than |
|
1623 | 1623 | # returning raw inline data. |
|
1624 | 1624 | # 3) we want to prioritize common and officially supported compression |
|
1625 | 1625 | # engines |
|
1626 | 1626 | # |
|
1627 | 1627 | # It follows that we want to optimize for "decompress compressed data |
|
1628 | 1628 | # when encoded with common and officially supported compression engines" |
|
1629 | 1629 | # case over "raw data" and "data encoded by less common or non-official |
|
1630 | 1630 | # compression engines." That is why we have the inline lookup first |
|
1631 | 1631 | # followed by the compengines lookup. |
|
1632 | 1632 | # |
|
1633 | 1633 | # According to `hg perfrevlogchunks`, this is ~0.5% faster for zlib |
|
1634 | 1634 | # compressed chunks. And this matters for changelog and manifest reads. |
|
1635 | 1635 | t = data[0:1] |
|
1636 | 1636 | |
|
1637 | 1637 | if t == 'x': |
|
1638 | 1638 | try: |
|
1639 | 1639 | return _zlibdecompress(data) |
|
1640 | 1640 | except zlib.error as e: |
|
1641 | 1641 | raise RevlogError(_('revlog decompress error: %s') % str(e)) |
|
1642 | 1642 | # '\0' is more common than 'u' so it goes first. |
|
1643 | 1643 | elif t == '\0': |
|
1644 | 1644 | return data |
|
1645 | 1645 | elif t == 'u': |
|
1646 | 1646 | return util.buffer(data, 1) |
|
1647 | 1647 | |
|
1648 | 1648 | try: |
|
1649 | 1649 | compressor = self._decompressors[t] |
|
1650 | 1650 | except KeyError: |
|
1651 | 1651 | try: |
|
1652 | 1652 | engine = util.compengines.forrevlogheader(t) |
|
1653 | 1653 | compressor = engine.revlogcompressor() |
|
1654 | 1654 | self._decompressors[t] = compressor |
|
1655 | 1655 | except KeyError: |
|
1656 | 1656 | raise RevlogError(_('unknown compression type %r') % t) |
|
1657 | 1657 | |
|
1658 | 1658 | return compressor.decompress(data) |
|
1659 | 1659 | |
|
1660 | 1660 | def _isgooddelta(self, d, textlen): |
|
1661 | 1661 | """Returns True if the given delta is good. Good means that it is within |
|
1662 | 1662 | the disk span, disk size, and chain length bounds that we know to be |
|
1663 | 1663 | performant.""" |
|
1664 | 1664 | if d is None: |
|
1665 | 1665 | return False |
|
1666 | 1666 | |
|
1667 | 1667 | # - 'dist' is the distance from the base revision -- bounding it limits |
|
1668 | 1668 | # the amount of I/O we need to do. |
|
1669 | 1669 | # - 'compresseddeltalen' is the sum of the total size of deltas we need |
|
1670 | 1670 | # to apply -- bounding it limits the amount of CPU we consume. |
|
1671 | 1671 | dist, l, data, base, chainbase, chainlen, compresseddeltalen = d |
|
1672 | 1672 | |
|
1673 | 1673 | defaultmax = textlen * 4 |
|
1674 | 1674 | maxdist = self._maxdeltachainspan |
|
1675 | 1675 | if not maxdist: |
|
1676 | 1676 | maxdist = dist # ensure the conditional pass |
|
1677 | 1677 | maxdist = max(maxdist, defaultmax) |
|
1678 | 1678 | if (dist > maxdist or l > textlen or |
|
1679 | 1679 | compresseddeltalen > textlen * 2 or |
|
1680 | 1680 | (self._maxchainlen and chainlen > self._maxchainlen)): |
|
1681 | 1681 | return False |
|
1682 | 1682 | |
|
1683 | 1683 | return True |
|
1684 | 1684 | |
|
1685 | 1685 | def _addrevision(self, node, rawtext, transaction, link, p1, p2, flags, |
|
1686 | 1686 | cachedelta, ifh, dfh, alwayscache=False): |
|
1687 | 1687 | """internal function to add revisions to the log |
|
1688 | 1688 | |
|
1689 | 1689 | see addrevision for argument descriptions. |
|
1690 | 1690 | |
|
1691 | 1691 | note: "addrevision" takes non-raw text, "_addrevision" takes raw text. |
|
1692 | 1692 | |
|
1693 | 1693 | invariants: |
|
1694 | 1694 | - rawtext is optional (can be None); if not set, cachedelta must be set. |
|
1695 | 1695 | if both are set, they must correspond to each other. |
|
1696 | 1696 | """ |
|
1697 | 1697 | if node == nullid: |
|
1698 | 1698 | raise RevlogError(_("%s: attempt to add null revision") % |
|
1699 | 1699 | (self.indexfile)) |
|
1700 | if node == wdirid: | |
|
1701 | raise RevlogError(_("%s: attempt to add wdir revision") % | |
|
1702 | (self.indexfile)) | |
|
1703 | ||
|
1700 | 1704 | btext = [rawtext] |
|
1701 | 1705 | def buildtext(): |
|
1702 | 1706 | if btext[0] is not None: |
|
1703 | 1707 | return btext[0] |
|
1704 | 1708 | baserev = cachedelta[0] |
|
1705 | 1709 | delta = cachedelta[1] |
|
1706 | 1710 | # special case deltas which replace entire base; no need to decode |
|
1707 | 1711 | # base revision. this neatly avoids censored bases, which throw when |
|
1708 | 1712 | # they're decoded. |
|
1709 | 1713 | hlen = struct.calcsize(">lll") |
|
1710 | 1714 | if delta[:hlen] == mdiff.replacediffheader(self.rawsize(baserev), |
|
1711 | 1715 | len(delta) - hlen): |
|
1712 | 1716 | btext[0] = delta[hlen:] |
|
1713 | 1717 | else: |
|
1714 | 1718 | if self._inline: |
|
1715 | 1719 | fh = ifh |
|
1716 | 1720 | else: |
|
1717 | 1721 | fh = dfh |
|
1718 | 1722 | basetext = self.revision(baserev, _df=fh, raw=True) |
|
1719 | 1723 | btext[0] = mdiff.patch(basetext, delta) |
|
1720 | 1724 | |
|
1721 | 1725 | try: |
|
1722 | 1726 | res = self._processflags(btext[0], flags, 'read', raw=True) |
|
1723 | 1727 | btext[0], validatehash = res |
|
1724 | 1728 | if validatehash: |
|
1725 | 1729 | self.checkhash(btext[0], node, p1=p1, p2=p2) |
|
1726 | 1730 | if flags & REVIDX_ISCENSORED: |
|
1727 | 1731 | raise RevlogError(_('node %s is not censored') % node) |
|
1728 | 1732 | except CensoredNodeError: |
|
1729 | 1733 | # must pass the censored index flag to add censored revisions |
|
1730 | 1734 | if not flags & REVIDX_ISCENSORED: |
|
1731 | 1735 | raise |
|
1732 | 1736 | return btext[0] |
|
1733 | 1737 | |
|
1734 | 1738 | def builddelta(rev): |
|
1735 | 1739 | # can we use the cached delta? |
|
1736 | 1740 | if cachedelta and cachedelta[0] == rev: |
|
1737 | 1741 | delta = cachedelta[1] |
|
1738 | 1742 | else: |
|
1739 | 1743 | t = buildtext() |
|
1740 | 1744 | if self.iscensored(rev): |
|
1741 | 1745 | # deltas based on a censored revision must replace the |
|
1742 | 1746 | # full content in one patch, so delta works everywhere |
|
1743 | 1747 | header = mdiff.replacediffheader(self.rawsize(rev), len(t)) |
|
1744 | 1748 | delta = header + t |
|
1745 | 1749 | else: |
|
1746 | 1750 | if self._inline: |
|
1747 | 1751 | fh = ifh |
|
1748 | 1752 | else: |
|
1749 | 1753 | fh = dfh |
|
1750 | 1754 | ptext = self.revision(rev, _df=fh, raw=True) |
|
1751 | 1755 | delta = mdiff.textdiff(ptext, t) |
|
1752 | 1756 | header, data = self.compress(delta) |
|
1753 | 1757 | deltalen = len(header) + len(data) |
|
1754 | 1758 | chainbase = self.chainbase(rev) |
|
1755 | 1759 | dist = deltalen + offset - self.start(chainbase) |
|
1756 | 1760 | if self._generaldelta: |
|
1757 | 1761 | base = rev |
|
1758 | 1762 | else: |
|
1759 | 1763 | base = chainbase |
|
1760 | 1764 | chainlen, compresseddeltalen = self._chaininfo(rev) |
|
1761 | 1765 | chainlen += 1 |
|
1762 | 1766 | compresseddeltalen += deltalen |
|
1763 | 1767 | return (dist, deltalen, (header, data), base, |
|
1764 | 1768 | chainbase, chainlen, compresseddeltalen) |
|
1765 | 1769 | |
|
1766 | 1770 | curr = len(self) |
|
1767 | 1771 | prev = curr - 1 |
|
1768 | 1772 | offset = self.end(prev) |
|
1769 | 1773 | delta = None |
|
1770 | 1774 | p1r, p2r = self.rev(p1), self.rev(p2) |
|
1771 | 1775 | |
|
1772 | 1776 | # full versions are inserted when the needed deltas |
|
1773 | 1777 | # become comparable to the uncompressed text |
|
1774 | 1778 | if rawtext is None: |
|
1775 | 1779 | textlen = mdiff.patchedsize(self.rawsize(cachedelta[0]), |
|
1776 | 1780 | cachedelta[1]) |
|
1777 | 1781 | else: |
|
1778 | 1782 | textlen = len(rawtext) |
|
1779 | 1783 | |
|
1780 | 1784 | # should we try to build a delta? |
|
1781 | 1785 | if prev != nullrev and self.storedeltachains: |
|
1782 | 1786 | tested = set() |
|
1783 | 1787 | # This condition is true most of the time when processing |
|
1784 | 1788 | # changegroup data into a generaldelta repo. The only time it |
|
1785 | 1789 | # isn't true is if this is the first revision in a delta chain |
|
1786 | 1790 | # or if ``format.generaldelta=true`` disabled ``lazydeltabase``. |
|
1787 | 1791 | if cachedelta and self._generaldelta and self._lazydeltabase: |
|
1788 | 1792 | # Assume what we received from the server is a good choice |
|
1789 | 1793 | # build delta will reuse the cache |
|
1790 | 1794 | candidatedelta = builddelta(cachedelta[0]) |
|
1791 | 1795 | tested.add(cachedelta[0]) |
|
1792 | 1796 | if self._isgooddelta(candidatedelta, textlen): |
|
1793 | 1797 | delta = candidatedelta |
|
1794 | 1798 | if delta is None and self._generaldelta: |
|
1795 | 1799 | # exclude already lazy tested base if any |
|
1796 | 1800 | parents = [p for p in (p1r, p2r) |
|
1797 | 1801 | if p != nullrev and p not in tested] |
|
1798 | 1802 | if parents and not self._aggressivemergedeltas: |
|
1799 | 1803 | # Pick whichever parent is closer to us (to minimize the |
|
1800 | 1804 | # chance of having to build a fulltext). |
|
1801 | 1805 | parents = [max(parents)] |
|
1802 | 1806 | tested.update(parents) |
|
1803 | 1807 | pdeltas = [] |
|
1804 | 1808 | for p in parents: |
|
1805 | 1809 | pd = builddelta(p) |
|
1806 | 1810 | if self._isgooddelta(pd, textlen): |
|
1807 | 1811 | pdeltas.append(pd) |
|
1808 | 1812 | if pdeltas: |
|
1809 | 1813 | delta = min(pdeltas, key=lambda x: x[1]) |
|
1810 | 1814 | if delta is None and prev not in tested: |
|
1811 | 1815 | # other approach failed try against prev to hopefully save us a |
|
1812 | 1816 | # fulltext. |
|
1813 | 1817 | candidatedelta = builddelta(prev) |
|
1814 | 1818 | if self._isgooddelta(candidatedelta, textlen): |
|
1815 | 1819 | delta = candidatedelta |
|
1816 | 1820 | if delta is not None: |
|
1817 | 1821 | dist, l, data, base, chainbase, chainlen, compresseddeltalen = delta |
|
1818 | 1822 | else: |
|
1819 | 1823 | rawtext = buildtext() |
|
1820 | 1824 | data = self.compress(rawtext) |
|
1821 | 1825 | l = len(data[1]) + len(data[0]) |
|
1822 | 1826 | base = chainbase = curr |
|
1823 | 1827 | |
|
1824 | 1828 | e = (offset_type(offset, flags), l, textlen, |
|
1825 | 1829 | base, link, p1r, p2r, node) |
|
1826 | 1830 | self.index.insert(-1, e) |
|
1827 | 1831 | self.nodemap[node] = curr |
|
1828 | 1832 | |
|
1829 | 1833 | entry = self._io.packentry(e, self.node, self.version, curr) |
|
1830 | 1834 | self._writeentry(transaction, ifh, dfh, entry, data, link, offset) |
|
1831 | 1835 | |
|
1832 | 1836 | if alwayscache and rawtext is None: |
|
1833 | 1837 | rawtext = buildtext() |
|
1834 | 1838 | |
|
1835 | 1839 | if type(rawtext) == str: # only accept immutable objects |
|
1836 | 1840 | self._cache = (node, curr, rawtext) |
|
1837 | 1841 | self._chainbasecache[curr] = chainbase |
|
1838 | 1842 | return node |
|
1839 | 1843 | |
|
1840 | 1844 | def _writeentry(self, transaction, ifh, dfh, entry, data, link, offset): |
|
1841 | 1845 | # Files opened in a+ mode have inconsistent behavior on various |
|
1842 | 1846 | # platforms. Windows requires that a file positioning call be made |
|
1843 | 1847 | # when the file handle transitions between reads and writes. See |
|
1844 | 1848 | # 3686fa2b8eee and the mixedfilemodewrapper in windows.py. On other |
|
1845 | 1849 | # platforms, Python or the platform itself can be buggy. Some versions |
|
1846 | 1850 | # of Solaris have been observed to not append at the end of the file |
|
1847 | 1851 | # if the file was seeked to before the end. See issue4943 for more. |
|
1848 | 1852 | # |
|
1849 | 1853 | # We work around this issue by inserting a seek() before writing. |
|
1850 | 1854 | # Note: This is likely not necessary on Python 3. |
|
1851 | 1855 | ifh.seek(0, os.SEEK_END) |
|
1852 | 1856 | if dfh: |
|
1853 | 1857 | dfh.seek(0, os.SEEK_END) |
|
1854 | 1858 | |
|
1855 | 1859 | curr = len(self) - 1 |
|
1856 | 1860 | if not self._inline: |
|
1857 | 1861 | transaction.add(self.datafile, offset) |
|
1858 | 1862 | transaction.add(self.indexfile, curr * len(entry)) |
|
1859 | 1863 | if data[0]: |
|
1860 | 1864 | dfh.write(data[0]) |
|
1861 | 1865 | dfh.write(data[1]) |
|
1862 | 1866 | ifh.write(entry) |
|
1863 | 1867 | else: |
|
1864 | 1868 | offset += curr * self._io.size |
|
1865 | 1869 | transaction.add(self.indexfile, offset, curr) |
|
1866 | 1870 | ifh.write(entry) |
|
1867 | 1871 | ifh.write(data[0]) |
|
1868 | 1872 | ifh.write(data[1]) |
|
1869 | 1873 | self.checkinlinesize(transaction, ifh) |
|
1870 | 1874 | |
|
1871 | 1875 | def addgroup(self, cg, linkmapper, transaction, addrevisioncb=None): |
|
1872 | 1876 | """ |
|
1873 | 1877 | add a delta group |
|
1874 | 1878 | |
|
1875 | 1879 | given a set of deltas, add them to the revision log. the |
|
1876 | 1880 | first delta is against its parent, which should be in our |
|
1877 | 1881 | log, the rest are against the previous delta. |
|
1878 | 1882 | |
|
1879 | 1883 | If ``addrevisioncb`` is defined, it will be called with arguments of |
|
1880 | 1884 | this revlog and the node that was added. |
|
1881 | 1885 | """ |
|
1882 | 1886 | |
|
1883 | 1887 | nodes = [] |
|
1884 | 1888 | |
|
1885 | 1889 | r = len(self) |
|
1886 | 1890 | end = 0 |
|
1887 | 1891 | if r: |
|
1888 | 1892 | end = self.end(r - 1) |
|
1889 | 1893 | ifh = self.opener(self.indexfile, "a+", checkambig=self._checkambig) |
|
1890 | 1894 | isize = r * self._io.size |
|
1891 | 1895 | if self._inline: |
|
1892 | 1896 | transaction.add(self.indexfile, end + isize, r) |
|
1893 | 1897 | dfh = None |
|
1894 | 1898 | else: |
|
1895 | 1899 | transaction.add(self.indexfile, isize, r) |
|
1896 | 1900 | transaction.add(self.datafile, end) |
|
1897 | 1901 | dfh = self.opener(self.datafile, "a+") |
|
1898 | 1902 | def flush(): |
|
1899 | 1903 | if dfh: |
|
1900 | 1904 | dfh.flush() |
|
1901 | 1905 | ifh.flush() |
|
1902 | 1906 | try: |
|
1903 | 1907 | # loop through our set of deltas |
|
1904 | 1908 | chain = None |
|
1905 | 1909 | for chunkdata in iter(lambda: cg.deltachunk(chain), {}): |
|
1906 | 1910 | node = chunkdata['node'] |
|
1907 | 1911 | p1 = chunkdata['p1'] |
|
1908 | 1912 | p2 = chunkdata['p2'] |
|
1909 | 1913 | cs = chunkdata['cs'] |
|
1910 | 1914 | deltabase = chunkdata['deltabase'] |
|
1911 | 1915 | delta = chunkdata['delta'] |
|
1912 | 1916 | flags = chunkdata['flags'] or REVIDX_DEFAULT_FLAGS |
|
1913 | 1917 | |
|
1914 | 1918 | nodes.append(node) |
|
1915 | 1919 | |
|
1916 | 1920 | link = linkmapper(cs) |
|
1917 | 1921 | if node in self.nodemap: |
|
1918 | 1922 | # this can happen if two branches make the same change |
|
1919 | 1923 | chain = node |
|
1920 | 1924 | continue |
|
1921 | 1925 | |
|
1922 | 1926 | for p in (p1, p2): |
|
1923 | 1927 | if p not in self.nodemap: |
|
1924 | 1928 | raise LookupError(p, self.indexfile, |
|
1925 | 1929 | _('unknown parent')) |
|
1926 | 1930 | |
|
1927 | 1931 | if deltabase not in self.nodemap: |
|
1928 | 1932 | raise LookupError(deltabase, self.indexfile, |
|
1929 | 1933 | _('unknown delta base')) |
|
1930 | 1934 | |
|
1931 | 1935 | baserev = self.rev(deltabase) |
|
1932 | 1936 | |
|
1933 | 1937 | if baserev != nullrev and self.iscensored(baserev): |
|
1934 | 1938 | # if base is censored, delta must be full replacement in a |
|
1935 | 1939 | # single patch operation |
|
1936 | 1940 | hlen = struct.calcsize(">lll") |
|
1937 | 1941 | oldlen = self.rawsize(baserev) |
|
1938 | 1942 | newlen = len(delta) - hlen |
|
1939 | 1943 | if delta[:hlen] != mdiff.replacediffheader(oldlen, newlen): |
|
1940 | 1944 | raise error.CensoredBaseError(self.indexfile, |
|
1941 | 1945 | self.node(baserev)) |
|
1942 | 1946 | |
|
1943 | 1947 | if not flags and self._peek_iscensored(baserev, delta, flush): |
|
1944 | 1948 | flags |= REVIDX_ISCENSORED |
|
1945 | 1949 | |
|
1946 | 1950 | # We assume consumers of addrevisioncb will want to retrieve |
|
1947 | 1951 | # the added revision, which will require a call to |
|
1948 | 1952 | # revision(). revision() will fast path if there is a cache |
|
1949 | 1953 | # hit. So, we tell _addrevision() to always cache in this case. |
|
1950 | 1954 | # We're only using addgroup() in the context of changegroup |
|
1951 | 1955 | # generation so the revision data can always be handled as raw |
|
1952 | 1956 | # by the flagprocessor. |
|
1953 | 1957 | chain = self._addrevision(node, None, transaction, link, |
|
1954 | 1958 | p1, p2, flags, (baserev, delta), |
|
1955 | 1959 | ifh, dfh, |
|
1956 | 1960 | alwayscache=bool(addrevisioncb)) |
|
1957 | 1961 | |
|
1958 | 1962 | if addrevisioncb: |
|
1959 | 1963 | addrevisioncb(self, chain) |
|
1960 | 1964 | |
|
1961 | 1965 | if not dfh and not self._inline: |
|
1962 | 1966 | # addrevision switched from inline to conventional |
|
1963 | 1967 | # reopen the index |
|
1964 | 1968 | ifh.close() |
|
1965 | 1969 | dfh = self.opener(self.datafile, "a+") |
|
1966 | 1970 | ifh = self.opener(self.indexfile, "a+", |
|
1967 | 1971 | checkambig=self._checkambig) |
|
1968 | 1972 | finally: |
|
1969 | 1973 | if dfh: |
|
1970 | 1974 | dfh.close() |
|
1971 | 1975 | ifh.close() |
|
1972 | 1976 | |
|
1973 | 1977 | return nodes |
|
1974 | 1978 | |
|
1975 | 1979 | def iscensored(self, rev): |
|
1976 | 1980 | """Check if a file revision is censored.""" |
|
1977 | 1981 | return False |
|
1978 | 1982 | |
|
1979 | 1983 | def _peek_iscensored(self, baserev, delta, flush): |
|
1980 | 1984 | """Quickly check if a delta produces a censored revision.""" |
|
1981 | 1985 | return False |
|
1982 | 1986 | |
|
1983 | 1987 | def getstrippoint(self, minlink): |
|
1984 | 1988 | """find the minimum rev that must be stripped to strip the linkrev |
|
1985 | 1989 | |
|
1986 | 1990 | Returns a tuple containing the minimum rev and a set of all revs that |
|
1987 | 1991 | have linkrevs that will be broken by this strip. |
|
1988 | 1992 | """ |
|
1989 | 1993 | brokenrevs = set() |
|
1990 | 1994 | strippoint = len(self) |
|
1991 | 1995 | |
|
1992 | 1996 | heads = {} |
|
1993 | 1997 | futurelargelinkrevs = set() |
|
1994 | 1998 | for head in self.headrevs(): |
|
1995 | 1999 | headlinkrev = self.linkrev(head) |
|
1996 | 2000 | heads[head] = headlinkrev |
|
1997 | 2001 | if headlinkrev >= minlink: |
|
1998 | 2002 | futurelargelinkrevs.add(headlinkrev) |
|
1999 | 2003 | |
|
2000 | 2004 | # This algorithm involves walking down the rev graph, starting at the |
|
2001 | 2005 | # heads. Since the revs are topologically sorted according to linkrev, |
|
2002 | 2006 | # once all head linkrevs are below the minlink, we know there are |
|
2003 | 2007 | # no more revs that could have a linkrev greater than minlink. |
|
2004 | 2008 | # So we can stop walking. |
|
2005 | 2009 | while futurelargelinkrevs: |
|
2006 | 2010 | strippoint -= 1 |
|
2007 | 2011 | linkrev = heads.pop(strippoint) |
|
2008 | 2012 | |
|
2009 | 2013 | if linkrev < minlink: |
|
2010 | 2014 | brokenrevs.add(strippoint) |
|
2011 | 2015 | else: |
|
2012 | 2016 | futurelargelinkrevs.remove(linkrev) |
|
2013 | 2017 | |
|
2014 | 2018 | for p in self.parentrevs(strippoint): |
|
2015 | 2019 | if p != nullrev: |
|
2016 | 2020 | plinkrev = self.linkrev(p) |
|
2017 | 2021 | heads[p] = plinkrev |
|
2018 | 2022 | if plinkrev >= minlink: |
|
2019 | 2023 | futurelargelinkrevs.add(plinkrev) |
|
2020 | 2024 | |
|
2021 | 2025 | return strippoint, brokenrevs |
|
2022 | 2026 | |
|
2023 | 2027 | def strip(self, minlink, transaction): |
|
2024 | 2028 | """truncate the revlog on the first revision with a linkrev >= minlink |
|
2025 | 2029 | |
|
2026 | 2030 | This function is called when we're stripping revision minlink and |
|
2027 | 2031 | its descendants from the repository. |
|
2028 | 2032 | |
|
2029 | 2033 | We have to remove all revisions with linkrev >= minlink, because |
|
2030 | 2034 | the equivalent changelog revisions will be renumbered after the |
|
2031 | 2035 | strip. |
|
2032 | 2036 | |
|
2033 | 2037 | So we truncate the revlog on the first of these revisions, and |
|
2034 | 2038 | trust that the caller has saved the revisions that shouldn't be |
|
2035 | 2039 | removed and that it'll re-add them after this truncation. |
|
2036 | 2040 | """ |
|
2037 | 2041 | if len(self) == 0: |
|
2038 | 2042 | return |
|
2039 | 2043 | |
|
2040 | 2044 | rev, _ = self.getstrippoint(minlink) |
|
2041 | 2045 | if rev == len(self): |
|
2042 | 2046 | return |
|
2043 | 2047 | |
|
2044 | 2048 | # first truncate the files on disk |
|
2045 | 2049 | end = self.start(rev) |
|
2046 | 2050 | if not self._inline: |
|
2047 | 2051 | transaction.add(self.datafile, end) |
|
2048 | 2052 | end = rev * self._io.size |
|
2049 | 2053 | else: |
|
2050 | 2054 | end += rev * self._io.size |
|
2051 | 2055 | |
|
2052 | 2056 | transaction.add(self.indexfile, end) |
|
2053 | 2057 | |
|
2054 | 2058 | # then reset internal state in memory to forget those revisions |
|
2055 | 2059 | self._cache = None |
|
2056 | 2060 | self._chaininfocache = {} |
|
2057 | 2061 | self._chunkclear() |
|
2058 | 2062 | for x in xrange(rev, len(self)): |
|
2059 | 2063 | del self.nodemap[self.node(x)] |
|
2060 | 2064 | |
|
2061 | 2065 | del self.index[rev:-1] |
|
2062 | 2066 | |
|
2063 | 2067 | def checksize(self): |
|
2064 | 2068 | expected = 0 |
|
2065 | 2069 | if len(self): |
|
2066 | 2070 | expected = max(0, self.end(len(self) - 1)) |
|
2067 | 2071 | |
|
2068 | 2072 | try: |
|
2069 | 2073 | f = self.opener(self.datafile) |
|
2070 | 2074 | f.seek(0, 2) |
|
2071 | 2075 | actual = f.tell() |
|
2072 | 2076 | f.close() |
|
2073 | 2077 | dd = actual - expected |
|
2074 | 2078 | except IOError as inst: |
|
2075 | 2079 | if inst.errno != errno.ENOENT: |
|
2076 | 2080 | raise |
|
2077 | 2081 | dd = 0 |
|
2078 | 2082 | |
|
2079 | 2083 | try: |
|
2080 | 2084 | f = self.opener(self.indexfile) |
|
2081 | 2085 | f.seek(0, 2) |
|
2082 | 2086 | actual = f.tell() |
|
2083 | 2087 | f.close() |
|
2084 | 2088 | s = self._io.size |
|
2085 | 2089 | i = max(0, actual // s) |
|
2086 | 2090 | di = actual - (i * s) |
|
2087 | 2091 | if self._inline: |
|
2088 | 2092 | databytes = 0 |
|
2089 | 2093 | for r in self: |
|
2090 | 2094 | databytes += max(0, self.length(r)) |
|
2091 | 2095 | dd = 0 |
|
2092 | 2096 | di = actual - len(self) * s - databytes |
|
2093 | 2097 | except IOError as inst: |
|
2094 | 2098 | if inst.errno != errno.ENOENT: |
|
2095 | 2099 | raise |
|
2096 | 2100 | di = 0 |
|
2097 | 2101 | |
|
2098 | 2102 | return (dd, di) |
|
2099 | 2103 | |
|
2100 | 2104 | def files(self): |
|
2101 | 2105 | res = [self.indexfile] |
|
2102 | 2106 | if not self._inline: |
|
2103 | 2107 | res.append(self.datafile) |
|
2104 | 2108 | return res |
|
2105 | 2109 | |
|
2106 | 2110 | DELTAREUSEALWAYS = 'always' |
|
2107 | 2111 | DELTAREUSESAMEREVS = 'samerevs' |
|
2108 | 2112 | DELTAREUSENEVER = 'never' |
|
2109 | 2113 | |
|
2110 | 2114 | DELTAREUSEALL = {'always', 'samerevs', 'never'} |
|
2111 | 2115 | |
|
2112 | 2116 | def clone(self, tr, destrevlog, addrevisioncb=None, |
|
2113 | 2117 | deltareuse=DELTAREUSESAMEREVS, aggressivemergedeltas=None): |
|
2114 | 2118 | """Copy this revlog to another, possibly with format changes. |
|
2115 | 2119 | |
|
2116 | 2120 | The destination revlog will contain the same revisions and nodes. |
|
2117 | 2121 | However, it may not be bit-for-bit identical due to e.g. delta encoding |
|
2118 | 2122 | differences. |
|
2119 | 2123 | |
|
2120 | 2124 | The ``deltareuse`` argument control how deltas from the existing revlog |
|
2121 | 2125 | are preserved in the destination revlog. The argument can have the |
|
2122 | 2126 | following values: |
|
2123 | 2127 | |
|
2124 | 2128 | DELTAREUSEALWAYS |
|
2125 | 2129 | Deltas will always be reused (if possible), even if the destination |
|
2126 | 2130 | revlog would not select the same revisions for the delta. This is the |
|
2127 | 2131 | fastest mode of operation. |
|
2128 | 2132 | DELTAREUSESAMEREVS |
|
2129 | 2133 | Deltas will be reused if the destination revlog would pick the same |
|
2130 | 2134 | revisions for the delta. This mode strikes a balance between speed |
|
2131 | 2135 | and optimization. |
|
2132 | 2136 | DELTAREUSENEVER |
|
2133 | 2137 | Deltas will never be reused. This is the slowest mode of execution. |
|
2134 | 2138 | This mode can be used to recompute deltas (e.g. if the diff/delta |
|
2135 | 2139 | algorithm changes). |
|
2136 | 2140 | |
|
2137 | 2141 | Delta computation can be slow, so the choice of delta reuse policy can |
|
2138 | 2142 | significantly affect run time. |
|
2139 | 2143 | |
|
2140 | 2144 | The default policy (``DELTAREUSESAMEREVS``) strikes a balance between |
|
2141 | 2145 | two extremes. Deltas will be reused if they are appropriate. But if the |
|
2142 | 2146 | delta could choose a better revision, it will do so. This means if you |
|
2143 | 2147 | are converting a non-generaldelta revlog to a generaldelta revlog, |
|
2144 | 2148 | deltas will be recomputed if the delta's parent isn't a parent of the |
|
2145 | 2149 | revision. |
|
2146 | 2150 | |
|
2147 | 2151 | In addition to the delta policy, the ``aggressivemergedeltas`` argument |
|
2148 | 2152 | controls whether to compute deltas against both parents for merges. |
|
2149 | 2153 | By default, the current default is used. |
|
2150 | 2154 | """ |
|
2151 | 2155 | if deltareuse not in self.DELTAREUSEALL: |
|
2152 | 2156 | raise ValueError(_('value for deltareuse invalid: %s') % deltareuse) |
|
2153 | 2157 | |
|
2154 | 2158 | if len(destrevlog): |
|
2155 | 2159 | raise ValueError(_('destination revlog is not empty')) |
|
2156 | 2160 | |
|
2157 | 2161 | if getattr(self, 'filteredrevs', None): |
|
2158 | 2162 | raise ValueError(_('source revlog has filtered revisions')) |
|
2159 | 2163 | if getattr(destrevlog, 'filteredrevs', None): |
|
2160 | 2164 | raise ValueError(_('destination revlog has filtered revisions')) |
|
2161 | 2165 | |
|
2162 | 2166 | # lazydeltabase controls whether to reuse a cached delta, if possible. |
|
2163 | 2167 | oldlazydeltabase = destrevlog._lazydeltabase |
|
2164 | 2168 | oldamd = destrevlog._aggressivemergedeltas |
|
2165 | 2169 | |
|
2166 | 2170 | try: |
|
2167 | 2171 | if deltareuse == self.DELTAREUSEALWAYS: |
|
2168 | 2172 | destrevlog._lazydeltabase = True |
|
2169 | 2173 | elif deltareuse == self.DELTAREUSESAMEREVS: |
|
2170 | 2174 | destrevlog._lazydeltabase = False |
|
2171 | 2175 | |
|
2172 | 2176 | destrevlog._aggressivemergedeltas = aggressivemergedeltas or oldamd |
|
2173 | 2177 | |
|
2174 | 2178 | populatecachedelta = deltareuse in (self.DELTAREUSEALWAYS, |
|
2175 | 2179 | self.DELTAREUSESAMEREVS) |
|
2176 | 2180 | |
|
2177 | 2181 | index = self.index |
|
2178 | 2182 | for rev in self: |
|
2179 | 2183 | entry = index[rev] |
|
2180 | 2184 | |
|
2181 | 2185 | # Some classes override linkrev to take filtered revs into |
|
2182 | 2186 | # account. Use raw entry from index. |
|
2183 | 2187 | flags = entry[0] & 0xffff |
|
2184 | 2188 | linkrev = entry[4] |
|
2185 | 2189 | p1 = index[entry[5]][7] |
|
2186 | 2190 | p2 = index[entry[6]][7] |
|
2187 | 2191 | node = entry[7] |
|
2188 | 2192 | |
|
2189 | 2193 | # (Possibly) reuse the delta from the revlog if allowed and |
|
2190 | 2194 | # the revlog chunk is a delta. |
|
2191 | 2195 | cachedelta = None |
|
2192 | 2196 | rawtext = None |
|
2193 | 2197 | if populatecachedelta: |
|
2194 | 2198 | dp = self.deltaparent(rev) |
|
2195 | 2199 | if dp != nullrev: |
|
2196 | 2200 | cachedelta = (dp, str(self._chunk(rev))) |
|
2197 | 2201 | |
|
2198 | 2202 | if not cachedelta: |
|
2199 | 2203 | rawtext = self.revision(rev, raw=True) |
|
2200 | 2204 | |
|
2201 | 2205 | ifh = destrevlog.opener(destrevlog.indexfile, 'a+', |
|
2202 | 2206 | checkambig=False) |
|
2203 | 2207 | dfh = None |
|
2204 | 2208 | if not destrevlog._inline: |
|
2205 | 2209 | dfh = destrevlog.opener(destrevlog.datafile, 'a+') |
|
2206 | 2210 | try: |
|
2207 | 2211 | destrevlog._addrevision(node, rawtext, tr, linkrev, p1, p2, |
|
2208 | 2212 | flags, cachedelta, ifh, dfh) |
|
2209 | 2213 | finally: |
|
2210 | 2214 | if dfh: |
|
2211 | 2215 | dfh.close() |
|
2212 | 2216 | ifh.close() |
|
2213 | 2217 | |
|
2214 | 2218 | if addrevisioncb: |
|
2215 | 2219 | addrevisioncb(self, rev, node) |
|
2216 | 2220 | finally: |
|
2217 | 2221 | destrevlog._lazydeltabase = oldlazydeltabase |
|
2218 | 2222 | destrevlog._aggressivemergedeltas = oldamd |
General Comments 0
You need to be logged in to leave comments.
Login now