/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: Martin Pool
  • Date: 2009-08-26 05:38:16 UTC
  • mfrom: (4634.6.2 2.0)
  • mto: (4634.6.4 2.0)
  • mto: This revision was merged to the branch mainline in revision 4660.
  • Revision ID: mbp@sourcefrog.net-20090826053816-ht6jpktdm77vi6t5
Merge 2.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/remote.py
426
426
        self._custom_format = None
427
427
        self._network_name = None
428
428
        self._creating_bzrdir = None
 
429
        self._supports_chks = None
429
430
        self._supports_external_lookups = None
430
431
        self._supports_tree_reference = None
431
432
        self._rich_root_data = None
432
433
 
 
434
    def __repr__(self):
 
435
        return "%s(_network_name=%r)" % (self.__class__.__name__,
 
436
            self._network_name)
 
437
 
433
438
    @property
434
439
    def fast_deltas(self):
435
440
        self._ensure_real()
443
448
        return self._rich_root_data
444
449
 
445
450
    @property
 
451
    def supports_chks(self):
 
452
        if self._supports_chks is None:
 
453
            self._ensure_real()
 
454
            self._supports_chks = self._custom_format.supports_chks
 
455
        return self._supports_chks
 
456
 
 
457
    @property
446
458
    def supports_external_lookups(self):
447
459
        if self._supports_external_lookups is None:
448
460
            self._ensure_real()
554
566
    def __eq__(self, other):
555
567
        return self.__class__ is other.__class__
556
568
 
557
 
    def check_conversion_target(self, target_format):
558
 
        if self.rich_root_data and not target_format.rich_root_data:
559
 
            raise errors.BadConversionTarget(
560
 
                'Does not support rich root data.', target_format)
561
 
        if (self.supports_tree_reference and
562
 
            not getattr(target_format, 'supports_tree_reference', False)):
563
 
            raise errors.BadConversionTarget(
564
 
                'Does not support nested trees', target_format)
565
 
 
566
569
    def network_name(self):
567
570
        if self._network_name:
568
571
            return self._network_name
1178
1181
        self._ensure_real()
1179
1182
        return self._real_repository.get_inventory(revision_id)
1180
1183
 
1181
 
    def iter_inventories(self, revision_ids):
 
1184
    def iter_inventories(self, revision_ids, ordering=None):
1182
1185
        self._ensure_real()
1183
 
        return self._real_repository.iter_inventories(revision_ids)
 
1186
        return self._real_repository.iter_inventories(revision_ids, ordering)
1184
1187
 
1185
1188
    @needs_read_lock
1186
1189
    def get_revision(self, revision_id):
1682
1685
    def insert_stream(self, stream, src_format, resume_tokens):
1683
1686
        target = self.target_repo
1684
1687
        target._unstacked_provider.missing_keys.clear()
 
1688
        candidate_calls = [('Repository.insert_stream_1.19', (1, 19))]
1685
1689
        if target._lock_token:
1686
 
            verb = 'Repository.insert_stream_locked'
1687
 
            extra_args = (target._lock_token or '',)
1688
 
            required_version = (1, 14)
 
1690
            candidate_calls.append(('Repository.insert_stream_locked', (1, 14)))
 
1691
            lock_args = (target._lock_token or '',)
1689
1692
        else:
1690
 
            verb = 'Repository.insert_stream'
1691
 
            extra_args = ()
1692
 
            required_version = (1, 13)
 
1693
            candidate_calls.append(('Repository.insert_stream', (1, 13)))
 
1694
            lock_args = ()
1693
1695
        client = target._client
1694
1696
        medium = client._medium
1695
 
        if medium._is_remote_before(required_version):
1696
 
            # No possible way this can work.
1697
 
            return self._insert_real(stream, src_format, resume_tokens)
1698
1697
        path = target.bzrdir._path_for_remote_call(client)
1699
 
        if not resume_tokens:
1700
 
            # XXX: Ugly but important for correctness, *will* be fixed during
1701
 
            # 1.13 cycle. Pushing a stream that is interrupted results in a
1702
 
            # fallback to the _real_repositories sink *with a partial stream*.
1703
 
            # Thats bad because we insert less data than bzr expected. To avoid
1704
 
            # this we do a trial push to make sure the verb is accessible, and
1705
 
            # do not fallback when actually pushing the stream. A cleanup patch
1706
 
            # is going to look at rewinding/restarting the stream/partial
1707
 
            # buffering etc.
 
