206
206
def find_present_ancestors(revision_id, revision_source):
207
"""Return the ancestors of a revision present in a branch.
209
It's possible that a branch won't have the complete ancestry of
210
one of its revisions.
213
207
found_ancestors = {}
214
209
anc_iter = enumerate(iter_ancestors(revision_id, revision_source,
215
210
only_present=True))
216
211
for anc_order, (anc_id, anc_distance) in anc_iter:
218
213
found_ancestors[anc_id] = (anc_order, anc_distance)
219
214
return found_ancestors
222
def __get_closest(intersection):
225
for entry in intersection:
226
if entry[0] == intersection[0][0]:
227
matches.append(entry[2])
216
class AmbiguousBase(bzrlib.errors.BzrError):
217
def __init__(self, bases):
218
msg = "The correct base is unclear, becase %s are all equally close" %\
220
bzrlib.errors.BzrError.__init__(self, msg)
231
223
def common_ancestor(revision_a, revision_b, revision_source):
232
224
"""Find the ancestor common to both revisions that is closest to both.
243
235
b_intersection.append((b_ancestors[revision][1], a_order, revision))
244
236
mutter("a intersection: %r" % a_intersection)
245
237
mutter("b intersection: %r" % b_intersection)
238
def get_closest(intersection):
241
for entry in intersection:
242
if entry[0] == intersection[0][0]:
243
matches.append(entry[2])
247
a_closest = __get_closest(a_intersection)
246
a_closest = get_closest(a_intersection)
248
247
if len(a_closest) == 0:
250
b_closest = __get_closest(b_intersection)
249
b_closest = get_closest(b_intersection)
251
250
assert len(b_closest) != 0
252
251
mutter ("a_closest %r" % a_closest)
253
252
mutter ("b_closest %r" % b_closest)
256
255
elif b_closest[0] in a_closest:
257
256
return b_closest[0]
259
raise bzrlib.errors.AmbiguousBase((a_closest[0], b_closest[0]))
258
raise AmbiguousBase((a_closest[0], b_closest[0]))
260
259
return a_closest[0]
262
261
class MultipleRevisionSources(object):
263
"""Proxy that looks in multiple branches for revisions."""
264
262
def __init__(self, *args):
265
263
object.__init__(self)
266
264
assert len(args) != 0
273
271
except bzrlib.errors.NoSuchRevision, e:
277
def get_intervening_revisions(ancestor_id, rev_id, rev_source,
278
revision_history=None):
279
"""Find the longest line of descent from maybe_ancestor to revision.
280
Revision history is followed where possible.
282
If ancestor_id == rev_id, list will be empty.
283
Otherwise, rev_id will be the last entry. ancestor_id will never appear.
284
If ancestor_id is not an ancestor, NotAncestor will be thrown
286
[rev_source.get_revision(r) for r in (ancestor_id, rev_id)]
287
if ancestor_id == rev_id:
289
def historical_lines(line):
290
"""Return a tuple of historical/non_historical lines, for sorting.
291
The non_historical count is negative, since non_historical lines are
296
for revision in line:
297
if revision in revision_history:
301
return good_count, bad_count
303
successful_lines = []
304
while len(active) > 0:
307
parent_ids = [p.revision_id for p in
308
rev_source.get_revision(line[-1]).parents]
309
for parent in parent_ids:
311
if parent == ancestor_id:
312
successful_lines.append(line_copy)
314
line_copy.append(parent)
315
new_active.append(line_copy)
317
if len(successful_lines) == 0:
318
raise bzrlib.errors.NotAncestor(rev_id, ancestor_id)
319
for line in successful_lines:
321
if revision_history is not None:
322
by_historical_lines = []
323
for line in successful_lines:
324
count = historical_lines(line)
325
by_historical_lines.append((count, line))
326
by_historical_lines.sort()
327
if by_historical_lines[-1][0][0] > 0:
328
return by_historical_lines[-1][1]
329
assert len(successful_lines)
330
successful_lines.sort(cmp, len)
331
return successful_lines[-1]
added
removed
bzrlib/revision.py
