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
|
# Copyright (C) 2007 Canonical Ltd
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
from bzrlib import errors, patiencediff, revision
class PlanMerge(object):
"""Plan an annotate merge using on-the-fly annotation"""
def __init__(self, a_rev, b_rev, vf):
self.a_rev = a_rev
self.b_rev = b_rev
self.lines_a = vf.get_lines(a_rev)
self.lines_b = vf.get_lines(b_rev)
self.vf = vf
a_ancestry = set(vf.get_ancestry(a_rev))
b_ancestry = set(vf.get_ancestry(b_rev))
self.uncommon = a_ancestry.symmetric_difference(b_ancestry)
def plan_merge(self):
blocks = self._get_matching_blocks(self.a_rev, self.b_rev)
new_a = self._find_new(self.a_rev)
new_b = self._find_new(self.b_rev)
last_i = 0
last_j = 0
a_lines = self.vf.get_lines(self.a_rev)
b_lines = self.vf.get_lines(self.b_rev)
for i, j, n in blocks:
# determine why lines aren't common
for a_index in range(last_i, i):
if a_index in new_a:
cause = 'new-a'
else:
cause = 'killed-b'
yield cause, a_lines[a_index]
for b_index in range(last_j, j):
if b_index in new_b:
cause = 'new-b'
else:
cause = 'killed-a'
yield cause, b_lines[b_index]
# handle common lines
for a_index in range(i, i+n):
yield 'unchanged', a_lines[a_index]
last_i = i+n
last_j = j+n
def _get_matching_blocks(self, left_revision, right_revision):
left_lines = self.vf.get_lines(left_revision)
right_lines = self.vf.get_lines(right_revision)
matcher = patiencediff.PatienceSequenceMatcher(None, left_lines,
right_lines)
return matcher.get_matching_blocks()
def _unique_lines(self, matching_blocks):
last_i = 0
last_j = 0
unique_left = []
unique_right = []
for i, j, n in matching_blocks:
unique_left.extend(range(last_i, i))
unique_right.extend(range(last_j, j))
last_i = i + n
last_j = j + n
return unique_left, unique_right
def _find_new(self, version_id):
"""Determine which lines are new in the ancestry of this version.
If a lines is present in this version, and not present in any
common ancestor, it is considered new.
"""
if version_id not in self.uncommon:
return set()
parents = self.vf.get_parents(version_id)
if len(parents) == 0:
return set(range(len(self.vf.get_lines(version_id))))
new = None
for parent in parents:
blocks = self._get_matching_blocks(version_id, parent)
result, unused = self._unique_lines(blocks)
parent_new = self._find_new(parent)
for i, j, n in blocks:
for ii, jj in [(i+r, j+r) for r in range(n)]:
if jj in parent_new:
result.append(ii)
if new is None:
new = set(result)
else:
new.intersection_update(result)
return new
class _PlanMergeVersionedfile(object):
"""A VersionedFile for uncommitted and committed texts.
Intended to allow merges to be planned with working tree texts.
"""
def __init__(self, file_id, fallback_versionedfiles=None):
self._file_id = file_id
if fallback_versionedfiles is None:
self.fallback_versionedfiles = []
else:
self.fallback_versionedfiles = fallback_versionedfiles
self._parents = {}
self._lines = {}
def add_lines(self, version_id, parents, lines):
if not revision.is_reserved_id(version_id):
raise ValueError('Only reserved ids may be used')
if parents is None:
raise ValueError('Parents may not be None')
if lines is None:
raise ValueError('Lines may not be None')
self._parents[version_id] = parents
self._lines[version_id] = lines
def get_lines(self, version_id):
lines = self._lines.get(version_id)
if lines is not None:
return lines
for versionedfile in self.fallback_versionedfiles:
try:
return versionedfile.get_lines(version_id)
except errors.RevisionNotPresent:
continue
else:
raise errors.RevisionNotPresent(version_id, self._file_id)
def get_ancestry(self, version_id):
"""See Versionedfile.get_ancestry.
Note that this implementation assumes that if a Versionedfile can
answer get_ancestry at all, it can give an authoritative answer. In
fact, ghosts can invalidate this assumption. But it's good enough
99% of the time, and far cheaper/simpler.
Also note that the results of this version are never topologically
sorted, and are a set.
"""
parents = self._parents.get(version_id)
if parents is None:
for vf in self.fallback_versionedfiles:
try:
return vf.get_ancestry(version_id)
except errors.RevisionNotPresent:
continue
else:
raise errors.RevisionNotPresent(version_id, self._file_id)
ancestry = set([version_id])
for parent in parents:
ancestry.update(self.get_ancestry(parent))
return ancestry
def get_parents(self, version_id):
parents = self._parents.get(version_id)
if parents is not None:
return parents
for versionedfile in self.fallback_versionedfiles:
try:
return versionedfile.get_parents(version_id)
except errors.RevisionNotPresent:
continue
else:
raise errors.RevisionNotPresent(version_id, self._file_id)
|