~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/remote.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-09-09 13:49:07 UTC
  • mfrom: (4679.1.1 merge-2.0-into-bzr.dev)
  • Revision ID: pqm@pqm.ubuntu.com-20090909134907-nnrr06jw5o011doh
(andrew) Merge 2.0 tip, including fixes for 408841, 423506, 406687,
        418931.

Show diffs side-by-side

added added

removed removed

Lines of Context:
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])
2267
2268
        medium = self._client._medium
2268
2269
        if medium._is_remote_before((1, 18)):
2269
2270
            self._vfs_set_tags_bytes(bytes)
 
2271
            return
2270
2272
        try:
2271
2273
            args = (
2272
2274
                self._remote_path(), self._lock_token, self._repo_lock_token)