← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/weave.py

  • Committer: Robert Collins
  • Date: 2006-03-07 23:38:58 UTC
  • mto: (1594.2.4 integration)
  • mto: This revision was merged to the branch mainline in revision 1596.
  • Revision ID: robertc@robertcollins.net-20060307233858-ee407c954a9c9c53
Extra test for joining of version-limited sets.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/weave.py
737
737
 
738
738
        if version_ids:
739
739
            for version_id in version_ids:
740
 
                if not self.has_version(version_id) and not ignore_missing:
 
740
                if not other.has_version(version_id) and not ignore_missing:
741
741
                    raise RevisionNotPresent(version_id, self._weave_name)
742
742
        else:
743
743
            version_ids = other.versions()
747
747
        # work through in index order to make sure we get all dependencies
748
748
        names_to_join = []
749
749
        processed = 0
 
750
        # get the selected versions only that are in other.versions.
750
751
        version_ids = set(other.versions()).intersection(set(version_ids))
 
752
        # pull in the referenced graph.
 
753
        version_ids = other.get_ancestry(version_ids)
751
754
        pending_graph = [(version, other.get_parents(version)) for
752
755
                         version in version_ids]
753
756
        for name in topo_sort(pending_graph):