← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/remote.py

  • Committer: John Ferlito
  • Date: 2009-05-25 10:59:42 UTC
  • mto: (4665.4.1 ppa-doc)
  • mto: This revision was merged to the branch mainline in revision 4693.
  • Revision ID: johnf@inodes.org-20090525105942-5xkcbe37m1u5lp5z
Update packaging scripts to make deployment a bit easier
Update documentation for deploying to PPA

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/remote.py
1
 
# Copyright (C) 2006, 2007, 2008, 2009 Canonical Ltd
 
1
# Copyright (C) 2006, 2007, 2008 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
 
17
20
import bz2
18
21
 
19
22
from bzrlib import (
20
 
    bencode,
21
23
    branch,
22
24
    bzrdir,
23
25
    config,
24
26
    debug,
25
27
    errors,
26
28
    graph,
27
 
    lock,
28
29
    lockdir,
 
30
    pack,
29
31
    repository,
30
32
    revision,
31
33
    revision as _mod_revision,
32
34
    symbol_versioning,
 
35
    urlutils,
33
36
)
34
37
from bzrlib.branch import BranchReferenceFormat
35
38
from bzrlib.bzrdir import BzrDir, RemoteBzrDirFormat
36
 
from bzrlib.decorators import needs_read_lock, needs_write_lock, only_raises
 
