← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/remote.py

merge 2.0 branch rev 4647

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/remote.py
1
 
# Copyright (C) 2006, 2007, 2008 Canonical Ltd
 
1
# Copyright (C) 2006, 2007, 2008, 2009 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
 
# TODO: At some point, handle upgrades by just passing the whole request
18
 
# across to run on the server.
19
 
 
20
17
import bz2
21
18
 
22
19
from bzrlib import (
27
24
    debug,
28
25
    errors,
29
26
    graph,
 
27
    lock,
30
28
    lockdir,
31
 
    pack,
32
29
    repository,
33
30
    revision,
34
31
    revision as _mod_revision,
35
32
    symbol_versioning,
36
 
    urlutils,
37
33
)
38
34
from bzrlib.branch import BranchReferenceFormat
39
35
from bzrlib.bzrdir import BzrDir, RemoteBzrDirFormat
63
59
        except errors.ErrorFromSmartServer, err:
64
60
            self._translate_error(err, **err_context)
65
61
 
 
62
    def _call_with_body_bytes(self, method, args, body_bytes, **err_context):
 
63
        try:
 
64
            return self._client.call_with_body_bytes(method, args, body_bytes)
 
65
        except errors.ErrorFromSmartServer, err:
 
66
            self._translate_error(err, **err_context)
 
67
 
66
68
    def _call_with_body_bytes_expecting_body(self, method, args, body_bytes,
67
69
                                             **err_context):
68
70
        try:
424
426
        self._custom_format = None
425
427
        self._network_name = None
426
428
        self._creating_bzrdir = None
 
429
        self._supports_chks = None
427
430
        self._supports_external_lookups = None
428
431
        self._supports_tree_reference = None
429
432
        self._rich_root_data = None
430
433
 
 
434
    def __repr__(self):
 
435
        return "%s(_network_name=%r)" % (self.__class__.__name__,
 
436
            self._network_name)
 
437
 
431
438
    @property
432
439
    def fast_deltas(self):
433
440
        self._ensure_real()
441
448
        return self._rich_root_data
442
449
 
443
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
444
458
    def supports_external_lookups(self):
445
459
        if self._supports_external_lookups is None:
446
460
            self._ensure_real()
552
566
    def __eq__(self, other):
553
567
        return self.__class__ is other.__class__
554
568
 
555
 
    def check_conversion_target(self, target_format):
556
 
        if self.rich_root_data and not target_format.rich_root_data:
557
 
            raise errors.BadConversionTarget(
558
 
                'Does not support rich root data.', target_format)
559
 
        if (self.supports_tree_reference and
560
 
            not getattr(target_format, 'supports_tree_reference', False)):
561
 
            raise errors.BadConversionTarget(
562
 
                'Does not support nested trees', target_format)
563
 
 
564
569
    def network_name(self):
565
570
        if self._network_name:
566
571
            return self._network_name
568
573
        return self._creating_repo._real_repository._format.network_name()
569
574
 
570
575
    @property
 
576
    def pack_compresses(self):
 
577
        self._ensure_real()
 
578
        return self._custom_format.pack_compresses
 
579
 
 
580
    @property
571
581
    def _serializer(self):
572
582
        self._ensure_real()
573
583
        return self._custom_format._serializer
675
685
        return self._real_repository.get_missing_parent_inventories(
676
686
            check_for_missing_texts=check_for_missing_texts)
677
687
 
 
688
    def _get_rev_id_for_revno_vfs(self, revno, known_pair):
 
689
        self._ensure_real()
 
690
        return self._real_repository.get_rev_id_for_revno(
 
691
            revno, known_pair)
 
692
 
 
693
    def get_rev_id_for_revno(self, revno, known_pair):
 
694
        """See Repository.get_rev_id_for_revno."""
 
695
        path = self.bzrdir._path_for_remote_call(self._client)
 
696
        try:
 
697
            if self._client._medium._is_remote_before((1, 17)):
 
698
                return self._get_rev_id_for_revno_vfs(revno, known_pair)
 
699
            response = self._call(
 
700
                'Repository.get_rev_id_for_revno', path, revno, known_pair)
 
701
        except errors.UnknownSmartMethod:
 
