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
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
|
# 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,
tsort,
)
from bzrlib.deprecated_graph import (node_distances, select_farthest)
from bzrlib.revision import NULL_REVISION
# DIAGRAM of terminology
# A
# /\
# B C
# | |\
# D E F
# |\/| |
# |/\|/
# G H
#
# In this diagram, relative to G and H:
# A, B, C, D, E are common ancestors.
# C, D and E are border ancestors, because each has a non-common descendant.
# D and E are least common ancestors because none of their descendants are
# common ancestors.
# C is not a least common ancestor because its descendant, E, is a common
# ancestor.
#
# The find_unique_lca algorithm will pick A in two steps:
# 1. find_lca('G', 'H') => ['D', 'E']
# 2. Since len(['D', 'E']) > 1, find_lca('D', 'E') => ['A']
class _StackedParentsProvider(object):
def __init__(self, parent_providers):
self._parent_providers = parent_providers
def __repr__(self):
return "_StackedParentsProvider(%r)" % self._parent_providers
def get_parents(self, revision_ids):
"""Find revision ids of the parents of a list of revisions
A list is returned of the same length as the input. Each entry
is a list of parent ids for the corresponding input revision.
[NULL_REVISION] is used as the parent of the first user-committed
revision. Its parent list is empty.
If the revision is not present (i.e. a ghost), None is used in place
of the list of parents.
"""
found = {}
for parents_provider in self._parent_providers:
pending_revisions = [r for r in revision_ids if r not in found]
parent_list = parents_provider.get_parents(pending_revisions)
new_found = dict((k, v) for k, v in zip(pending_revisions,
parent_list) if v is not None)
found.update(new_found)
if len(found) == len(revision_ids):
break
return [found.get(r, None) for r in revision_ids]
class Graph(object):
"""Provide incremental access to revision graphs.
This is the generic implementation; it is intended to be subclassed to
specialize it for other repository types.
"""
def __init__(self, parents_provider):
"""Construct a Graph that uses several graphs as its input
This should not normally be invoked directly, because there may be
specialized implementations for particular repository types. See
Repository.get_graph()
:param parents_func: an object providing a get_parents call
conforming to the behavior of StackedParentsProvider.get_parents
"""
self.get_parents = parents_provider.get_parents
self._parents_provider = parents_provider
def __repr__(self):
return 'Graph(%r)' % self._parents_provider
def find_lca(self, *revisions):
"""Determine the lowest common ancestors of the provided revisions
A lowest common ancestor is a common ancestor none of whose
descendants are common ancestors. In graphs, unlike trees, there may
be multiple lowest common ancestors.
This algorithm has two phases. Phase 1 identifies border ancestors,
and phase 2 filters border ancestors to determine lowest common
ancestors.
In phase 1, border ancestors are identified, using a breadth-first
search starting at the bottom of the graph. Searches are stopped
whenever a node or one of its descendants is determined to be common
In phase 2, the border ancestors are filtered to find the least
common ancestors. This is done by searching the ancestries of each
border ancestor.
Phase 2 is perfomed on the principle that a border ancestor that is
not an ancestor of any other border ancestor is a least common
ancestor.
Searches are stopped when they find a node that is determined to be a
common ancestor of all border ancestors, because this shows that it
cannot be a descendant of any border ancestor.
The scaling of this operation should be proportional to
1. The number of uncommon ancestors
2. The number of border ancestors
3. The length of the shortest path between a border ancestor and an
ancestor of all border ancestors.
"""
border_common, common, sides = self._find_border_ancestors(revisions)
return self._filter_candidate_lca(border_common)
def find_difference(self, left_revision, right_revision):
"""Determine the graph difference between two revisions"""
border, common, (left, right) = self._find_border_ancestors(
[left_revision, right_revision])
return (left.difference(right).difference(common),
right.difference(left).difference(common))
def _make_breadth_first_searcher(self, revisions):
return _BreadthFirstSearcher(revisions, self)
def _find_border_ancestors(self, revisions):
"""Find common ancestors with at least one uncommon descendant.
Border ancestors are identified using a breadth-first
search starting at the bottom of the graph. Searches are stopped
whenever a node or one of its descendants is determined to be common.
This will scale with the number of uncommon ancestors.
As well as the border ancestors, a set of seen common ancestors and a
list of sets of seen ancestors for each input revision is returned.
This allows calculation of graph difference from the results of this
operation.
"""
if None in revisions:
raise errors.InvalidRevisionId(None, self)
common_searcher = self._make_breadth_first_searcher([])
common_ancestors = set()
searchers = [self._make_breadth_first_searcher([r])
for r in revisions]
active_searchers = searchers[:]
border_ancestors = set()
def update_common(searcher, revisions):
w_seen_ancestors = searcher.find_seen_ancestors(
revision)
stopped = searcher.stop_searching_any(w_seen_ancestors)
common_ancestors.update(w_seen_ancestors)
common_searcher.start_searching(stopped)
while True:
if len(active_searchers) == 0:
return border_ancestors, common_ancestors, [s.seen for s in
searchers]
try:
new_common = common_searcher.next()
common_ancestors.update(new_common)
except StopIteration:
pass
else:
for searcher in active_searchers:
for revision in new_common.intersection(searcher.seen):
update_common(searcher, revision)
newly_seen = set()
new_active_searchers = []
for searcher in active_searchers:
try:
newly_seen.update(searcher.next())
except StopIteration:
pass
else:
new_active_searchers.append(searcher)
active_searchers = new_active_searchers
for revision in newly_seen:
if revision in common_ancestors:
for searcher in searchers:
update_common(searcher, revision)
continue
for searcher in searchers:
if revision not in searcher.seen:
break
else:
border_ancestors.add(revision)
for searcher in searchers:
update_common(searcher, revision)
def _filter_candidate_lca(self, candidate_lca):
"""Remove candidates which are ancestors of other candidates.
This is done by searching the ancestries of each border ancestor. It
is perfomed on the principle that a border ancestor that is not an
ancestor of any other border ancestor is a lowest common ancestor.
Searches are stopped when they find a node that is determined to be a
common ancestor of all border ancestors, because this shows that it
cannot be a descendant of any border ancestor.
This will scale with the number of candidate ancestors and the length
of the shortest path from a candidate to an ancestor common to all
candidates.
"""
searchers = dict((c, self._make_breadth_first_searcher([c]))
for c in candidate_lca)
active_searchers = dict(searchers)
# skip over the actual candidate for each searcher
for searcher in active_searchers.itervalues():
searcher.next()
while len(active_searchers) > 0:
for candidate, searcher in list(active_searchers.iteritems()):
try:
ancestors = searcher.next()
except StopIteration:
del active_searchers[candidate]
continue
for ancestor in ancestors:
if ancestor in candidate_lca:
candidate_lca.remove(ancestor)
del searchers[ancestor]
if ancestor in active_searchers:
del active_searchers[ancestor]
for searcher in searchers.itervalues():
if ancestor not in searcher.seen:
break
else:
# if this revision was seen by all searchers, then it
# is a descendant of all candidates, so we can stop
# searching it, and any seen ancestors
for searcher in searchers.itervalues():
seen_ancestors =\
searcher.find_seen_ancestors(ancestor)
searcher.stop_searching_any(seen_ancestors)
return candidate_lca
def find_unique_lca(self, left_revision, right_revision):
"""Find a unique LCA.
Find lowest common ancestors. If there is no unique common
ancestor, find the lowest common ancestors of those ancestors.
Iteration stops when a unique lowest common ancestor is found.
The graph origin is necessarily a unique lowest common ancestor.
Note that None is not an acceptable substitute for NULL_REVISION.
in the input for this method.
"""
revisions = [left_revision, right_revision]
while True:
lca = self.find_lca(*revisions)
if len(lca) == 1:
return lca.pop()
revisions = lca
def iter_topo_order(self, revisions):
"""Iterate through the input revisions in topological order.
This sorting only ensures that parents come before their children.
An ancestor may sort after a descendant if the relationship is not
visible in the supplied list of revisions.
"""
sorter = tsort.TopoSorter(zip(revisions, self.get_parents(revisions)))
return sorter.iter_topo_order()
class _BreadthFirstSearcher(object):
"""Parallel search the breadth-first the ancestry of revisions.
This class implements the iterator protocol, but additionally
1. provides a set of seen ancestors, and
2. allows some ancestries to be unsearched, via stop_searching_any
"""
def __init__(self, revisions, parents_provider):
self._start = set(revisions)
self._search_revisions = None
self.seen = set(revisions)
self._parents_provider = parents_provider
def __repr__(self):
return ('_BreadthFirstSearcher(self._search_revisions=%r,'
' self.seen=%r)' % (self._search_revisions, self.seen))
def next(self):
"""Return the next ancestors of this revision.
Ancestors are returned in the order they are seen in a breadth-first
traversal. No ancestor will be returned more than once.
"""
if self._search_revisions is None:
self._search_revisions = self._start
else:
new_search_revisions = set()
for parents in self._parents_provider.get_parents(
self._search_revisions):
if parents is None:
continue
new_search_revisions.update(p for p in parents if
p not in self.seen)
self._search_revisions = new_search_revisions
if len(self._search_revisions) == 0:
raise StopIteration()
self.seen.update(self._search_revisions)
return self._search_revisions
def __iter__(self):
return self
def find_seen_ancestors(self, revision):
"""Find ancestors of this revision that have already been seen."""
searcher = _BreadthFirstSearcher([revision], self._parents_provider)
seen_ancestors = set()
for ancestors in searcher:
for ancestor in ancestors:
if ancestor not in self.seen:
searcher.stop_searching_any([ancestor])
else:
seen_ancestors.add(ancestor)
return seen_ancestors
def stop_searching_any(self, revisions):
"""
Remove any of the specified revisions from the search list.
None of the specified revisions are required to be present in the
search list. In this case, the call is a no-op.
"""
stopped = self._search_revisions.intersection(revisions)
self._search_revisions = self._search_revisions.difference(revisions)
return stopped
def start_searching(self, revisions):
if self._search_revisions is None:
self._start = set(revisions)
else:
self._search_revisions.update(revisions.difference(self.seen))
self.seen.update(revisions)
|