← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/remote.py

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/remote.py
1739
1739
            # The stream included an inventory-delta record, but the remote
1740
1740
            # side isn't new enough to support them.  So we need to send the
1741
1741
            # rest of the stream via VFS.
 
1742
            self.target_repo.refresh_data()
1742
1743
            return self._resume_stream_with_vfs(response, src_format)
1743
1744
        if response[0][0] == 'missing-basis':
1744
1745
            tokens, missing_keys = bencode.bdecode_as_tuple(response[0][1])
1886
1887
        :param search: The overall search to satisfy with streams.
1887
1888
        :param sources: A list of Repository objects to query.
1888
1889
        """
1889
 
        self.serialiser = self.to_format._serializer
 
1890
        self.from_serialiser = self.from_repository._format._serializer
1890
1891
        self.seen_revs = set()
1891
1892
        self.referenced_revs = set()
1892
1893
        # If there are heads in the search, or the key count is > 0, we are not
1909
1910
    def missing_parents_rev_handler(self, substream):
1910
1911
        for content in substream:
1911
1912
            revision_bytes = content.get_bytes_as('fulltext')
1912
 
            revision = self.serialiser.read_revision_from_string(revision_bytes)
 
1913
            revision = self.from_serialiser.read_revision_from_string(
 
1914
                revision_bytes)
1913
1915
            self.seen_revs.add(content.key[-1])
1914
1916
            self.referenced_revs.update(revision.parent_ids)
1915
1917
            yield content
2267
2269
        medium = self._client._medium
2268
2270
        if medium._is_remote_before((1, 18)):
2269
2271
            self._vfs_set_tags_bytes(bytes)
 
2272
            return
2270
2273
        try:
2271
2274
            args = (
2272
2275
                self._remote_path(), self._lock_token, self._repo_lock_token)
2389
2392
            raise NotImplementedError(self.dont_leave_lock_in_place)
2390
2393
        self._leave_lock = False
2391
2394
 
 
2395
    @needs_read_lock
2392
2396
    def get_rev_id(self, revno, history=None):
2393
2397
        if revno == 0:
2394
2398
            return _mod_revision.NULL_REVISION