1698
        # Probe for the verb to use with an empty stream before sending the
 
1699
        # real stream to it.  We do this both to avoid the risk of sending a
 
1700
        # large request that is then rejected, and because we don't want to
 
1701
        # implement a way to buffer, rewind, or restart the stream.
 
1702
        found_verb = False
 
1703
        for verb, required_version in candidate_calls:
 
1704
            if medium._is_remote_before(required_version):
 
1705
                continue
 
1706
            if resume_tokens:
 
1707
                # We've already done the probing (and set _is_remote_before) on
 
1708
                # a previous insert.
 
1709
                found_verb = True
 
1710
                break
1708
1711
            byte_stream = smart_repo._stream_to_byte_stream([], src_format)
1709
1712
            try:
1710
1713
                response = client.call_with_body_stream(
1711
 
                    (verb, path, '') + extra_args, byte_stream)
 
1714
                    (verb, path, '') + lock_args, byte_stream)
1712
1715
            except errors.UnknownSmartMethod:
1713
1716
                medium._remember_remote_is_before(required_version)
1714
 
                return self._insert_real(stream, src_format, resume_tokens)
 
1717
            else:
 
1718
                found_verb = True
 
1719
                break
 
1720
        if not found_verb:
 
1721
            # Have to use VFS.
 
1722
            return self._insert_real(stream, src_format, resume_tokens)
 
1723
        self._last_inv_record = None
 
1724
        self._last_substream = None
 
1725
        if required_version < (1, 19):
 
1726
            # Remote side doesn't support inventory deltas.  Wrap the stream to
 
1727
            # make sure we don't send any.  If the stream contains inventory
 
1728
            # deltas we'll interrupt the smart insert_stream request and
 
1729
            # fallback to VFS.
 
1730
            stream = self._stop_stream_if_inventory_delta(stream)
1715
1731
        byte_stream = smart_repo._stream_to_byte_stream(
1716
1732
            stream, src_format)
1717
1733
        resume_tokens = ' '.join(resume_tokens)
1718
1734
        response = client.call_with_body_stream(
1719
 
            (verb, path, resume_tokens) + extra_args, byte_stream)
 
1735
            (verb, path, resume_tokens) + lock_args, byte_stream)
1720
1736
        if response[0][0] not in ('ok', 'missing-basis'):
1721
1737
            raise errors.UnexpectedSmartServerResponse(response)
 
1738
        if self._last_substream is not None:
 
1739
            # The stream included an inventory-delta record, but the remote
 
1740
            # side isn't new enough to support them.  So we need to send the
 
1741
            # rest of the stream via VFS.
 
1742
            return self._resume_stream_with_vfs(response, src_format)
1722
1743
        if response[0][0] == 'missing-basis':
1723
1744
            tokens, missing_keys = bencode.bdecode_as_tuple(response[0][1])
1724
1745
            resume_tokens = tokens
1727
1748
            self.target_repo.refresh_data()
1728
1749
            return [], set()
1729
1750
 
 
1751
    def _resume_stream_with_vfs(self, response, src_format):
 
1752
        """Resume sending a stream via VFS, first resending the record and
 
1753
        substream that couldn't be sent via an insert_stream verb.
 
1754
        """
 
1755
        if response[0][0] == 'missing-basis':
 
1756
            tokens, missing_keys = bencode.bdecode_as_tuple(response[0][1])
 
1757
            # Ignore missing_keys, we haven't finished inserting yet
 
1758
        else:
 
1759
            tokens = []
 
1760
        def resume_substream():
 
1761
            # Yield the substream that was interrupted.
 
1762
            for record in self._last_substream:
 
1763
                yield record
 
1764
            self._last_substream = None
 
1765
        def resume_stream():
 
1766
            # Finish sending the interrupted substream
 
1767
            yield ('inventory-deltas', resume_substream())
 
1768
            # Then simply continue sending the rest of the stream.
 
1769
            for substream_kind, substream in self._last_stream:
 
1770
                yield substream_kind, substream
 
1771
        return self._insert_real(resume_stream(), src_format, tokens)
 
1772
 
 
1773
    def _stop_stream_if_inventory_delta(self, stream):
 
1774
        """Normally this just lets the original stream pass-through unchanged.
 
1775
 
 
1776
        However if any 'inventory-deltas' substream occurs it will stop
 
1777
        streaming, and store the interrupted substream and stream in
 
1778
        self._last_substream and self._last_stream so that the stream can be
 
1779
        resumed by _resume_stream_with_vfs.
 
1780
        """
 
