← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/vf_search.py

  • Committer: Jelmer Vernooij
  • Date: 2011-12-05 15:16:52 UTC
  • mto: This revision was merged to the branch mainline in revision 6348.
  • Revision ID: jelmer@samba.org-20111205151652-8y6qgvv1qkbv5f71
Fix get_state().

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/vf_search.py
501
501
        return [], [], 0
502
502
    heads = _find_possible_heads(parent_map, tip_keys, depth)
503
503
    s, found_heads = _run_search(parent_map, heads, set(tip_keys))
504
 
    _, start_keys, exclude_keys, key_count = s.get_result().get_recipe()
 
504
    start_keys, exclude_keys, keys = s.get_state()
505
505
    if found_heads:
506
506
        # Anything in found_heads are redundant start_keys, we hit them while
507
507
        # walking, so we can exclude them from the start list.
508
508
        start_keys = set(start_keys).difference(found_heads)
509
 
    return start_keys, exclude_keys, key_count
 
509
    return start_keys, exclude_keys, len(keys)