Show More
@@ -25,49 +25,111 b' def dirstatetuple(*x):' | |||||
25 | # x is a tuple |
|
25 | # x is a tuple | |
26 | return x |
|
26 | return x | |
27 |
|
27 | |||
28 | def parse_index2(data, inline): |
|
28 | indexformatng = ">Qiiiiii20s12x" | |
29 | def gettype(q): |
|
29 | indexfirst = struct.calcsize('Q') | |
30 | return int(q & 0xFFFF) |
|
30 | sizeint = struct.calcsize('i') | |
|
31 | indexsize = struct.calcsize(indexformatng) | |||
|
32 | ||||
|
33 | def gettype(q): | |||
|
34 | return int(q & 0xFFFF) | |||
31 |
|
35 | |||
32 |
|
|
36 | def offset_type(offset, type): | |
33 |
|
|
37 | return long(long(offset) << 16 | type) | |
|
38 | ||||
|
39 | class BaseIndexObject(object): | |||
|
40 | def __len__(self): | |||
|
41 | return self._lgt + len(self._extra) + 1 | |||
|
42 | ||||
|
43 | def insert(self, i, tup): | |||
|
44 | assert i == -1 | |||
|
45 | self._extra.append(tup) | |||
34 |
|
46 | |||
35 | indexformatng = ">Qiiiiii20s12x" |
|
47 | def _fix_index(self, i): | |
|
48 | if not isinstance(i, int): | |||
|
49 | raise TypeError("expecting int indexes") | |||
|
50 | if i < 0: | |||
|
51 | i = len(self) + i | |||
|
52 | if i < 0 or i >= len(self): | |||
|
53 | raise IndexError | |||
|
54 | return i | |||
36 |
|
55 | |||
37 | s = struct.calcsize(indexformatng) |
|
56 | def __getitem__(self, i): | |
38 | index = [] |
|
57 | i = self._fix_index(i) | |
39 | cache = None |
|
58 | if i == len(self) - 1: | |
40 | off = 0 |
|
59 | return (0, 0, 0, -1, -1, -1, -1, nullid) | |
|
60 | if i >= self._lgt: | |||
|
61 | return self._extra[i - self._lgt] | |||
|
62 | index = self._calculate_index(i) | |||
|
63 | r = struct.unpack(indexformatng, self._data[index:index + indexsize]) | |||
|
64 | if i == 0: | |||
|
65 | e = list(r) | |||
|
66 | type = gettype(e[0]) | |||
|
67 | e[0] = offset_type(0, type) | |||
|
68 | return tuple(e) | |||
|
69 | return r | |||
|
70 | ||||
|
71 | class IndexObject(BaseIndexObject): | |||
|
72 | def __init__(self, data): | |||
|
73 | assert len(data) % indexsize == 0 | |||
|
74 | self._data = data | |||
|
75 | self._lgt = len(data) // indexsize | |||
|
76 | self._extra = [] | |||
|
77 | ||||
|
78 | def _calculate_index(self, i): | |||
|
79 | return i * indexsize | |||
41 |
|
80 | |||
42 | l = len(data) - s |
|
81 | def __delitem__(self, i): | |
43 | append = index.append |
|
82 | if not isinstance(i, slice) or not i.stop == -1 or not i.step is None: | |
44 | if inline: |
|
83 | raise ValueError("deleting slices only supports a:-1 with step 1") | |
45 | cache = (0, data) |
|
84 | i = self._fix_index(i.start) | |
46 |
|
|
85 | if i < self._lgt: | |
47 | e = _unpack(indexformatng, data[off:off + s]) |
|
86 | self._data = self._data[:i * indexsize] | |
48 | append(e) |
|
87 | self._lgt = i | |
49 |
|
|
88 | self._extra = [] | |
50 | break |
|
89 | else: | |
51 | off += e[1] + s |
|
90 | self._extra = self._extra[:i - self._lgt] | |
52 | else: |
|
91 | ||
53 | while off <= l: |
|
92 | class InlinedIndexObject(BaseIndexObject): | |
54 | e = _unpack(indexformatng, data[off:off + s]) |
|
93 | def __init__(self, data, inline=0): | |
55 | append(e) |
|
94 | self._data = data | |
56 | off += s |
|
95 | self._lgt = self._inline_scan(None) | |
|
96 | self._inline_scan(self._lgt) | |||
|
97 | self._extra = [] | |||
57 |
|
98 | |||
58 | if off != len(data): |
|
99 | def _inline_scan(self, lgt): | |
59 | raise ValueError('corrupt index file') |
|
100 | off = 0 | |
|
101 | if lgt is not None: | |||
|
102 | self._offsets = [0] * lgt | |||
|
103 | count = 0 | |||
|
104 | while off <= len(self._data) - indexsize: | |||
|
105 | s, = struct.unpack('>i', | |||
|
106 | self._data[off + indexfirst:off + sizeint + indexfirst]) | |||
|
107 | if lgt is not None: | |||
|
108 | self._offsets[count] = off | |||
|
109 | count += 1 | |||
|
110 | off += indexsize + s | |||
|
111 | if off != len(self._data): | |||
|
112 | raise ValueError("corrupted data") | |||
|
113 | return count | |||
60 |
|
114 | |||
61 | if index: |
|
115 | def __delitem__(self, i): | |
62 | e = list(index[0]) |
|
116 | if not isinstance(i, slice) or not i.stop == -1 or not i.step is None: | |
63 | type = gettype(e[0]) |
|
117 | raise ValueError("deleting slices only supports a:-1 with step 1") | |
64 | e[0] = offset_type(0, type) |
|
118 | i = self._fix_index(i.start) | |
65 | index[0] = tuple(e) |
|
119 | if i < self._lgt: | |
|
120 | self._offsets = self._offsets[:i] | |||
|
121 | self._lgt = i | |||
|
122 | self._extra = [] | |||
|
123 | else: | |||
|
124 | self._extra = self._extra[:i - self._lgt] | |||
66 |
|
125 | |||
67 | # add the magic null revision at -1 |
|
126 | def _calculate_index(self, i): | |
68 | index.append((0, 0, 0, -1, -1, -1, -1, nullid)) |
|
127 | return self._offsets[i] | |
69 |
|
128 | |||
70 | return index, cache |
|
129 | def parse_index2(data, inline): | |
|
130 | if not inline: | |||
|
131 | return IndexObject(data), None | |||
|
132 | return InlinedIndexObject(data, inline), (0, data) | |||
71 |
|
133 | |||
72 | def parse_dirstate(dmap, copymap, st): |
|
134 | def parse_dirstate(dmap, copymap, st): | |
73 | parents = [st[:20], st[20: 40]] |
|
135 | parents = [st[:20], st[20: 40]] |
General Comments 0
You need to be logged in to leave comments.
Login now