702
            self._client._medium._remember_remote_is_before((1, 17))
 
703
            return self._get_rev_id_for_revno_vfs(revno, known_pair)
 
704
        if response[0] == 'ok':
 
705
            return True, response[1]
 
706
        elif response[0] == 'history-incomplete':
 
707
            known_pair = response[1:3]
 
708
            for fallback in self._fallback_repositories:
 
709
                found, result = fallback.get_rev_id_for_revno(revno, known_pair)
 
710
                if found:
 
711
                    return True, result
 
712
                else:
 
713
                    known_pair = result
 
714
            # Not found in any fallbacks
 
715
            return False, known_pair
 
716
        else:
 
717
            raise errors.UnexpectedSmartServerResponse(response)
 
718
 
678
719
    def _ensure_real(self):
679
720
        """Ensure that there is a _real_repository set.
680
721
 
689
730
        invocation. If in doubt chat to the bzr network team.
690
731
        """
691
732
        if self._real_repository is None:
692
 
            if 'hpss' in debug.debug_flags:
 
733
            if 'hpssvfs' in debug.debug_flags:
693
734
                import traceback
694
735
                warning('VFS Repository access triggered\n%s',
695
736
                    ''.join(traceback.format_stack()))
779
820
            result.add(_mod_revision.NULL_REVISION)
780
821
        return result
781
822
 
 
823
    def _has_same_fallbacks(self, other_repo):
 
824
        """Returns true if the repositories have the same fallbacks."""
 
825
        # XXX: copied from Repository; it should be unified into a base class
 
826
        # <https://bugs.edge.launchpad.net/bzr/+bug/401622>
 
827
        my_fb = self._fallback_repositories
 
828
        other_fb = other_repo._fallback_repositories
 
829
        if len(my_fb) != len(other_fb):
 
830
            return False
 
831
        for f, g in zip(my_fb, other_fb):
 
832
            if not f.has_same_location(g):
 
833
                return False
 
834
        return True
 
835
 
782
836
    def has_same_location(self, other):
 
837
        # TODO: Move to RepositoryBase and unify with the regular Repository
 
838
        # one; unfortunately the tests rely on slightly different behaviour at
 
839
        # present -- mbp 20090710
783
840
        return (self.__class__ is other.__class__ and
784
841
                self.bzrdir.transport.base == other.bzrdir.transport.base)
785
842
 
991
1048
 
992
1049
    def unlock(self):
993
1050
        if not self._lock_count:
994
 
            raise errors.LockNotHeld(self)
 
1051
            return lock.cant_unlock_not_held(self)
995
1052
        self._lock_count -= 1
996
1053
        if self._lock_count > 0:
997
1054
            return
1124
1181
        self._ensure_real()
1125
1182
        return self._real_repository.get_inventory(revision_id)
1126
1183
 
1127
 
    def iter_inventories(self, revision_ids):
 
1184
    def iter_inventories(self, revision_ids, ordering=None):
1128
1185
        self._ensure_real()
1129
 
        return self._real_repository.iter_inventories(revision_ids)
 
1186
        return self._real_repository.iter_inventories(revision_ids, ordering)
1130
1187
 
1131
1188
    @needs_read_lock
1132
1189
    def get_revision(self, revision_id):
1196
1253
            raise errors.InternalBzrError(
1197
1254
                "May not fetch while in a write group.")
1198
1255
        # fast path same-url fetch operations
1199
 
        if self.has_same_location(source) and fetch_spec is None:
 
1256
        if (self.has_same_location(source)
 
1257
            and fetch_spec is None
 
1258
            and self._has_same_fallbacks(source)):
1200
1259
            # check that last_revision is in 'from' and then return a
1201
1260
            # no-operation.
