← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/revision.py

  • Committer: Robert Collins
  • Date: 2005-09-06 11:09:03 UTC
  • mfrom: (1178)
  • mto: (1185.1.10) (1092.3.1)
  • mto: This revision was merged to the branch mainline in revision 1390.
  • Revision ID: robertc@robertcollins.net-20050906110903-b6be7bd6102403cb
really merge mpool

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/revision.py
204
204
 
205
205
 
206
206
def find_present_ancestors(revision_id, revision_source):
 
207
    """Return the ancestors of a revision present in a branch.
 
208
 
 
209
    It's possible that a branch won't have the complete ancestry of
 
210
    one of its revisions.  
 
211
 
 
212
    """
207
213
    found_ancestors = {}
208
 
    count = 0
209
214
    anc_iter = enumerate(iter_ancestors(revision_id, revision_source,
210
215
                         only_present=True))
211
216
    for anc_order, (anc_id, anc_distance) in anc_iter:
213
218
            found_ancestors[anc_id] = (anc_order, anc_distance)
214
219
    return found_ancestors
215
220
    
216
 
class AmbiguousBase(bzrlib.errors.BzrError):
217
 
    def __init__(self, bases):
218
 
        msg = "The correct base is unclear, becase %s are all equally close" %\
219
 
            ", ".join(bases)
220
 
        bzrlib.errors.BzrError.__init__(self, msg)
221
 
        self.bases = bases
 
221
 
 
222
def __get_closest(intersection):
 
223
    intersection.sort()
 
224
    matches = [] 
 
225
    for entry in intersection:
 
226
        if entry[0] == intersection[0][0]:
 
227
            matches.append(entry[2])
 
228
    return matches
 
229
 
222
230
 
223
231
def common_ancestor(revision_a, revision_b, revision_source):
224
232
    """Find the ancestor common to both revisions that is closest to both.
235
243
            b_intersection.append((b_ancestors[revision][1], a_order, revision))
236
244
    mutter("a intersection: %r" % a_intersection)
237
245
    mutter("b intersection: %r" % b_intersection)
238
 
    def get_closest(intersection):
239
 
        intersection.sort()
240
 
        matches = [] 
241
 
        for entry in intersection:
242
 
            if entry[0] == intersection[0][0]:
243
 
                matches.append(entry[2])
244
 
        return matches
245
246
 
246
 
    a_closest = get_closest(a_intersection)
 
247
    a_closest = __get_closest(a_intersection)
247
248
    if len(a_closest) == 0:
248
249
        return None
249
 
    b_closest = get_closest(b_intersection)
 
250
    b_closest = __get_closest(b_intersection)
250
251
    assert len(b_closest) != 0
251
252
    mutter ("a_closest %r" % a_closest)
252
253
    mutter ("b_closest %r" % b_closest)
255
256
    elif b_closest[0] in a_closest:
256
257
        return b_closest[0]
257
258
    else:
258
 
        raise AmbiguousBase((a_closest[0], b_closest[0]))
 
259
        raise bzrlib.errors.AmbiguousBase((a_closest[0], b_closest[0]))
259
260
    return a_closest[0]
260
261
 
261
262
class MultipleRevisionSources(object):
 
263
    """Proxy that looks in multiple branches for revisions."""
262
264
    def __init__(self, *args):
263
265
        object.__init__(self)
264
266
        assert len(args) != 0
271
273
            except bzrlib.errors.NoSuchRevision, e:
272
274
                pass
273
275
        raise e
 
276
 
 
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.
 
281
 
 
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
 
285
    """
 
286
    [rev_source.get_revision(r) for r in (ancestor_id, rev_id)]
 
287
    if ancestor_id == rev_id:
 
288
        return []
 
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
 
292
        a bad thing.
 
293
        """
 
294
        good_count = 0
 
295
        bad_count = 0
 
296
        for revision in line:
 
297
            if revision in revision_history:
 
298
                good_count += 1
 
299
            else:
 
300
                bad_count -= 1
 
301
        return good_count, bad_count
 
302
    active = [[rev_id]]
 
303
    successful_lines = []
 
304
    while len(active) > 0:
 
305
        new_active = []
 
306
        for line in active:
 
307
            parent_ids = [p.revision_id for p in 
 
308
                          rev_source.get_revision(line[-1]).parents]
 
309
            for parent in parent_ids:
 
310
                line_copy = line[:]
 
311
                if parent == ancestor_id:
 
312
                    successful_lines.append(line_copy)
 
313
                else:
 
314
                    line_copy.append(parent)
 
315
                    new_active.append(line_copy)
 
316
        active = new_active
 
317
    if len(successful_lines) == 0:
 
318
        raise bzrlib.errors.NotAncestor(rev_id, ancestor_id)
 
319
    for line in successful_lines:
 
320
        line.reverse()
 
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]