1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
|
from difflib import SequenceMatcher
class MultiParent(object):
def __init__(self, hunks=None):
if hunks is not None:
self.hunks = hunks
else:
self.hunks = []
def __repr__(self):
return "MultiParent(%r)" % self.hunks
def __eq__(self, other):
if self.__class__ is not other.__class__:
return False
return (self.hunks == other.hunks)
@staticmethod
def from_lines(text, parents=()):
def compare(parent):
return SequenceMatcher(None, parent, text).get_matching_blocks()
parent_comparisons = [compare(p) for p in parents]
cur_line = 0
new_text = NewText([])
parent_text = []
block_iter = [iter(i) for i in parent_comparisons]
diff = MultiParent([])
def next_block(p):
try:
return block_iter[p].next()
except StopIteration:
return None
cur_block = [next_block(p) for p, i in enumerate(block_iter)]
while cur_line < len(text):
best_match = None
for p, block in enumerate(cur_block):
if block is None:
continue
i, j, n = block
while j + n < cur_line:
block = cur_block[p] = next_block(p)
if block is None:
break
i, j, n = block
if block is None:
continue
if j > cur_line:
continue
offset = cur_line - j
i += offset
j = cur_line
n -= offset
if n == 0:
continue
if best_match is None or n > best_match.num_lines:
best_match = ParentText(p, i, j, n)
if best_match is None:
new_text.lines.append(text[cur_line])
cur_line += 1
else:
if len(new_text.lines) > 0:
diff.hunks.append(new_text)
new_text = NewText([])
diff.hunks.append(best_match)
cur_line += best_match.num_lines
if len(new_text.lines) > 0:
diff.hunks.append(new_text)
return diff
@classmethod
def from_texts(cls, text, parents=()):
return cls.from_lines(text.splitlines(True),
[p.splitlines(True) for p in parents])
def to_patch(self):
for hunk in self.hunks:
for line in hunk.to_patch():
yield line
def range_iterator(self):
start = 0
for hunk in self.hunks:
if isinstance(hunk, NewText):
kind = 'new'
end = start + len(hunk.lines)
data = hunk.lines
else:
kind = 'parent'
start = hunk.child_pos
end = start + hunk.num_lines
data = (hunk.parent, hunk.parent_pos, hunk.parent_pos +
hunk.num_lines)
yield start, end, kind, data
start = end
class NewText(object):
def __init__(self, lines):
self.lines = lines
def __eq__(self, other):
if self.__class__ is not other.__class__:
return False
return (other.lines == self.lines)
def __repr__(self):
return 'NewText(%r)' % self.lines
def to_patch(self):
yield 'i %d\n' % len(self.lines)
for line in self.lines:
yield line
yield '\n'
class ParentText(object):
def __init__(self, parent, parent_pos, child_pos, num_lines):
self.parent = parent
self.parent_pos = parent_pos
self.child_pos = child_pos
self.num_lines = num_lines
def __repr__(self):
return 'ParentText(%(parent)r, %(parent_pos)r, %(child_pos)r,'\
' %(num_lines)r)' % self.__dict__
def __eq__(self, other):
if self.__class__ != other.__class__:
return False
return (self.__dict__ == other.__dict__)
def to_patch(self):
yield 'c %(parent)d %(parent_pos)d %(child_pos)d %(num_lines)d\n'\
% self.__dict__
class MultiVersionedFile(object):
def __init__(self):
self._diffs = {}
self._lines = {}
self._parents = {}
def add_version(self, lines, version_id, parent_ids):
parent_lines = [self._lines[p] for p in parent_ids]
diff = MultiParent.from_lines(lines, parent_lines)
self.add_diff(diff, version_id, parent_ids)
self._lines[version_id] = lines
def add_diff(self, diff, version_id, parent_ids):
self._diffs[version_id] = diff
self._parents[version_id] = parent_ids
def clear_cache(self):
self._lines.clear()
def get_line_list(self, version_ids):
return [self.cache_version(v) for v in version_ids]
def cache_version(self, version_id):
try:
return self._lines[version_id]
except KeyError:
pass
diff = self._diffs[version_id]
lines = []
reconstructor = _Reconstructor(self._diffs, self._lines, self._parents)
for hunk in diff.hunks:
if isinstance(hunk, NewText):
lines.extend(hunk.lines)
else:
reconstructor.reconstruct(lines, hunk, version_id)
self._lines[version_id] = lines
return lines
class _Reconstructor(object):
def __init__(self, diffs, lines, parents):
self.diffs = diffs
self.lines = lines
self.parents = parents
self.cursor = {}
def reconstruct(self, lines, parent_text, version_id):
parent_id = self.parents[version_id][parent_text.parent]
end = parent_text.parent_pos + parent_text.num_lines
return self._reconstruct(lines, parent_id, parent_text.parent_pos, end)
def _reconstruct(self, lines, req_version_id, req_start, req_end):
pending_reqs = [(req_version_id, req_start, req_end)]
while len(pending_reqs) > 0:
req_version_id, req_start, req_end = pending_reqs.pop()
try:
start, end, kind, data, iterator = self.cursor[req_version_id]
except KeyError:
iterator = self.diffs[req_version_id].range_iterator()
start, end, kind, data = iterator.next()
while end < req_start:
start, end, kind, data = iterator.next()
self.cursor[req_version_id] = start, end, kind, data, iterator
if kind == 'new':
lines.extend(data[req_start - start: (req_end - start)])
else:
parent, parent_start, parent_end = data
version_id = self.parents[req_version_id][parent]
sub_start = parent_start + req_start - start
sub_end = parent_end + req_end - end
pending_reqs.append((version_id, sub_start, sub_end))
|