1202
1261
            if (revision_id is not None and
1414
1473
        return self._real_repository.get_revision_reconcile(revision_id)
1415
1474
 
1416
1475
    @needs_read_lock
1417
 
    def check(self, revision_ids=None):
 
1476
    def check(self, revision_ids=None, callback_refs=None, check_repo=True):
1418
1477
        self._ensure_real()
1419
 
        return self._real_repository.check(revision_ids=revision_ids)
 
1478
        return self._real_repository.check(revision_ids=revision_ids,
 
1479
            callback_refs=callback_refs, check_repo=check_repo)
1420
1480
 
1421
1481
    def copy_content_into(self, destination, revision_id=None):
1422
1482
        self._ensure_real()
1462
1522
        return self._real_repository.inventories
1463
1523
 
1464
1524
    @needs_write_lock
1465
 
    def pack(self):
 
1525
    def pack(self, hint=None):
1466
1526
        """Compress the data within the repository.
1467
1527
 
1468
1528
        This is not currently implemented within the smart server.
1469
1529
        """
1470
1530
        self._ensure_real()
1471
 
        return self._real_repository.pack()
 
1531
        return self._real_repository.pack(hint=hint)
1472
1532
 
1473
1533
    @property
1474
1534
    def revisions(self):
1562
1622
        self._ensure_real()
1563
1623
        return self._real_repository.revision_graph_can_have_wrong_parents()
1564
1624
 
1565
 
    def _find_inconsistent_revision_parents(self):
 
1625
    def _find_inconsistent_revision_parents(self, revisions_iterator=None):
1566
1626
        self._ensure_real()
1567
 
        return self._real_repository._find_inconsistent_revision_parents()
 
1627
        return self._real_repository._find_inconsistent_revision_parents(
 
1628
            revisions_iterator)
1568
1629
 
1569
1630
    def _check_for_inconsistent_revision_parents(self):
1570
1631
        self._ensure_real()
1624
1685
    def insert_stream(self, stream, src_format, resume_tokens):
1625
1686
        target = self.target_repo
1626
1687
        target._unstacked_provider.missing_keys.clear()
 
1688
        candidate_calls = [('Repository.insert_stream_1.19', (1, 19))]
1627
1689
        if target._lock_token:
1628
 
            verb = 'Repository.insert_stream_locked'
1629
 
            extra_args = (target._lock_token or '',)
1630
 
            required_version = (1, 14)
 
1690
            candidate_calls.append(('Repository.insert_stream_locked', (1, 14)))
 
1691
            lock_args = (target._lock_token or '',)
1631
1692
        else:
1632
 
            verb = 'Repository.insert_stream'
1633
 
            extra_args = ()
1634
 
            required_version = (1, 13)
 
1693
            candidate_calls.append(('Repository.insert_stream', (1, 13)))
 
1694
            lock_args = ()
1635
1695
        client = target._client
1636
1696
        medium = client._medium
1637
 
        if medium._is_remote_before(required_version):
1638
 
            # No possible way this can work.
1639
 
            return self._insert_real(stream, src_format, resume_tokens)
1640
1697
        path = target.bzrdir._path_for_remote_call(client)
1641
 
        if not resume_tokens:
1642
 
            # XXX: Ugly but important for correctness, *will* be fixed during
1643
 
            # 1.13 cycle. Pushing a stream that is interrupted results in a
1644
 
            # fallback to the _real_repositories sink *with a partial stream*.
1645
 
            # Thats bad because we insert less data than bzr expected. To avoid
1646
 
            # this we do a trial push to make sure the verb is accessible, and
1647
 
            # do not fallback when actually pushing the stream. A cleanup patch
1648
 
            # is going to look at rewinding/restarting the stream/partial
1649
 
            # 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
1650
1711
            byte_stream = smart_repo._stream_to_byte_stream([], src_format)
1651
1712
            try:
1652
1713
                response = client.call_with_body_stream(
1653
 
                    (verb, path, '') + extra_args, byte_stream)
 
1714
                    (verb, path, '') + lock_args, byte_stream)
1654
1715
            except errors.UnknownSmartMethod:
1655
1716
                medium._remember_remote_is_before(required_version)
1656
 
                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)
1657
1731
        byte_stream = smart_repo._stream_to_byte_stream(
1658
1732
            stream, src_format)
1659
1733
        resume_tokens = ' '.join(resume_tokens)
1660
1734
        response = client.call_with_body_stream(
1661
 
            (verb, path, resume_tokens) + extra_args, byte_stream)
 
1735
            (verb, path, resume_tokens) + lock_args, byte_stream)