1781
                    
 
1782
        stream_iter = iter(stream)
 
1783
        for substream_kind, substream in stream_iter:
 
1784
            if substream_kind == 'inventory-deltas':
 
1785
                self._last_substream = substream
 
1786
                self._last_stream = stream_iter
 
1787
                return
 
1788
            else:
 
1789
                yield substream_kind, substream
 
1790
            
1730
1791
 
1731
1792
class RemoteStreamSource(repository.StreamSource):
1732
1793
    """Stream data from a remote server."""
1747
1808
            sources.append(repo)
1748
1809
        return self.missing_parents_chain(search, sources)
1749
1810
 
 
1811
    def get_stream_for_missing_keys(self, missing_keys):
 
1812
        self.from_repository._ensure_real()
 
1813
        real_repo = self.from_repository._real_repository
 
1814
        real_source = real_repo._get_source(self.to_format)
 
1815
        return real_source.get_stream_for_missing_keys(missing_keys)
 
1816
 
1750
1817
    def _real_stream(self, repo, search):
1751
1818
        """Get a stream for search from repo.
1752
1819
        
1758
1825
        """
1759
1826
        source = repo._get_source(self.to_format)
1760
1827
        if isinstance(source, RemoteStreamSource):
1761
 
            return repository.StreamSource.get_stream(source, search)
 
1828
            repo._ensure_real()
 
1829
            source = repo._real_repository._get_source(self.to_format)
1762
1830
        return source.get_stream(search)
1763
1831
 
1764
1832
    def _get_stream(self, repo, search):
1781
1849
            return self._real_stream(repo, search)
1782
1850
        client = repo._client
1783
1851
        medium = client._medium
1784
 
        if medium._is_remote_before((1, 13)):
1785
 
            # streaming was added in 1.13
1786
 
            return self._real_stream(repo, search)
1787
1852
        path = repo.bzrdir._path_for_remote_call(client)
1788
 
        try:
1789
 
            search_bytes = repo._serialise_search_result(search)
1790
 
            response = repo._call_with_body_bytes_expecting_body(
1791
 
                'Repository.get_stream',
1792
 
                (path, self.to_format.network_name()), search_bytes)
1793
 
            response_tuple, response_handler = response
1794
 
        except errors.UnknownSmartMethod:
1795
 
            medium._remember_remote_is_before((1,13))
 
1853
        search_bytes = repo._serialise_search_result(search)
 
1854
        args = (path, self.to_format.network_name())
 
1855
        candidate_verbs = [
 
1856
            ('Repository.get_stream_1.19', (1, 19)),
 
1857
            ('Repository.get_stream', (1, 13))]
 
1858
        found_verb = False
 
1859
        for verb, version in candidate_verbs:
 
1860
            if medium._is_remote_before(version):
 
1861
                continue
 
1862
            try:
 
1863
                response = repo._call_with_body_bytes_expecting_body(
 
1864
                    verb, args, search_bytes)
 
1865
            except errors.UnknownSmartMethod:
 
1866
                medium._remember_remote_is_before(version)
 
1867
            else:
 
1868
                response_tuple, response_handler = response
 
1869
                found_verb = True
 
1870
                break
 
1871
        if not found_verb:
1796
1872
            return self._real_stream(repo, search)
1797
1873
        if response_tuple[0] != 'ok':
1798
1874
            raise errors.UnexpectedSmartServerResponse(response_tuple)
2027
2103
                    self._real_branch._format.network_name()
2028
2104
        else:
2029
2105
            self._format = format
 
2106
        # when we do _ensure_real we may need to pass ignore_fallbacks to the
 
2107
        # branch.open_branch method.
 
2108
        self._real_ignore_fallbacks = not setup_stacking
2030
2109
        if not self._format._network_name:
2031
2110
            # Did not get from open_branchV2 - old server.
2032
2111
            self._ensure_real()
2077
2156
                raise AssertionError('smart server vfs must be enabled '
2078
2157
                    'to use vfs implementation')
2079
2158
            self.bzrdir._ensure_real()
2080
 
            self._real_branch = self.bzrdir._real_bzrdir.open_branch()
 
2159
            self._real_branch = self.bzrdir._real_bzrdir.open_branch(
 
2160
                ignore_fallbacks=self._real_ignore_fallbacks)
2081
2161
            if self.repository._real_repository is None:
2082
2162
                # Give the remote repository the matching real repo.
2083
2163
                real_repo = self._real_branch.repository