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

merge trunk to get test cleanups and resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/remote.py
1923
1923
        :param search: The overall search to satisfy with streams.
1924
1924
        :param sources: A list of Repository objects to query.
1925
1925
        """
1926
 
        self.serialiser = self.to_format._serializer
 
1926
        self.from_serialiser = self.from_repository._format._serializer
1927
1927
        self.seen_revs = set()
1928
1928
        self.referenced_revs = set()
1929
1929
        # If there are heads in the search, or the key count is > 0, we are not
1946
1946
    def missing_parents_rev_handler(self, substream):
1947
1947
        for content in substream:
1948
1948
            revision_bytes = content.get_bytes_as('fulltext')
1949
 
            revision = self.serialiser.read_revision_from_string(revision_bytes)
 
1949
            revision = self.from_serialiser.read_revision_from_string(
 
1950
                revision_bytes)
1950
1951
            self.seen_revs.add(content.key[-1])
1951
1952
            self.referenced_revs.update(revision.parent_ids)
1952
1953
            yield content