/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

  • Committer: Andrew Bennetts
  • Date: 2009-08-14 00:55:42 UTC
  • mto: This revision was merged to the branch mainline in revision 4608.
  • Revision ID: andrew.bennetts@canonical.com-20090814005542-eijja5p5nby2g44s
Mention another bug fix in NEWS, and update verb name, comments, and NEWS additions for landing on 1.19 rather than 1.18.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/remote.py
1690
1690
    def insert_stream(self, stream, src_format, resume_tokens):
1691
1691
        target = self.target_repo
1692
1692
        target._unstacked_provider.missing_keys.clear()
1693
 
        candidate_calls = [('Repository.insert_stream_1.18', (1, 18))]
 
1693
        candidate_calls = [('Repository.insert_stream_1.19', (1, 19))]
1694
1694
        if target._lock_token:
1695
1695
            candidate_calls.append(('Repository.insert_stream_locked', (1, 14)))
1696
1696
            lock_args = (target._lock_token or '',)
1727
1727
            return self._insert_real(stream, src_format, resume_tokens)
1728
1728
        self._last_inv_record = None
1729
1729
        self._last_substream = None
1730
 
        if required_version < (1, 18):
 
1730
        if required_version < (1, 19):
1731
1731
            # Remote side doesn't support inventory deltas.  Wrap the stream to
1732
1732
            # make sure we don't send any.  If the stream contains inventory
1733
1733
            # deltas we'll interrupt the smart insert_stream request and
1857
1857
        search_bytes = repo._serialise_search_result(search)
1858
1858
        args = (path, self.to_format.network_name())
1859
1859
        candidate_verbs = [
1860
 
            ('Repository.get_stream_1.18', (1, 18)),
 
1860
            ('Repository.get_stream_1.19', (1, 19)),
1861
1861
            ('Repository.get_stream', (1, 13))]
1862
1862
        found_verb = False
1863
1863
        for verb, version in candidate_verbs: