hg/gitweb: mercurial/revlog.py annotate

annotate mercurial/revlog.py @ 67:a182f2561c8e

Add tag support

author	mpm@selenic.com
date	Fri, 13 May 2005 13:12:32 -0800
parents	d40cc5aacc31
children	47c9a869adee

rev	line source
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	1 # revlog.py - storage back-end for mercurial
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	2 #
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	3 # This provides efficient delta storage with O(1) retrieve and append
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	4 # and O(changes) merge between branches
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	5 #
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	6 # Copyright 2005 Matt Mackall <mpm@selenic.com>
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	7 #
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	8 # This software may be used and distributed according to the terms
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	9 # of the GNU General Public License, incorporated herein by reference.
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	10
36 da28286bf6b7 Add smart node lookup by substring or by rev number mpm@selenic.com parents: 26 diff changeset	11 import zlib, struct, sha, os, tempfile, binascii
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	12 from mercurial import mdiff
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	13
36 da28286bf6b7 Add smart node lookup by substring or by rev number mpm@selenic.com parents: 26 diff changeset	14 def hex(node): return binascii.hexlify(node)
da28286bf6b7 Add smart node lookup by substring or by rev number mpm@selenic.com parents: 26 diff changeset	15 def bin(node): return binascii.unhexlify(node)
da28286bf6b7 Add smart node lookup by substring or by rev number mpm@selenic.com parents: 26 diff changeset	16
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	17 def compress(text):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	18 return zlib.compress(text)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	19
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	20 def decompress(bin):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	21 return zlib.decompress(bin)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	22
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	23 def hash(text, p1, p2):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	24 l = [p1, p2]
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	25 l.sort()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	26 return sha.sha(l[0] + l[1] + text).digest()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	27
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	28 nullid = "\0" * 20
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	29 indexformat = ">4l20s20s20s"
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	30
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	31 class revlog:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	32 def __init__(self, opener, indexfile, datafile):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	33 self.indexfile = indexfile
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	34 self.datafile = datafile
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	35 self.index = []
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	36 self.opener = opener
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	37 self.cache = None
36 da28286bf6b7 Add smart node lookup by substring or by rev number mpm@selenic.com parents: 26 diff changeset	38 self.nodemap = {nullid: -1}
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	39 # read the whole index for now, handle on-demand later
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	40 try:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	41 n = 0
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	42 i = self.opener(self.indexfile).read()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	43 s = struct.calcsize(indexformat)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	44 for f in range(0, len(i), s):
26 9cf83bf9ad38 Simplify integrity checking mpm@selenic.com parents: 14 diff changeset	45 # offset, size, base, linkrev, p1, p2, nodeid
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	46 e = struct.unpack(indexformat, i[f:f + s])
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	47 self.nodemap[e[6]] = n
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	48 self.index.append(e)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	49 n += 1
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	50 except IOError: pass
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	51
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	52 def tip(self): return self.node(len(self.index) - 1)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	53 def count(self): return len(self.index)
26 9cf83bf9ad38 Simplify integrity checking mpm@selenic.com parents: 14 diff changeset	54 def node(self, rev): return (rev < 0) and nullid or self.index[rev][6]
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	55 def rev(self, node): return self.nodemap[node]
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	56 def linkrev(self, node): return self.index[self.nodemap[node]][3]
2 ecf3fd948051 Handle nullid better for ancestor mpm@selenic.com parents: 0 diff changeset	57 def parents(self, node):
ecf3fd948051 Handle nullid better for ancestor mpm@selenic.com parents: 0 diff changeset	58 if node == nullid: return (nullid, nullid)
ecf3fd948051 Handle nullid better for ancestor mpm@selenic.com parents: 0 diff changeset	59 return self.index[self.nodemap[node]][4:6]
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	60
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	61 def start(self, rev): return self.index[rev][0]
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	62 def length(self, rev): return self.index[rev][1]
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	63 def end(self, rev): return self.start(rev) + self.length(rev)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	64 def base(self, rev): return self.index[rev][2]
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	65
36 da28286bf6b7 Add smart node lookup by substring or by rev number mpm@selenic.com parents: 26 diff changeset	66 def lookup(self, id):
da28286bf6b7 Add smart node lookup by substring or by rev number mpm@selenic.com parents: 26 diff changeset	67 try:
da28286bf6b7 Add smart node lookup by substring or by rev number mpm@selenic.com parents: 26 diff changeset	68 rev = int(id)
da28286bf6b7 Add smart node lookup by substring or by rev number mpm@selenic.com parents: 26 diff changeset	69 return self.node(rev)
da28286bf6b7 Add smart node lookup by substring or by rev number mpm@selenic.com parents: 26 diff changeset	70 except ValueError:
da28286bf6b7 Add smart node lookup by substring or by rev number mpm@selenic.com parents: 26 diff changeset	71 c = []
da28286bf6b7 Add smart node lookup by substring or by rev number mpm@selenic.com parents: 26 diff changeset	72 for n in self.nodemap:
da28286bf6b7 Add smart node lookup by substring or by rev number mpm@selenic.com parents: 26 diff changeset	73 if id in hex(n):
da28286bf6b7 Add smart node lookup by substring or by rev number mpm@selenic.com parents: 26 diff changeset	74 c.append(n)
da28286bf6b7 Add smart node lookup by substring or by rev number mpm@selenic.com parents: 26 diff changeset	75 if len(c) > 1: raise KeyError("Ambiguous identifier")
67 a182f2561c8e Add tag support mpm@selenic.com parents: 65 diff changeset	76 if len(c) < 1: raise KeyError("No match found")
36 da28286bf6b7 Add smart node lookup by substring or by rev number mpm@selenic.com parents: 26 diff changeset	77 return c[0]
da28286bf6b7 Add smart node lookup by substring or by rev number mpm@selenic.com parents: 26 diff changeset	78
da28286bf6b7 Add smart node lookup by substring or by rev number mpm@selenic.com parents: 26 diff changeset	79 return None
da28286bf6b7 Add smart node lookup by substring or by rev number mpm@selenic.com parents: 26 diff changeset	80
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	81 def revisions(self, list):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	82 # this can be optimized to do spans, etc
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	83 # be stupid for now
14 e0e5c1b9febd Fix off-by-one truncation in transaction rollback. mpm@selenic.com parents: 2 diff changeset	84 for node in list:
e0e5c1b9febd Fix off-by-one truncation in transaction rollback. mpm@selenic.com parents: 2 diff changeset	85 yield self.revision(node)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	86
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	87 def diff(self, a, b):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	88 return mdiff.textdiff(a, b)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	89
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	90 def patch(self, text, patch):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	91 return mdiff.patch(text, patch)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	92
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	93 def revision(self, node):
36 da28286bf6b7 Add smart node lookup by substring or by rev number mpm@selenic.com parents: 26 diff changeset	94 if node == nullid: return ""
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	95 if self.cache and self.cache[0] == node: return self.cache[2]
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	96
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	97 text = None
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	98 rev = self.rev(node)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	99 base = self.base(rev)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	100 start = self.start(base)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	101 end = self.end(rev)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	102
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	103 if self.cache and self.cache[1] >= base and self.cache[1] < rev:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	104 base = self.cache[1]
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	105 start = self.start(base + 1)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	106 text = self.cache[2]
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	107 last = 0
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	108
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	109 f = self.opener(self.datafile)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	110 f.seek(start)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	111 data = f.read(end - start)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	112
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	113 if not text:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	114 last = self.length(base)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	115 text = decompress(data[:last])
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	116
64 b3e2ddff0159 Diff in subdirectories from Jake Edge mpm@selenic.com parents: 46 diff changeset	117 for r in xrange(base + 1, rev + 1):
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	118 s = self.length(r)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	119 b = decompress(data[last:last + s])
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	120 text = self.patch(text, b)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	121 last = last + s
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	122
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	123 (p1, p2) = self.parents(node)
26 9cf83bf9ad38 Simplify integrity checking mpm@selenic.com parents: 14 diff changeset	124 if node != hash(text, p1, p2):
9cf83bf9ad38 Simplify integrity checking mpm@selenic.com parents: 14 diff changeset	125 raise "integrity check failed on %s:%d" % (self.datafile, rev)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	126
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	127 self.cache = (node, rev, text)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	128 return text
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	129
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	130 def addrevision(self, text, transaction, link, p1=None, p2=None):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	131 if text is None: text = ""
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	132 if p1 is None: p1 = self.tip()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	133 if p2 is None: p2 = nullid
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	134
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	135 node = hash(text, p1, p2)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	136
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	137 n = self.count()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	138 t = n - 1
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	139
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	140 if n:
64 b3e2ddff0159 Diff in subdirectories from Jake Edge mpm@selenic.com parents: 46 diff changeset	141 base = self.base(t)
b3e2ddff0159 Diff in subdirectories from Jake Edge mpm@selenic.com parents: 46 diff changeset	142 start = self.start(base)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	143 end = self.end(t)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	144 prev = self.revision(self.tip())
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	145 data = compress(self.diff(prev, text))
64 b3e2ddff0159 Diff in subdirectories from Jake Edge mpm@selenic.com parents: 46 diff changeset	146 dist = end - start + len(data)
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	147
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	148 # full versions are inserted when the needed deltas
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	149 # become comparable to the uncompressed text
64 b3e2ddff0159 Diff in subdirectories from Jake Edge mpm@selenic.com parents: 46 diff changeset	150 if not n or dist > len(text) * 2:
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	151 data = compress(text)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	152 base = n
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	153 else:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	154 base = self.base(t)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	155
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	156 offset = 0
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	157 if t >= 0:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	158 offset = self.end(t)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	159
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	160 e = (offset, len(data), base, link, p1, p2, node)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	161
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	162 self.index.append(e)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	163 self.nodemap[node] = n
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	164 entry = struct.pack(indexformat, *e)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	165
26 9cf83bf9ad38 Simplify integrity checking mpm@selenic.com parents: 14 diff changeset	166 transaction.add(self.datafile, e[0])
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	167 self.opener(self.datafile, "a").write(data)
41 df3f46253878 Fix truncate logic for indices again mpm@selenic.com parents: 36 diff changeset	168 transaction.add(self.indexfile, n * len(entry))
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	169 self.opener(self.indexfile, "a").write(entry)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	170
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	171 self.cache = (node, n, text)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	172 return node
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	173
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	174 def ancestor(self, a, b):
45 f2b2d5daec30 Fix recursion depth trouble with ancestor algorithm mpm@selenic.com parents: 41 diff changeset	175 def expand(list, map):
f2b2d5daec30 Fix recursion depth trouble with ancestor algorithm mpm@selenic.com parents: 41 diff changeset	176 a = []
f2b2d5daec30 Fix recursion depth trouble with ancestor algorithm mpm@selenic.com parents: 41 diff changeset	177 while list:
f2b2d5daec30 Fix recursion depth trouble with ancestor algorithm mpm@selenic.com parents: 41 diff changeset	178 n = list.pop(0)
f2b2d5daec30 Fix recursion depth trouble with ancestor algorithm mpm@selenic.com parents: 41 diff changeset	179 map[n] = 1
f2b2d5daec30 Fix recursion depth trouble with ancestor algorithm mpm@selenic.com parents: 41 diff changeset	180 yield n
f2b2d5daec30 Fix recursion depth trouble with ancestor algorithm mpm@selenic.com parents: 41 diff changeset	181 for p in self.parents(n):
f2b2d5daec30 Fix recursion depth trouble with ancestor algorithm mpm@selenic.com parents: 41 diff changeset	182 if p != nullid and p not in map:
f2b2d5daec30 Fix recursion depth trouble with ancestor algorithm mpm@selenic.com parents: 41 diff changeset	183 list.append(p)
f2b2d5daec30 Fix recursion depth trouble with ancestor algorithm mpm@selenic.com parents: 41 diff changeset	184 yield nullid
f2b2d5daec30 Fix recursion depth trouble with ancestor algorithm mpm@selenic.com parents: 41 diff changeset	185
f2b2d5daec30 Fix recursion depth trouble with ancestor algorithm mpm@selenic.com parents: 41 diff changeset	186 amap = {}
f2b2d5daec30 Fix recursion depth trouble with ancestor algorithm mpm@selenic.com parents: 41 diff changeset	187 bmap = {}
f2b2d5daec30 Fix recursion depth trouble with ancestor algorithm mpm@selenic.com parents: 41 diff changeset	188 ag = expand([a], amap)
f2b2d5daec30 Fix recursion depth trouble with ancestor algorithm mpm@selenic.com parents: 41 diff changeset	189 bg = expand([b], bmap)
f2b2d5daec30 Fix recursion depth trouble with ancestor algorithm mpm@selenic.com parents: 41 diff changeset	190 adone = bdone = 0
f2b2d5daec30 Fix recursion depth trouble with ancestor algorithm mpm@selenic.com parents: 41 diff changeset	191
f2b2d5daec30 Fix recursion depth trouble with ancestor algorithm mpm@selenic.com parents: 41 diff changeset	192 while not adone or not bdone:
f2b2d5daec30 Fix recursion depth trouble with ancestor algorithm mpm@selenic.com parents: 41 diff changeset	193 if not adone:
f2b2d5daec30 Fix recursion depth trouble with ancestor algorithm mpm@selenic.com parents: 41 diff changeset	194 an = ag.next()
f2b2d5daec30 Fix recursion depth trouble with ancestor algorithm mpm@selenic.com parents: 41 diff changeset	195 if an == nullid:
f2b2d5daec30 Fix recursion depth trouble with ancestor algorithm mpm@selenic.com parents: 41 diff changeset	196 adone = 1
f2b2d5daec30 Fix recursion depth trouble with ancestor algorithm mpm@selenic.com parents: 41 diff changeset	197 elif an in bmap:
f2b2d5daec30 Fix recursion depth trouble with ancestor algorithm mpm@selenic.com parents: 41 diff changeset	198 return an
f2b2d5daec30 Fix recursion depth trouble with ancestor algorithm mpm@selenic.com parents: 41 diff changeset	199 if not bdone:
f2b2d5daec30 Fix recursion depth trouble with ancestor algorithm mpm@selenic.com parents: 41 diff changeset	200 bn = bg.next()
f2b2d5daec30 Fix recursion depth trouble with ancestor algorithm mpm@selenic.com parents: 41 diff changeset	201 if bn == nullid:
f2b2d5daec30 Fix recursion depth trouble with ancestor algorithm mpm@selenic.com parents: 41 diff changeset	202 bdone = 1
f2b2d5daec30 Fix recursion depth trouble with ancestor algorithm mpm@selenic.com parents: 41 diff changeset	203 elif bn in amap:
f2b2d5daec30 Fix recursion depth trouble with ancestor algorithm mpm@selenic.com parents: 41 diff changeset	204 return bn
f2b2d5daec30 Fix recursion depth trouble with ancestor algorithm mpm@selenic.com parents: 41 diff changeset	205
f2b2d5daec30 Fix recursion depth trouble with ancestor algorithm mpm@selenic.com parents: 41 diff changeset	206 return nullid
0 9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	207
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	208 def mergedag(self, other, transaction, linkseq, accumulate = None):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	209 """combine the nodes from other's DAG into ours"""
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	210 old = self.tip()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	211 i = self.count()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	212 l = []
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	213
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	214 # merge the other revision log into our DAG
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	215 for r in range(other.count()):
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	216 id = other.node(r)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	217 if id not in self.nodemap:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	218 (xn, yn) = other.parents(id)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	219 l.append((id, xn, yn))
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	220 self.nodemap[id] = i
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	221 i += 1
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	222
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	223 # merge node date for new nodes
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	224 r = other.revisions([e[0] for e in l])
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	225 for e in l:
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	226 t = r.next()
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	227 if accumulate: accumulate(t)
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	228 self.addrevision(t, transaction, linkseq.next(), e[1], e[2])
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	229
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	230 # return the unmerged heads for later resolving
9117c6561b0b Add back links from file revisions to changeset revisions mpm@selenic.com parents: diff changeset	231 return (old, self.tip())
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	232
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	233 def group(self, linkmap):
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	234 # given a list of changeset revs, return a set of deltas and
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	235 # metadata corresponding to nodes the first delta is
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	236 # parent(nodes[0]) -> nodes[0] the receiver is guaranteed to
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	237 # have this parent as it has all history before these
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	238 # changesets. parent is parent[0]
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	239
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	240 revs = []
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	241 needed = {}
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	242
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	243 # find file nodes/revs that match changeset revs
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	244 for i in xrange(0, self.count()):
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	245 if self.index[i][3] in linkmap:
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	246 revs.append(i)
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	247 needed[i] = 1
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	248
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	249 # if we don't have any revisions touched by these changesets, bail
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	250 if not revs: return struct.pack(">l", 0)
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	251
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	252 # add the parent of the first rev
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	253 p = self.parents(self.node(revs[0]))[0]
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	254 revs.insert(0, self.rev(p))
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	255
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	256 # for each delta that isn't contiguous in the log, we need to
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	257 # reconstruct the base, reconstruct the result, and then
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	258 # calculate the delta. We also need to do this where we've
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	259 # stored a full version and not a delta
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	260 for i in xrange(0, len(revs) - 1):
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	261 a, b = revs[i], revs[i + 1]
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	262 if a + 1 != b or self.base(b) == b:
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	263 for j in xrange(self.base(a), a + 1):
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	264 needed[j] = 1
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	265 for j in xrange(self.base(b), b + 1):
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	266 needed[j] = 1
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	267
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	268 # calculate spans to retrieve from datafile
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	269 needed = needed.keys()
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	270 needed.sort()
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	271 spans = []
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	272 for n in needed:
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	273 if n < 0: continue
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	274 o = self.start(n)
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	275 l = self.length(n)
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	276 spans.append((o, l, [(n, l)]))
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	277
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	278 # merge spans
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	279 merge = [spans.pop(0)]
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	280 while spans:
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	281 e = spans.pop(0)
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	282 f = merge[-1]
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	283 if e[0] == f[0] + f[1]:
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	284 merge[-1] = (f[0], f[1] + e[1], f[2] + e[2])
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	285 else:
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	286 merge.append(e)
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	287
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	288 # read spans in, divide up chunks
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	289 chunks = {}
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	290 for span in merge:
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	291 # we reopen the file for each span to make http happy for now
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	292 f = self.opener(self.datafile)
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	293 f.seek(span[0])
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	294 data = f.read(span[1])
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	295
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	296 # divide up the span
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	297 pos = 0
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	298 for r, l in span[2]:
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	299 chunks[r] = data[pos: pos + l]
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	300 pos += l
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	301
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	302 # helper to reconstruct intermediate versions
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	303 def construct(text, base, rev):
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	304 for r in range(base + 1, rev + 1):
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	305 b = decompress(chunks[r])
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	306 text = self.patch(text, b)
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	307 return text
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	308
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	309 # build deltas
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	310 deltas = []
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	311 for d in range(0, len(revs) - 1):
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	312 a, b = revs[d], revs[d + 1]
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	313 n = self.node(b)
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	314
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	315 if a + 1 != b or self.base(b) == b:
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	316 if a >= 0:
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	317 base = self.base(a)
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	318 ta = decompress(chunks[self.base(a)])
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	319 ta = construct(ta, base, a)
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	320 else:
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	321 ta = ""
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	322
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	323 base = self.base(b)
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	324 if a > base:
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	325 base = a
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	326 tb = ta
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	327 else:
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	328 tb = decompress(chunks[self.base(b)])
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	329 tb = construct(tb, base, b)
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	330 d = self.diff(ta, tb)
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	331 else:
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	332 d = decompress(chunks[b])
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	333
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	334 p = self.parents(n)
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	335 meta = n + p[0] + p[1] + linkmap[self.linkrev(n)]
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	336 l = struct.pack(">l", len(meta) + len(d) + 4)
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	337 deltas.append(l + meta + d)
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	338
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	339 l = struct.pack(">l", sum(map(len, deltas)) + 4)
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	340 deltas.insert(0, l)
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	341 return "".join(deltas)
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	342
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	343 def addgroup(self, data, linkmapper, transaction):
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	344 # given a set of deltas, add them to the revision log. the
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	345 # first delta is against its parent, which should be in our
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	346 # log, the rest are against the previous delta.
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	347
65 d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	348 if not data: return self.tip()
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	349
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	350 # retrieve the parent revision of the delta chain
65 d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	351 chain = data[24:44]
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	352
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	353 # track the base of the current delta log
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	354 r = self.count()
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	355 t = r - 1
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	356
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	357 base = prev = -1
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	358 start = end = 0
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	359 if r:
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	360 start = self.start(self.base(t))
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	361 end = self.end(t)
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	362 measure = self.length(self.base(t))
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	363 base = self.base(t)
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	364 prev = self.tip()
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	365
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	366 transaction.add(self.datafile, end)
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	367 transaction.add(self.indexfile, r * struct.calcsize(indexformat))
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	368 dfh = self.opener(self.datafile, "a")
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	369 ifh = self.opener(self.indexfile, "a")
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	370
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	371 # loop through our set of deltas
65 d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	372 pos = 0
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	373 while pos < len(data):
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	374 l, node, p1, p2, cs = struct.unpack(">l20s20s20s20s",
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	375 data[pos:pos+84])
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	376 link = linkmapper(cs)
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	377 delta = data[pos + 84:pos + l]
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	378 pos += l
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	379
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	380 # full versions are inserted when the needed deltas become
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	381 # comparable to the uncompressed text or when the previous
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	382 # version is not the one we have a delta against. We use
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	383 # the size of the previous full rev as a proxy for the
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	384 # current size.
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	385
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	386 if chain == prev:
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	387 cdelta = compress(delta)
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	388
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	389 if chain != prev or (end - start + len(cdelta)) > measure * 2:
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	390 # flush our writes here so we can read it in revision
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	391 dfh.flush()
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	392 ifh.flush()
65 d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	393 text = self.revision(chain)
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	394 text = self.patch(text, delta)
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	395 chk = self.addrevision(text, transaction, link, p1, p2)
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	396 if chk != node:
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	397 raise "consistency error adding group"
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	398 measure = len(text)
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	399 else:
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	400 e = (end, len(cdelta), self.base(t), link, p1, p2, node)
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	401 self.index.append(e)
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	402 self.nodemap[node] = r
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	403 dfh.write(cdelta)
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	404 ifh.write(struct.pack(indexformat, *e))
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	405
65 d40cc5aacc31 Fix up a bunch of bugs in the new merge code mpm@selenic.com parents: 64 diff changeset	406 t, r, chain, prev = r, r + 1, node, node
46 93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	407 start = self.start(self.base(t))
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	408 end = self.end(t)
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	409
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	410 dfh.close()
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	411 ifh.close()
93e868fa0db8 Add changegroup support mpm@selenic.com parents: 45 diff changeset	412 return node

Mercurial > hg > gitweb

annotate mercurial/revlog.py @ 67:a182f2561c8e