/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/log.py

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/log.py
464
464
    # This asks for all mainline revisions, which means we only have to spider
465
465
    # sideways, rather than depth history. That said, its still size-of-history
466
466
    # and should be addressed.
 
467
    # mainline_revisions always includes an extra revision at the beginning, so
 
468
    # don't request it.
467
469
    parent_map = dict(((key, value) for key, value in
468
 
        graph.iter_ancestry(mainline_revisions) if value is not None))
 
470
        graph.iter_ancestry(mainline_revisions[1:]) if value is not None))
469
471
    sorted_rev_list = topo_sort(parent_map.items())
470
472
    ancestry = {}
471
473
    for rev in sorted_rev_list:
479
481
            if rev in weave_modifed_revisions:
480
482
                rev_ancestry.add(rev)
481
483
            for parent in parents:
 
484
                if parent not in ancestry:
 
485
                    # parent is a Ghost, which won't be present in
 
486
                    # sorted_rev_list, but we may access it later, so create an
 
487
                    # empty node for it
 
488
                    ancestry[parent] = set()
482
489
                rev_ancestry = rev_ancestry.union(ancestry[parent])
483
490
        ancestry[rev] = rev_ancestry
484
491