/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/weave.py

  • Committer: Robert Collins
  • Date: 2008-03-19 04:39:04 UTC
  • mto: This revision was merged to the branch mainline in revision 3306.
  • Revision ID: robertc@robertcollins.net-20080319043904-7g4imzvybc7q9l8h
Deprecate VersionedFile.get_parents, breaking pulling from a ghost containing knit or pack repository to weaves, which improves correctness and allows simplification of core code.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/weave.py
768
768
        version_ids = set(other.versions()).intersection(set(version_ids))
769
769
        # pull in the referenced graph.
770
770
        version_ids = other.get_ancestry(version_ids)
771
 
        pending_graph = [(version, other.get_parents(version)) for
772
 
                         version in version_ids]
 
771
        pending_parents = other.get_parent_map(version_ids)
 
772
        pending_graph = pending_parents.items()
 
773
        if len(pending_graph) != len(version_ids):
 
774
            raise RevisionNotPresent(
 
775
                set(version_ids) - pending_parents.keys(), self)
773
776
        for name in topo_sort(pending_graph):
774
777
            other_idx = other._name_map[name]
775
778
            # returns True if we have it, False if we need it.
777
780
                names_to_join.append((other_idx, name))
778
781
            processed += 1
779
782
 
780
 
 
781
783
        if pb and not msg:
782
784
            msg = 'weave join'
783
785