← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/log.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2008-05-19 18:56:45 UTC
  • mfrom: (3373.5.5 dont_log_view_none_211661)
  • Revision ID: pqm@pqm.ubuntu.com-20080519185645-whhuax9pml5sebk5
(jam) Proper fix for bug #211661,
        passing None to get_parent_map() is illegal

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/log.py
522
522
    # This asks for all mainline revisions, which means we only have to spider
523
523
    # sideways, rather than depth history. That said, its still size-of-history
524
524
    # and should be addressed.
 
525
    # mainline_revisions always includes an extra revision at the beginning, so
 
526
    # don't request it.
525
527
    parent_map = dict(((key, value) for key, value in
526
 
        graph.iter_ancestry(mainline_revs) if value is not None))
 
528
        graph.iter_ancestry(mainline_revs[1:]) if value is not None))
527
529
    # filter out ghosts; merge_sort errors on ghosts.
528
530
    rev_graph = _strip_NULL_ghosts(parent_map)
529
531
    merge_sorted_revisions = merge_sort(