← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/remote.py

  • Committer: Martin Pool
  • Date: 2009-08-15 08:07:50 UTC
  • mto: This revision was merged to the branch mainline in revision 4614.
  • Revision ID: mbp@sourcefrog.net-20090815080750-kw8fh8trba5euzoh
Change overly-tight selftest test to use a re

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
430
429
        self._supports_external_lookups = None
431
430
        self._supports_tree_reference = None
432
431
        self._rich_root_data = None
433
432
 
434
 
    def __repr__(self):
435
 
        return "%s(_network_name=%r)" % (self.__class__.__name__,
436
 
            self._network_name)
437
 
 
438
433
    @property
439
434
    def fast_deltas(self):
440
435
        self._ensure_real()
448
443
        return self._rich_root_data
449
444
 
450
445
    @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
458
446
    def supports_external_lookups(self):
459
447
        if self._supports_external_lookups is None:
460
448
            self._ensure_real()
566
554
    def __eq__(self, other):
567
555
        return self.__class__ is other.__class__
568
556
 
 
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
 
569
566
    def network_name(self):
570
567
        if self._network_name:
571
568
            return self._network_name
1181
1178
        self._ensure_real()
1182
1179
        return self._real_repository.get_inventory(revision_id)
1183
1180
 
1184
 
    def iter_inventories(self, revision_ids, ordering=None):
 
1181
    def iter_inventories(self, revision_ids):
1185
1182
        self._ensure_real()
1186
 
        return self._real_repository.iter_inventories(revision_ids, ordering)
 
1183
        return self._real_repository.iter_inventories(revision_ids)
1187
1184
 
1188
1185
    @needs_read_lock
1189
1186
    def get_revision(self, revision_id):
1685
1682
    def insert_stream(self, stream, src_format, resume_tokens):
1686
1683
        target = self.target_repo
1687
1684
        target._unstacked_provider.missing_keys.clear()
1688
 
        candidate_calls = [('Repository.insert_stream_1.19', (1, 19))]
1689
1685
        if target._lock_token:
1690
 
            candidate_calls.append(('Repository.insert_stream_locked', (1, 14)))
1691
 
            lock_args = (target._lock_token or '',)
 
1686
            verb = 'Repository.insert_stream_locked'
 
1687
            extra_args = (target._lock_token or '',)
 
1688
            required_version = (1, 14)
1692
1689
        else:
1693
 
            candidate_calls.append(('Repository.insert_stream', (1, 13)))
1694
 
            lock_args = ()
 
1690
            verb = 'Repository.insert_stream'
 
1691
            extra_args = ()
 
1692
            required_version = (1, 13)
1695
1693
        client = target._client
1696
1694
        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)
1697
1698
        path = target.bzrdir._path_for_remote_call(client)
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
 
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.
1711
1708
            byte_stream = smart_repo._stream_to_byte_stream([], src_format)
1712
1709
            try:
1713
1710
                response = client.call_with_body_stream(
1714
 
                    (verb, path, '') + lock_args, byte_stream)
 
1711
                    (verb, path, '') + extra_args, byte_stream)
1715
1712
            except errors.UnknownSmartMethod:
1716
1713
                medium._remember_remote_is_before(required_version)
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)
 
1714
                return self._insert_real(stream, src_format, resume_tokens)
1731
1715
        byte_stream = smart_repo._stream_to_byte_stream(
1732
1716
            stream, src_format)
1733
1717
        resume_tokens = ' '.join(resume_tokens)
1734
1718
        response = client.call_with_body_stream(
1735
 
            (verb, path, resume_tokens) + lock_args, byte_stream)
 
1719
            (verb, path, resume_tokens) + extra_args, byte_stream)
1736
1720
        if response[0][0] not in ('ok', 'missing-basis'):
1737
1721
            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)
1743
1722
        if response[0][0] == 'missing-basis':
1744
1723
            tokens, missing_keys = bencode.bdecode_as_tuple(response[0][1])
1745
1724
            resume_tokens = tokens
1748
1727
            self.target_repo.refresh_data()
1749
1728
            return [], set()
1750
1729
 
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
 
            
1791
1730
 
1792
1731
class RemoteStreamSource(repository.StreamSource):
1793
1732
    """Stream data from a remote server."""
1808
1747
            sources.append(repo)
1809
1748
        return self.missing_parents_chain(search, sources)
1810
1749
 
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
 
 
1817
1750
    def _real_stream(self, repo, search):
1818
1751
        """Get a stream for search from repo.
1819
1752
        
1825
1758
        """
1826
1759
        source = repo._get_source(self.to_format)
1827
1760
        if isinstance(source, RemoteStreamSource):
1828
 
            repo._ensure_real()
1829
 
            source = repo._real_repository._get_source(self.to_format)
 
1761
            return repository.StreamSource.get_stream(source, search)
1830
1762
        return source.get_stream(search)
1831
1763
 
1832
1764
    def _get_stream(self, repo, search):
1849
1781
            return self._real_stream(repo, search)
1850
1782
        client = repo._client
1851
1783
        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)
1852
1787
        path = repo.bzrdir._path_for_remote_call(client)
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:
 
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))
1872
1796
            return self._real_stream(repo, search)
1873
1797
        if response_tuple[0] != 'ok':
1874
1798
            raise errors.UnexpectedSmartServerResponse(response_tuple)
2103
2027
                    self._real_branch._format.network_name()
2104
2028
        else:
2105
2029
            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
2109
2030
        if not self._format._network_name:
2110
2031
            # Did not get from open_branchV2 - old server.
2111
2032
            self._ensure_real()
2156
2077
                raise AssertionError('smart server vfs must be enabled '
2157
2078
                    'to use vfs implementation')
2158
2079
            self.bzrdir._ensure_real()
2159
 
            self._real_branch = self.bzrdir._real_bzrdir.open_branch(
2160
 
                ignore_fallbacks=self._real_ignore_fallbacks)
 
2080
            self._real_branch = self.bzrdir._real_bzrdir.open_branch()
2161
2081
            if self.repository._real_repository is None:
2162
2082
                # Give the remote repository the matching real repo.
2163
2083
                real_repo = self._real_branch.repository