39
from bzrlib.decorators import needs_read_lock, needs_write_lock
37
40
from bzrlib.errors import (
38
41
    NoSuchRevision,
39
42
    SmartProtocolError,
42
45
from bzrlib.smart import client, vfs, repository as smart_repo
43
46
from bzrlib.revision import ensure_null, NULL_REVISION
44
47
from bzrlib.trace import mutter, note, warning
 
48
from bzrlib.util import bencode
45
49
 
46
50
 
47
51
class _RpcHelper(object):
59
63
        except errors.ErrorFromSmartServer, err:
60
64
            self._translate_error(err, **err_context)
61
65
 
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
 
 
68
66
    def _call_with_body_bytes_expecting_body(self, method, args, body_bytes,
69
67
                                             **err_context):
70
68
        try:
89
87
class RemoteBzrDir(BzrDir, _RpcHelper):
90
88
    """Control directory on a remote server, accessed via bzr:// or similar."""
91
89
 
92
 
    def __init__(self, transport, format, _client=None, _force_probe=False):
 
90
    def __init__(self, transport, format, _client=None):
93
91
        """Construct a RemoteBzrDir.
94
92
 
95
93
        :param _client: Private parameter for testing. Disables probing and the
99
97
        # this object holds a delegated bzrdir that uses file-level operations
100
98
        # to talk to the other side
101
99
        self._real_bzrdir = None
102
 
        self._has_working_tree = None
103
100
        # 1-shot cache for the call pattern 'create_branch; open_branch' - see
104
101
        # create_branch for details.
105
102
        self._next_open_branch_result = None
109
106
            self._client = client._SmartClient(medium)
110
107
        else:
111
108
            self._client = _client
112
 
            if not _force_probe:
113
 
                return
114
 
 
115
 
        self._probe_bzrdir()
116
 
 
117
 
    def __repr__(self):
118
 
        return '%s(%r)' % (self.__class__.__name__, self._client)
119
 
 
120
 
    def _probe_bzrdir(self):
121
 
        medium = self._client._medium
 
109
            return
 
110
 
122
111
        path = self._path_for_remote_call(self._client)
123
 
        if medium._is_remote_before((2, 1)):
124
 
            self._rpc_open(path)
125
 
            return
126
 
        try:
127
 
            self._rpc_open_2_1(path)
128
 
            return
129
 
        except errors.UnknownSmartMethod:
130
 
            medium._remember_remote_is_before((2, 1))
131
 
            self._rpc_open(path)
132
 
 
133
 
    def _rpc_open_2_1(self, path):
134
 
        response = self._call('BzrDir.open_2.1', path)
135
 
        if response == ('no',):
136
 
            raise errors.NotBranchError(path=self.root_transport.base)
137
 
        elif response[0] == 'yes':
138
 
            if response[1] == 'yes':
139
 
                self._has_working_tree = True
140
 
            elif response[1] == 'no':
141
 
                self._has_working_tree = False
142
 
            else:
143
 
                raise errors.UnexpectedSmartServerResponse(response)
144
 
        else:
145
 
            raise errors.UnexpectedSmartServerResponse(response)
146
 
 
147
 
    def _rpc_open(self, path):
148
112
        response = self._call('BzrDir.open', path)
149
113
        if response not in [('yes',), ('no',)]:
150
114
            raise errors.UnexpectedSmartServerResponse(response)
151
115
        if response == ('no',):
152
 
            raise errors.NotBranchError(path=self.root_transport.base)
 
116
            raise errors.NotBranchError(path=transport.base)
153
117
 
154
118
    def _ensure_real(self):
155
119
        """Ensure that there is a _real_bzrdir set.
157
121
        Used before calls to self._real_bzrdir.
158
122
        """
159
123
        if not self._real_bzrdir:
160
 
            if 'hpssvfs' in debug.debug_flags:
161
 
                import traceback
162
 
                warning('VFS BzrDir access triggered\n%s',
163
 
                    ''.join(traceback.format_stack()))
164
124
            self._real_bzrdir = BzrDir.open_from_transport(
165
125
                self.root_transport, _server_formats=False)
166
126
            self._format._network_name = \
287
247
    def _get_branch_reference(self):
288
248
        path = self._path_for_remote_call(self._client)
289
249
        medium = self._client._medium
290
 
        candidate_calls = [
291
 
            ('BzrDir.open_branchV3', (2, 1)),
292
 
            ('BzrDir.open_branchV2', (1, 13)),
293
 
            ('BzrDir.open_branch', None),
294
 
            ]
295
 
        for verb, required_version in candidate_calls:
296
 
            if required_version and medium._is_remote_before(required_version):
297
 
                continue
 
250
        if not medium._is_remote_before((1, 13)):
298
251
            try:
299
 
                response = self._call(verb, path)
 
252
                response = self._call('BzrDir.open_branchV2', path)
 
253
                if response[0] not in ('ref', 'branch'):
 
254
                    raise errors.UnexpectedSmartServerResponse(response)
 
255
                return response
300
256
            except errors.UnknownSmartMethod:
301
 
                if required_version is None:
302
 
                    raise
303
 
                medium._remember_remote_is_before(required_version)
304
 
            else:
305
 
                break
306
 
        if verb == 'BzrDir.open_branch':
307
 
            if response[0] != 'ok':
308
 
                raise errors.UnexpectedSmartServerResponse(response)
309
 
            if response[1] != '':
310
 
                return ('ref', response[1])
311
 
            else:
312
 
                return ('branch', '')
313
 
        if response[0] not in ('ref', 'branch'):
 
257
                medium._remember_remote_is_before((1, 13))
 
258
        response = self._call('BzrDir.open_branch', path)
 
259
        if response[0] != 'ok':
314
260
            raise errors.UnexpectedSmartServerResponse(response)
315
 
        return response
 
261
        if response[1] != '':
 
262
            return ('ref', response[1])
 
263
        else:
 
264
            return ('branch', '')
316
265
 
317
266
    def _get_tree_branch(self):
318
267
        """See BzrDir._get_tree_branch()."""
404
353
        else:
405
354
            raise errors.NoRepositoryPresent(self)
406
355
 
407
 
    def has_workingtree(self):
408
 
        if self._has_working_tree is None:
409
 
            self._ensure_real()
410
 
            self._has_working_tree = self._real_bzrdir.has_workingtree()
411
 
        return self._has_working_tree
412
 
 
413
356
    def open_workingtree(self, recommend_upgrade=True):
414
 
        if self.has_workingtree():
 
357
        self._ensure_real()
 
358
        if self._real_bzrdir.has_workingtree():
415
359
            raise errors.NotLocalUrl(self.root_transport)
416
360
        else:
417
361
            raise errors.NoWorkingTree(self.root_transport.base)
480
424
        self._custom_format = None
481
425
        self._network_name = None
482
426
        self._creating_bzrdir = None
483
 
        self._supports_chks = None
484
427
        self._supports_external_lookups = None
485
428
        self._supports_tree_reference = None
486
429
        self._rich_root_data = None
487
430
 
488
 
    def __repr__(self):
489
 
        return "%s(_network_name=%r)" % (self.__class__.__name__,
490
 
            self._network_name)
491
 
 
492
431
    @property
493
432
    def fast_deltas(self):
494
433
        self._ensure_real()
502
441
        return self._rich_root_data
503
442
 
504
443
    @property
505
 
    def supports_chks(self):
506
 
        if self._supports_chks is None:
507
 
            self._ensure_real()
508
 
            self._supports_chks = self._custom_format.supports_chks
509
 
        return self._supports_chks
510
 
 
511
 
    @property
512
444
    def supports_external_lookups(self):
513
445
        if self._supports_external_lookups is None:
514
446
            self._ensure_real()
615
547
        return self._custom_format._fetch_reconcile
616
548
 
617
549
    def get_format_description(self):
618
 
        self._ensure_real()
619
 
        return 'Remote: ' + self._custom_format.get_format_description()
 
550
        return 'bzr remote repository'
620
551
 
621
552
    def __eq__(self, other):
622
553
        return self.__class__ is other.__class__
623
554
 
 
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
 
624
564
    def network_name(self):
625
565
        if self._network_name:
626
566
            return self._network_name
628
568
        return self._creating_repo._real_repository._format.network_name()
629
569
 
630
570
    @property
631
 
    def pack_compresses(self):
632
 
        self._ensure_real()
633
 
        return self._custom_format.pack_compresses
634
 
 
635
 
    @property
636
571
    def _serializer(self):
637
572
        self._ensure_real()
638
573
        return self._custom_format._serializer
639
574
 
640
575
 
641
 
class RemoteRepository(_RpcHelper, lock._RelockDebugMixin):
 
576
class RemoteRepository(_RpcHelper):
642
577
    """Repository accessed over rpc.
643
578
 
644
579
    For the moment most operations are performed using local transport-backed
735
670
        self._ensure_real()
736
671
        return self._real_repository.suspend_write_group()
737
672
 
738
 
    def get_missing_parent_inventories(self, check_for_missing_texts=True):
739
 
        self._ensure_real()
740
 
        return self._real_repository.get_missing_parent_inventories(
741
 
            check_for_missing_texts=check_for_missing_texts)
742
 
 
743
 
    def _get_rev_id_for_revno_vfs(self, revno, known_pair):
744
 
        self._ensure_real()
745
 
        return self._real_repository.get_rev_id_for_revno(
746
 
            revno, known_pair)
747
 
 
748
 
    def get_rev_id_for_revno(self, revno, known_pair):
749
 
        """See Repository.get_rev_id_for_revno."""
750
 
        path = self.bzrdir._path_for_remote_call(self._client)
751
 
        try:
752
 
            if self._client._medium._is_remote_before((1, 17)):
753
 
                return self._get_rev_id_for_revno_vfs(revno, known_pair)
754
 
            response = self._call(
755
 
                'Repository.get_rev_id_for_revno', path, revno, known_pair)
756
 
        except errors.UnknownSmartMethod:
757
 
            self._client._medium._remember_remote_is_before((1, 17))
758
 
            return self._get_rev_id_for_revno_vfs(revno, known_pair)
759
 
        if response[0] == 'ok':
760
 
            return True, response[1]
761
 
        elif response[0] == 'history-incomplete':
762
 
            known_pair = response[1:3]
763
 
            for fallback in self._fallback_repositories:
764
 
                found, result = fallback.get_rev_id_for_revno(revno, known_pair)
765
 
                if found:
766
 
                    return True, result
767
 
                else:
768
 
                    known_pair = result
769
 
            # Not found in any fallbacks
770
 
            return False, known_pair
771
 
        else:
772
 
            raise errors.UnexpectedSmartServerResponse(response)
 
673
    def get_missing_parent_inventories(self):
 
674
        self._ensure_real()
 
675
        return self._real_repository.get_missing_parent_inventories()
773
676
 
774
677
    def _ensure_real(self):
775
678
        """Ensure that there is a _real_repository set.
785
688
        invocation. If in doubt chat to the bzr network team.
786
689
        """
787
690
        if self._real_repository is None:
788
 
            if 'hpssvfs' in debug.debug_flags:
 
691
            if 'hpss' in debug.debug_flags:
789
692
                import traceback
790
693
                warning('VFS Repository access triggered\n%s',
791
694
                    ''.join(traceback.format_stack()))
875
778
            result.add(_mod_revision.NULL_REVISION)
876
779
        return result
877
780
 
878
 
    def _has_same_fallbacks(self, other_repo):
879
 
        """Returns true if the repositories have the same fallbacks."""
880
 
        # XXX: copied from Repository; it should be unified into a base class
881
 
        # <https://bugs.edge.launchpad.net/bzr/+bug/401622>
882
 
        my_fb = self._fallback_repositories
883
 
        other_fb = other_repo._fallback_repositories
884
 
        if len(my_fb) != len(other_fb):
885
 
            return False
886
 
        for f, g in zip(my_fb, other_fb):
887
 
            if not f.has_same_location(g):
888
 
                return False
889
 
        return True
890
 
 
891
781
    def has_same_location(self, other):
892
 
        # TODO: Move to RepositoryBase and unify with the regular Repository
893
 
        # one; unfortunately the tests rely on slightly different behaviour at
894
 
        # present -- mbp 20090710
895
782
        return (self.__class__ is other.__class__ and
896
783
                self.bzrdir.transport.base == other.bzrdir.transport.base)
897
784
 
965
852
    def is_write_locked(self):
966
853
        return self._lock_mode == 'w'
967
854
 
968
 
    def _warn_if_deprecated(self, branch=None):
969
 
        # If we have a real repository, the check will be done there, if we
970
 
        # don't the check will be done remotely.
971
 
        pass
972
 
 
973
855
    def lock_read(self):
974
856
        # wrong eventually - want a local lock cache context
975
857
        if not self._lock_mode:
976
 
            self._note_lock('r')
977
858
            self._lock_mode = 'r'
978
859
            self._lock_count = 1
979
860
            self._unstacked_provider.enable_cache(cache_misses=True)
980
861
            if self._real_repository is not None:
981
862
                self._real_repository.lock_read()
982
 
            for repo in self._fallback_repositories:
983
 
                repo.lock_read()
984
863
        else:
985
864
            self._lock_count += 1
 
865
        for repo in self._fallback_repositories:
 
866
            repo.lock_read()
986
867
 
987
868
    def _remote_lock_write(self, token):
988
869
        path = self.bzrdir._path_for_remote_call(self._client)
999
880
 
1000
881
    def lock_write(self, token=None, _skip_rpc=False):
1001
882
        if not self._lock_mode:
1002
 
            self._note_lock('w')
1003
883
            if _skip_rpc:
1004
884
                if self._lock_token is not None:
1005
885
                    if token != self._lock_token:
1021
901
            self._lock_count = 1
1022
902
            cache_misses = self._real_repository is None
1023
903
            self._unstacked_provider.enable_cache(cache_misses=cache_misses)
1024
 
            for repo in self._fallback_repositories:
1025
 
                # Writes don't affect fallback repos
1026
 
                repo.lock_read()
1027
904
        elif self._lock_mode == 'r':
1028
905
            raise errors.ReadOnlyError(self)
1029
906
        else:
1030
907
            self._lock_count += 1
 
908
        for repo in self._fallback_repositories:
 
909
            # Writes don't affect fallback repos
 
910
            repo.lock_read()
1031
911
        return self._lock_token or None
1032
912
 
1033
913
    def leave_lock_in_place(self):
1108
988
        else:
1109
989
            raise errors.UnexpectedSmartServerResponse(response)
1110
990
 
1111
 
    @only_raises(errors.LockNotHeld, errors.LockBroken)
1112
991
    def unlock(self):
1113
992
        if not self._lock_count:
1114
 
            return lock.cant_unlock_not_held(self)
 
993
            raise errors.LockNotHeld(self)
1115
994
        self._lock_count -= 1
1116
995
        if self._lock_count > 0:
1117
996
            return
1136
1015
                self._lock_token = None
1137
1016
                if not self._leave_lock:
1138
1017
                    self._unlock(old_token)
1139
 
        # Fallbacks are always 'lock_read()' so we don't pay attention to
1140
 
        # self._leave_lock
1141
 
        for repo in self._fallback_repositories:
1142
 
            repo.unlock()
1143
1018
 
1144
1019
    def break_lock(self):
1145
1020
        # should hand off to the network
1209
1084
        # We need to accumulate additional repositories here, to pass them in
1210
1085
        # on various RPC's.
1211
1086
        #
1212
 
        if self.is_locked():
1213
 
            # We will call fallback.unlock() when we transition to the unlocked
1214
 
            # state, so always add a lock here. If a caller passes us a locked
1215
 
            # repository, they are responsible for unlocking it later.
1216
 
            repository.lock_read()
1217
1087
        self._fallback_repositories.append(repository)
1218
1088
        # If self._real_repository was parameterised already (e.g. because a
1219
1089
        # _real_branch had its get_stacked_on_url method called), then the
1244
1114
        self._ensure_real()
1245
1115
        return self._real_repository.get_inventory(revision_id)
1246
1116
 
1247
 
    def iter_inventories(self, revision_ids, ordering=None):
 
1117
    def iter_inventories(self, revision_ids):
1248
1118
        self._ensure_real()
1249
 
        return self._real_repository.iter_inventories(revision_ids, ordering)
 
1119
        return self._real_repository.iter_inventories(revision_ids)
1250
1120
 
1251
1121
    @needs_read_lock
1252
1122
    def get_revision(self, revision_id):
1316
1186
            raise errors.InternalBzrError(
1317
1187
                "May not fetch while in a write group.")
1318
1188
        # fast path same-url fetch operations
1319
 
        if (self.has_same_location(source)
1320
 
            and fetch_spec is None
1321
 
            and self._has_same_fallbacks(source)):
 
1189
        if self.has_same_location(source) and fetch_spec is None:
1322
1190
            # check that last_revision is in 'from' and then return a
1323
1191
            # no-operation.
1324
1192
            if (revision_id is not None and
1497
1365
        return self._real_repository.get_signature_text(revision_id)
1498
1366
 
1499
1367
    @needs_read_lock
1500
 
    def _get_inventory_xml(self, revision_id):
 
1368
    def get_inventory_xml(self, revision_id):
1501
1369
        self._ensure_real()
1502
 
        return self._real_repository._get_inventory_xml(revision_id)
 
1370
        return self._real_repository.get_inventory_xml(revision_id)
1503
1371
 
1504
 
    def _deserialise_inventory(self, revision_id, xml):
 
1372
    def deserialise_inventory(self, revision_id, xml):
1505
1373
        self._ensure_real()
1506
 
        return self._real_repository._deserialise_inventory(revision_id, xml)
 
1374
        return self._real_repository.deserialise_inventory(revision_id, xml)
1507
1375
 
1508
1376
    def reconcile(self, other=None, thorough=False):
1509
1377
        self._ensure_real()
1536
1404
        return self._real_repository.get_revision_reconcile(revision_id)
1537
1405
 
1538
1406
    @needs_read_lock
1539
 
    def check(self, revision_ids=None, callback_refs=None, check_repo=True):
 
1407
    def check(self, revision_ids=None):
1540
1408
        self._ensure_real()
1541
 
        return self._real_repository.check(revision_ids=revision_ids,
1542
 
            callback_refs=callback_refs, check_repo=check_repo)
 
1409
        return self._real_repository.check(revision_ids=revision_ids)
1543
1410
 
1544
1411
    def copy_content_into(self, destination, revision_id=None):
1545
1412
        self._ensure_real()
1585
1452
        return self._real_repository.inventories
1586
1453
 
1587
1454
    @needs_write_lock
1588
 
    def pack(self, hint=None):
 
1455
    def pack(self):
1589
1456
        """Compress the data within the repository.
1590
1457
 
1591
1458
        This is not currently implemented within the smart server.
1592
1459
        """
1593
1460
        self._ensure_real()
1594
 
        return self._real_repository.pack(hint=hint)
 
1461
        return self._real_repository.pack()
1595
1462
 
1596
1463
    @property
1597
1464
    def revisions(self):
1685
1552
        self._ensure_real()
1686
1553
        return self._real_repository.revision_graph_can_have_wrong_parents()
1687
1554
 
1688
 
    def _find_inconsistent_revision_parents(self, revisions_iterator=None):
 
1555
    def _find_inconsistent_revision_parents(self):
1689
1556
        self._ensure_real()
1690
 
        return self._real_repository._find_inconsistent_revision_parents(
1691
 
            revisions_iterator)
 
1557
        return self._real_repository._find_inconsistent_revision_parents()
1692
1558
 
1693
1559
    def _check_for_inconsistent_revision_parents(self):
1694
1560
        self._ensure_real()
1700
1566
            providers.insert(0, other)
1701
1567
        providers.extend(r._make_parents_provider() for r in
1702
1568
                         self._fallback_repositories)
1703
 
        return graph.StackedParentsProvider(providers)
 
1569
        return graph._StackedParentsProvider(providers)
1704
1570
 
1705
1571
    def _serialise_search_recipe(self, recipe):
1706
1572
        """Serialise a graph search recipe.
1748
1614
    def insert_stream(self, stream, src_format, resume_tokens):
1749
1615
        target = self.target_repo
1750
1616
        target._unstacked_provider.missing_keys.clear()
1751
 
        candidate_calls = [('Repository.insert_stream_1.19', (1, 19))]
1752
1617
        if target._lock_token:
1753
 
            candidate_calls.append(('Repository.insert_stream_locked', (1, 14)))
1754
 
            lock_args = (target._lock_token or '',)
 
1618
            verb = 'Repository.insert_stream_locked'
 
1619
            extra_args = (target._lock_token or '',)
 
1620
            required_version = (1, 14)
1755
1621
        else:
1756
 
            candidate_calls.append(('Repository.insert_stream', (1, 13)))
1757
 
            lock_args = ()
 
1622
            verb = 'Repository.insert_stream'
 
1623
            extra_args = ()
 
1624
            required_version = (1, 13)
1758
1625
        client = target._client
1759
1626
        medium = client._medium
 
1627
        if medium._is_remote_before(required_version):
 
1628
            # No possible way this can work.
 
1629
            return self._insert_real(stream, src_format, resume_tokens)
1760
1630
        path = target.bzrdir._path_for_remote_call(client)
1761
 
        # Probe for the verb to use with an empty stream before sending the
1762
 
        # real stream to it.  We do this both to avoid the risk of sending a
1763
 
        # large request that is then rejected, and because we don't want to
1764
 
        # implement a way to buffer, rewind, or restart the stream.
1765
 
        found_verb = False
1766
 
        for verb, required_version in candidate_calls:
1767
 
            if medium._is_remote_before(required_version):
1768
 
                continue
1769
 
            if resume_tokens:
1770
 
                # We've already done the probing (and set _is_remote_before) on
1771
 
                # a previous insert.
1772
 
                found_verb = True
1773
 
                break
 
1631
        if not resume_tokens:
 
1632
            # XXX: Ugly but important for correctness, *will* be fixed during
 
1633
            # 1.13 cycle. Pushing a stream that is interrupted results in a
 
1634
            # fallback to the _real_repositories sink *with a partial stream*.
 
1635
            # Thats bad because we insert less data than bzr expected. To avoid
 
1636
            # this we do a trial push to make sure the verb is accessible, and
 
1637
            # do not fallback when actually pushing the stream. A cleanup patch
 
1638
            # is going to look at rewinding/restarting the stream/partial
 
1639
            # buffering etc.
1774
1640
            byte_stream = smart_repo._stream_to_byte_stream([], src_format)
1775
1641
            try:
1776
1642
                response = client.call_with_body_stream(
1777
 
                    (verb, path, '') + lock_args, byte_stream)
 
1643
                    (verb, path, '') + extra_args, byte_stream)
1778
1644
            except errors.UnknownSmartMethod:
1779
1645
                medium._remember_remote_is_before(required_version)
1780
 
            else:
1781
 
                found_verb = True
1782
 
                break
1783
 
        if not found_verb:
1784
 
            # Have to use VFS.
1785
 
            return self._insert_real(stream, src_format, resume_tokens)
1786
 
        self._last_inv_record = None
1787
 
        self._last_substream = None
1788
 
        if required_version < (1, 19):
1789
 
            # Remote side doesn't support inventory deltas.  Wrap the stream to
1790
 
            # make sure we don't send any.  If the stream contains inventory
1791
 
            # deltas we'll interrupt the smart insert_stream request and
1792
 
            # fallback to VFS.
1793
 
            stream = self._stop_stream_if_inventory_delta(stream)
 
1646
                return self._insert_real(stream, src_format, resume_tokens)
1794
1647
        byte_stream = smart_repo._stream_to_byte_stream(
1795
1648
            stream, src_format)
1796
1649
        resume_tokens = ' '.join(resume_tokens)
1797
1650
        response = client.call_with_body_stream(
1798
 
            (verb, path, resume_tokens) + lock_args, byte_stream)
 
1651
            (verb, path, resume_tokens) + extra_args, byte_stream)
1799
1652
        if response[0][0] not in ('ok', 'missing-basis'):
1800
1653
            raise errors.UnexpectedSmartServerResponse(response)
1801
 
        if self._last_substream is not None:
1802
 
            # The stream included an inventory-delta record, but the remote
1803
 
            # side isn't new enough to support them.  So we need to send the
1804
 
            # rest of the stream via VFS.
1805
 
            self.target_repo.refresh_data()
1806
 
            return self._resume_stream_with_vfs(response, src_format)
1807
1654
        if response[0][0] == 'missing-basis':
1808
1655
            tokens, missing_keys = bencode.bdecode_as_tuple(response[0][1])
1809
1656
            resume_tokens = tokens
1812
1659
            self.target_repo.refresh_data()
1813
1660
            return [], set()
1814
1661
 
1815
 
    def _resume_stream_with_vfs(self, response, src_format):
1816
 
        """Resume sending a stream via VFS, first resending the record and
1817
 
        substream that couldn't be sent via an insert_stream verb.
1818
 
        """
1819
 
        if response[0][0] == 'missing-basis':
1820
 
            tokens, missing_keys = bencode.bdecode_as_tuple(response[0][1])
1821
 
            # Ignore missing_keys, we haven't finished inserting yet
1822
 
        else:
1823
 
            tokens = []
1824
 
        def resume_substream():
1825
 
            # Yield the substream that was interrupted.
1826
 
            for record in self._last_substream:
1827
 
                yield record
1828
 
            self._last_substream = None
1829
 
        def resume_stream():
1830
 
            # Finish sending the interrupted substream
1831
 
            yield ('inventory-deltas', resume_substream())
1832
 
            # Then simply continue sending the rest of the stream.
1833
 
            for substream_kind, substream in self._last_stream:
1834
 
                yield substream_kind, substream
1835
 
        return self._insert_real(resume_stream(), src_format, tokens)
1836
 
 
1837
 
    def _stop_stream_if_inventory_delta(self, stream):
1838
 
        """Normally this just lets the original stream pass-through unchanged.
1839
 
 
1840
 
        However if any 'inventory-deltas' substream occurs it will stop
1841
 
        streaming, and store the interrupted substream and stream in
1842
 
        self._last_substream and self._last_stream so that the stream can be
1843
 
        resumed by _resume_stream_with_vfs.
1844
 
        """
1845
 
                    
1846
 
        stream_iter = iter(stream)
1847
 
        for substream_kind, substream in stream_iter:
1848
 
            if substream_kind == 'inventory-deltas':
1849
 
                self._last_substream = substream
1850
 
                self._last_stream = stream_iter
1851
 
                return
1852
 
            else:
1853
 
                yield substream_kind, substream
1854
 
            
1855
1662
 
1856
1663
class RemoteStreamSource(repository.StreamSource):
1857
1664
    """Stream data from a remote server."""
1860
1667
        if (self.from_repository._fallback_repositories and
1861
1668
            self.to_format._fetch_order == 'topological'):
1862
1669
            return self._real_stream(self.from_repository, search)
1863
 
        sources = []
1864
 
        seen = set()
1865
 
        repos = [self.from_repository]
1866
 
        while repos:
1867
 
            repo = repos.pop(0)
1868
 
            if repo in seen:
1869
 
                continue
1870
 
            seen.add(repo)
1871
 
            repos.extend(repo._fallback_repositories)
1872
 
            sources.append(repo)
1873
 
        return self.missing_parents_chain(search, sources)
1874
 
 
1875
 
    def get_stream_for_missing_keys(self, missing_keys):
1876
 
        self.from_repository._ensure_real()
1877
 
        real_repo = self.from_repository._real_repository
1878
 
        real_source = real_repo._get_source(self.to_format)
1879
 
        return real_source.get_stream_for_missing_keys(missing_keys)
 
1670
        return self.missing_parents_chain(search, [self.from_repository] +
 
1671
            self.from_repository._fallback_repositories)
1880
1672
 
1881
1673
    def _real_stream(self, repo, search):
1882
1674
        """Get a stream for search from repo.
1889
1681
        """
1890
1682
        source = repo._get_source(self.to_format)
1891
1683
        if isinstance(source, RemoteStreamSource):
1892
 
            repo._ensure_real()
1893
 
            source = repo._real_repository._get_source(self.to_format)
 
1684
            return repository.StreamSource.get_stream(source, search)
1894
1685
        return source.get_stream(search)
1895
1686
 
1896
1687
    def _get_stream(self, repo, search):
1913
1704
            return self._real_stream(repo, search)
1914
1705
        client = repo._client
1915
1706
        medium = client._medium
 
1707
        if medium._is_remote_before((1, 13)):
 
1708
            # streaming was added in 1.13
 
1709
            return self._real_stream(repo, search)
1916
1710
        path = repo.bzrdir._path_for_remote_call(client)
1917
 
        search_bytes = repo._serialise_search_result(search)
1918
 
        args = (path, self.to_format.network_name())
1919
 
        candidate_verbs = [
1920
 
            ('Repository.get_stream_1.19', (1, 19)),
1921
 
            ('Repository.get_stream', (1, 13))]
1922
 
        found_verb = False
1923
 
        for verb, version in candidate_verbs:
1924
 
            if medium._is_remote_before(version):
1925
 
                continue
1926
 
            try:
1927
 
                response = repo._call_with_body_bytes_expecting_body(
1928
 
                    verb, args, search_bytes)
1929
 
            except errors.UnknownSmartMethod:
1930
 
                medium._remember_remote_is_before(version)
1931
 
            else:
1932
 
                response_tuple, response_handler = response
1933
 
                found_verb = True
1934
 
                break
1935
 
        if not found_verb:
 
1711
        try:
 
1712
            search_bytes = repo._serialise_search_result(search)
 
1713
            response = repo._call_with_body_bytes_expecting_body(
 
1714
                'Repository.get_stream',
 
1715
                (path, self.to_format.network_name()), search_bytes)
 
1716
            response_tuple, response_handler = response
 
1717
        except errors.UnknownSmartMethod:
 
1718
            medium._remember_remote_is_before((1,13))
1936
1719
            return self._real_stream(repo, search)
1937
1720
        if response_tuple[0] != 'ok':
1938
1721
            raise errors.UnexpectedSmartServerResponse(response_tuple)
1950
1733
        :param search: The overall search to satisfy with streams.
1951
1734
        :param sources: A list of Repository objects to query.
1952
1735
        """
1953
 
        self.from_serialiser = self.from_repository._format._serializer
 
1736
        self.serialiser = self.to_format._serializer
1954
1737
        self.seen_revs = set()
1955
1738
        self.referenced_revs = set()
1956
1739
        # If there are heads in the search, or the key count is > 0, we are not
1973
1756
    def missing_parents_rev_handler(self, substream):
1974
1757
        for content in substream:
1975
1758
            revision_bytes = content.get_bytes_as('fulltext')
1976
 
            revision = self.from_serialiser.read_revision_from_string(
1977
 
                revision_bytes)
 
1759
            revision = self.serialiser.read_revision_from_string(revision_bytes)
1978
1760
            self.seen_revs.add(content.key[-1])
1979
1761
            self.referenced_revs.update(revision.parent_ids)
1980
1762
            yield content
2019
1801
                self._network_name)
2020
1802
 
2021
1803
    def get_format_description(self):
2022
 
        self._ensure_real()
2023
 
        return 'Remote: ' + self._custom_format.get_format_description()
 
1804
        return 'Remote BZR Branch'
2024
1805
 
2025
1806
    def network_name(self):
2026
1807
        return self._network_name
2104
1885
        self._ensure_real()
2105
1886
        return self._custom_format.supports_stacking()
2106
1887
 
2107
 
    def supports_set_append_revisions_only(self):
2108
 
        self._ensure_real()
2109
 
        return self._custom_format.supports_set_append_revisions_only()
2110
 
 
2111
 
 
2112
 
class RemoteBranch(branch.Branch, _RpcHelper, lock._RelockDebugMixin):
 
1888
 
 
1889
class RemoteBranch(branch.Branch, _RpcHelper):
2113
1890
    """Branch stored on a server accessed by HPSS RPC.
2114
1891
 
2115
1892
    At the moment most operations are mapped down to simple file operations.
2132
1909
        # We intentionally don't call the parent class's __init__, because it
2133
1910
        # will try to assign to self.tags, which is a property in this subclass.
2134
1911
        # And the parent's __init__ doesn't do much anyway.
 
1912
        self._revision_id_to_revno_cache = None
 
1913
        self._partial_revision_id_to_revno_cache = {}
 
1914
        self._revision_history_cache = None
 
1915
        self._last_revision_info_cache = None
 
1916
        self._merge_sorted_revisions_cache = None
2135
1917
        self.bzrdir = remote_bzrdir
2136
1918
        if _client is not None:
2137
1919
            self._client = _client
2151
1933
        else:
2152
1934
            self._real_branch = None
2153
1935
        # Fill out expected attributes of branch for bzrlib API users.
2154
 
        self._clear_cached_state()
2155
1936
        self.base = self.bzrdir.root_transport.base
2156
1937
        self._control_files = None
2157
1938
        self._lock_mode = None
2169
1950
                    self._real_branch._format.network_name()
2170
1951
        else:
2171
1952
            self._format = format
2172
 
        # when we do _ensure_real we may need to pass ignore_fallbacks to the
2173
 
        # branch.open_branch method.
2174
 
        self._real_ignore_fallbacks = not setup_stacking
2175
1953
        if not self._format._network_name:
2176
1954
            # Did not get from open_branchV2 - old server.
2177
1955
            self._ensure_real()
2182
1960
        hooks = branch.Branch.hooks['open']
2183
1961
        for hook in hooks:
2184
1962
            hook(self)
2185
 
        self._is_stacked = False
2186
1963
        if setup_stacking:
2187
1964
            self._setup_stacking()
2188
1965
 
2194
1971
        except (errors.NotStacked, errors.UnstackableBranchFormat,
2195
1972
            errors.UnstackableRepositoryFormat), e:
2196
1973
            return
2197
 
        self._is_stacked = True
2198
 
        self._activate_fallback_location(fallback_url)
 
1974
        self._activate_fallback_location(fallback_url, None)
2199
1975
 
2200
1976
    def _get_config(self):
2201
1977
        return RemoteBranchConfig(self)
2222
1998
                raise AssertionError('smart server vfs must be enabled '
2223
1999
                    'to use vfs implementation')
2224
2000
            self.bzrdir._ensure_real()
2225
 
            self._real_branch = self.bzrdir._real_bzrdir.open_branch(
2226
 
                ignore_fallbacks=self._real_ignore_fallbacks)
 
2001
            self._real_branch = self.bzrdir._real_bzrdir.open_branch()
2227
2002
            if self.repository._real_repository is None:
2228
2003
                # Give the remote repository the matching real repo.
2229
2004
                real_repo = self._real_branch.repository
2303
2078
            raise errors.UnexpectedSmartServerResponse(response)
2304
2079
        return response[1]
2305
2080
 
2306
 
    def set_stacked_on_url(self, url):
2307
 
        branch.Branch.set_stacked_on_url(self, url)
2308
 
        if not url:
2309
 
            self._is_stacked = False
2310
 
        else:
2311
 
            self._is_stacked = True
2312
 
        
2313
2081
    def _vfs_get_tags_bytes(self):
2314
2082
        self._ensure_real()
2315
2083
        return self._real_branch._get_tags_bytes()
2325
2093
            return self._vfs_get_tags_bytes()
2326
2094
        return response[0]
2327
2095
 
2328
 
    def _vfs_set_tags_bytes(self, bytes):
2329
 
        self._ensure_real()
2330
 
        return self._real_branch._set_tags_bytes(bytes)
2331
 
 
2332
 
    def _set_tags_bytes(self, bytes):
2333
 
        medium = self._client._medium
2334
 
        if medium._is_remote_before((1, 18)):
2335
 
            self._vfs_set_tags_bytes(bytes)
2336
 
            return
2337
 
        try:
2338
 
            args = (
2339
 
                self._remote_path(), self._lock_token, self._repo_lock_token)
2340
 
            response = self._call_with_body_bytes(
2341
 
                'Branch.set_tags_bytes', args, bytes)
2342
 
        except errors.UnknownSmartMethod:
2343
 
            medium._remember_remote_is_before((1, 18))
2344
 
            self._vfs_set_tags_bytes(bytes)
2345
 
 
2346
2096
    def lock_read(self):
2347
2097
        self.repository.lock_read()
2348
2098
        if not self._lock_mode:
2349
 
            self._note_lock('r')
2350
2099
            self._lock_mode = 'r'
2351
2100
            self._lock_count = 1
2352
2101
            if self._real_branch is not None:
2372
2121
 
2373
2122
    def lock_write(self, token=None):
2374
2123
        if not self._lock_mode:
2375
 
            self._note_lock('w')
2376
2124
            # Lock the branch and repo in one remote call.
2377
2125
            remote_tokens = self._remote_lock_write(token)
2378
2126
            self._lock_token, self._repo_lock_token = remote_tokens
2404
2152
            self.repository.lock_write(self._repo_lock_token)
2405
2153
        return self._lock_token or None
2406
2154
 
 
2155
    def _set_tags_bytes(self, bytes):
 
2156
        self._ensure_real()
 
2157
        return self._real_branch._set_tags_bytes(bytes)
 
2158
 
2407
2159
    def _unlock(self, branch_token, repo_token):
2408
2160
        err_context = {'token': str((branch_token, repo_token))}
2409
2161
        response = self._call(
2413
2165
            return
2414
2166
        raise errors.UnexpectedSmartServerResponse(response)
2415
2167
 
2416
 
    @only_raises(errors.LockNotHeld, errors.LockBroken)
2417
2168
    def unlock(self):
2418
2169
        try:
2419
2170
            self._lock_count -= 1
2459
2210
            raise NotImplementedError(self.dont_leave_lock_in_place)
2460
2211
        self._leave_lock = False
2461
2212
 
2462
 
    @needs_read_lock
2463
 
    def get_rev_id(self, revno, history=None):
2464
 
        if revno == 0:
2465
 
            return _mod_revision.NULL_REVISION
2466
 
        last_revision_info = self.last_revision_info()
2467
 
        ok, result = self.repository.get_rev_id_for_revno(
2468
 
            revno, last_revision_info)
2469
 
        if ok:
2470
 
            return result
2471
 
        missing_parent = result[1]
2472
 
        # Either the revision named by the server is missing, or its parent
2473
 
        # is.  Call get_parent_map to determine which, so that we report a
2474
 
        # useful error.
2475
 
        parent_map = self.repository.get_parent_map([missing_parent])
2476
 
        if missing_parent in parent_map:
2477
 
            missing_parent = parent_map[missing_parent]
2478
 
        raise errors.RevisionNotPresent(missing_parent, self.repository)
2479
 
 
2480
2213
    def _last_revision_info(self):
2481
2214
        response = self._call('Branch.last_revision_info', self._remote_path())
2482
2215
        if response[0] != 'ok':
2487
2220
 
2488
2221
    def _gen_revision_history(self):
2489
2222
        """See Branch._gen_revision_history()."""
2490
 
        if self._is_stacked:
2491
 
            self._ensure_real()
2492
 
            return self._real_branch._gen_revision_history()
2493
2223
        response_tuple, response_handler = self._call_expecting_body(
2494
2224
            'Branch.revision_history', self._remote_path())
2495
2225
        if response_tuple[0] != 'ok':
2830
2560
                    'Missing key %r in context %r', key_err.args[0], context)
2831
2561
                raise err
2832
2562
 
2833
 
    if err.error_verb == 'IncompatibleRepositories':
2834
 
        raise errors.IncompatibleRepositories(err.error_args[0],
2835
 
            err.error_args[1], err.error_args[2])
2836
 
    elif err.error_verb == 'NoSuchRevision':
 
2563
    if err.error_verb == 'NoSuchRevision':
2837
2564
        raise NoSuchRevision(find('branch'), err.error_args[0])
2838
2565
    elif err.error_verb == 'nosuchrevision':
2839
2566
        raise NoSuchRevision(find('repository'), err.error_args[0])
2840
 
    elif err.error_verb == 'nobranch':
2841
 
        if len(err.error_args) >= 1:
2842
 
            extra = err.error_args[0]
2843
 
        else:
2844
 
            extra = None
2845
 
        raise errors.NotBranchError(path=find('bzrdir').root_transport.base,
2846
 
            detail=extra)
 
2567
    elif err.error_tuple == ('nobranch',):
 
2568
        raise errors.NotBranchError(path=find('bzrdir').root_transport.base)
2847
2569
    elif err.error_verb == 'norepository':
2848
2570
        raise errors.NoRepositoryPresent(find('bzrdir'))
2849
2571
    elif err.error_verb == 'LockContention':