1662
1736
        if response[0][0] not in ('ok', 'missing-basis'):
1663
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)
1664
1743
        if response[0][0] == 'missing-basis':
1665
1744
            tokens, missing_keys = bencode.bdecode_as_tuple(response[0][1])
1666
1745
            resume_tokens = tokens
1669
1748
            self.target_repo.refresh_data()
1670
1749
            return [], set()
1671
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
            
1672
1791
 
1673
1792
class RemoteStreamSource(repository.StreamSource):
1674
1793
    """Stream data from a remote server."""
1677
1796
        if (self.from_repository._fallback_repositories and
1678
1797
            self.to_format._fetch_order == 'topological'):
1679
1798
            return self._real_stream(self.from_repository, search)
1680
 
        return self.missing_parents_chain(search, [self.from_repository] +
1681
 
            self.from_repository._fallback_repositories)
 
1799
        sources = []
 
1800
        seen = set()
 
1801
        repos = [self.from_repository]
 
1802
        while repos:
 
1803
            repo = repos.pop(0)
 
1804
            if repo in seen:
 
1805
                continue
 
1806
            seen.add(repo)
 
1807
            repos.extend(repo._fallback_repositories)
 
1808
            sources.append(repo)
 
1809
        return self.missing_parents_chain(search, sources)
 
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)
1682
1816
 
1683
1817
    def _real_stream(self, repo, search):
1684
1818
        """Get a stream for search from repo.
1691
1825
        """
1692
1826
        source = repo._get_source(self.to_format)
1693
1827
        if isinstance(source, RemoteStreamSource):
1694
 
            return repository.StreamSource.get_stream(source, search)
 
1828
            repo._ensure_real()
 
1829
            source = repo._real_repository._get_source(self.to_format)
1695
1830
        return source.get_stream(search)
1696
1831
 
1697
1832
    def _get_stream(self, repo, search):
1714
1849
            return self._real_stream(repo, search)
1715
1850
        client = repo._client
1716
1851
        medium = client._medium
1717
 
        if medium._is_remote_before((1, 13)):
1718
 
            # streaming was added in 1.13
1719
 
            return self._real_stream(repo, search)
1720
1852
        path = repo.bzrdir._path_for_remote_call(client)
1721
 
        try:
1722
 
            search_bytes = repo._serialise_search_result(search)
1723
 
            response = repo._call_with_body_bytes_expecting_body(
1724
 
                'Repository.get_stream',
1725
 
                (path, self.to_format.network_name()), search_bytes)
1726
 
            response_tuple, response_handler = response
1727
 
        except errors.UnknownSmartMethod:
1728
 
            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:
1729
1872
            return self._real_stream(repo, search)
1730
1873
        if response_tuple[0] != 'ok':
1731
1874
            raise errors.UnexpectedSmartServerResponse(response_tuple)
1895
2038
        self._ensure_real()
1896
2039
        return self._custom_format.supports_stacking()
1897
2040
 
 
2041
    def supports_set_append_revisions_only(self):
 
2042
        self._ensure_real()
 
2043
        return self._custom_format.supports_set_append_revisions_only()
 
2044
 
1898
2045
 
1899
2046
class RemoteBranch(branch.Branch, _RpcHelper):
1900
2047
    """Branch stored on a server accessed by HPSS RPC.
1919
2066
        # We intentionally don't call the parent class's __init__, because it
1920
2067
        # will try to assign to self.tags, which is a property in this subclass.
1921
2068
        # And the parent's __init__ doesn't do much anyway.
1922
 
        self._revision_id_to_revno_cache = None
1923
 
        self._partial_revision_id_to_revno_cache = {}
1924
 
        self._revision_history_cache = None
1925
 
        self._last_revision_info_cache = None
1926
 
        self._merge_sorted_revisions_cache = None
1927
2069
        self.bzrdir = remote_bzrdir
1928
2070
        if _client is not None:
1929
2071
            self._client = _client
1943
2085
        else:
1944
2086
            self._real_branch = None
1945
2087
        # Fill out expected attributes of branch for bzrlib API users.
 
2088
        self._clear_cached_state()
1946
2089
        self.base = self.bzrdir.root_transport.base
1947
2090
        self._control_files = None
1948
2091
        self._lock_mode = None
1960
2103
                    self._real_branch._format.network_name()
1961
2104
        else:
1962
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
1963
2109
        if not self._format._network_name:
1964
2110
            # Did not get from open_branchV2 - old server.
1965
2111
            self._ensure_real()
2010
2156
                raise AssertionError('smart server vfs must be enabled '
2011
2157
                    'to use vfs implementation')
2012
2158
            self.bzrdir._ensure_real()
2013
 
            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)
2014
2161
            if self.repository._real_repository is None:
2015
2162
                # Give the remote repository the matching real repo.
2016
2163
                real_repo = self._real_branch.repository
2112
2259
            return self._vfs_get_tags_bytes()
2113
2260
        return response[0]
2114
2261
 
 
2262
    def _vfs_set_tags_bytes(self, bytes):
 
2263
        self._ensure_real()
 
2264
        return self._real_branch._set_tags_bytes(bytes)
 
2265
 
 
2266
    def _set_tags_bytes(self, bytes):
 
2267
        medium = self._client._medium
 
2268
        if medium._is_remote_before((1, 18)):
 
2269
            self._vfs_set_tags_bytes(bytes)
 
2270
        try:
 
2271
            args = (
 
2272
                self._remote_path(), self._lock_token, self._repo_lock_token)
 
2273
            response = self._call_with_body_bytes(
 
2274
                'Branch.set_tags_bytes', args, bytes)
 
2275
        except errors.UnknownSmartMethod:
 
2276
            medium._remember_remote_is_before((1, 18))
 
2277
            self._vfs_set_tags_bytes(bytes)
 
2278
 
2115
2279
    def lock_read(self):
2116
2280
        self.repository.lock_read()
2117
2281
        if not self._lock_mode:
2171
2335
            self.repository.lock_write(self._repo_lock_token)
2172
2336
        return self._lock_token or None
2173
2337
 
2174
 
    def _set_tags_bytes(self, bytes):
2175
 
        self._ensure_real()
2176
 
        return self._real_branch._set_tags_bytes(bytes)
2177
 
 
2178
2338
    def _unlock(self, branch_token, repo_token):
2179
2339
        err_context = {'token': str((branch_token, repo_token))}
2180
2340
        response = self._call(
2229
2389
            raise NotImplementedError(self.dont_leave_lock_in_place)
2230
2390
        self._leave_lock = False
2231
2391
 
 
2392
    def get_rev_id(self, revno, history=None):
 
2393
        if revno == 0:
 
2394
            return _mod_revision.NULL_REVISION
 
2395
        last_revision_info = self.last_revision_info()
 
2396
        ok, result = self.repository.get_rev_id_for_revno(
 
2397
            revno, last_revision_info)
 
2398
        if ok:
 
2399
            return result
 
2400
        missing_parent = result[1]
 
2401
        # Either the revision named by the server is missing, or its parent
 
2402
        # is.  Call get_parent_map to determine which, so that we report a
 
2403
        # useful error.
 
2404
        parent_map = self.repository.get_parent_map([missing_parent])
 
2405
        if missing_parent in parent_map:
 
2406
            missing_parent = parent_map[missing_parent]
 
2407
        raise errors.RevisionNotPresent(missing_parent, self.repository)
 
2408
 
2232
2409
    def _last_revision_info(self):
2233
2410
        response = self._call('Branch.last_revision_info', self._remote_path())
2234
2411
        if response[0] != 'ok':
2582
2759
                    'Missing key %r in context %r', key_err.args[0], context)
2583
2760
                raise err
2584
2761
 
2585
 
    if err.error_verb == 'NoSuchRevision':
 
2762
    if err.error_verb == 'IncompatibleRepositories':
 
2763
        raise errors.IncompatibleRepositories(err.error_args[0],
 
2764
            err.error_args[1], err.error_args[2])
 
2765
    elif err.error_verb == 'NoSuchRevision':
2586
2766
        raise NoSuchRevision(find('branch'), err.error_args[0])
2587
2767
    elif err.error_verb == 'nosuchrevision':
2588
2768
        raise NoSuchRevision(find('repository'), err.error_args[0])