← 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-07-27 06:28:35 UTC
  • mto: This revision was merged to the branch mainline in revision 4587.
  • Revision ID: mbp@sourcefrog.net-20090727062835-o66p8it658tq1sma
Add CountedLock.get_physical_lock_status

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/remote.py
1
 
# Copyright (C) 2006-2010 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
27
27
    lock,
28
28
    lockdir,
29
29
    repository,
30
 
    repository as _mod_repository,
31
30
    revision,
32
31
    revision as _mod_revision,
33
 
    static_tuple,
34
32
    symbol_versioning,
35
33
)
36
34
from bzrlib.branch import BranchReferenceFormat
37
35
from bzrlib.bzrdir import BzrDir, RemoteBzrDirFormat
38
 
from bzrlib.decorators import needs_read_lock, needs_write_lock, only_raises
 
36
from bzrlib.decorators import needs_read_lock, needs_write_lock
39
37
from bzrlib.errors import (
40
38
    NoSuchRevision,
41
39
    SmartProtocolError,
61
59
        except errors.ErrorFromSmartServer, err:
62
60
            self._translate_error(err, **err_context)
63
61
 
64
 
    def _call_with_body_bytes(self, method, args, body_bytes, **err_context):
65
 
        try:
66
 
            return self._client.call_with_body_bytes(method, args, body_bytes)
67
 
        except errors.ErrorFromSmartServer, err:
68
 
            self._translate_error(err, **err_context)
69
 
 
70
62
    def _call_with_body_bytes_expecting_body(self, method, args, body_bytes,
71
63
                                             **err_context):
72
64
        try:
91
83
class RemoteBzrDir(BzrDir, _RpcHelper):
92
84
    """Control directory on a remote server, accessed via bzr:// or similar."""
93
85
 
94
 
    def __init__(self, transport, format, _client=None, _force_probe=False):
 
86
    def __init__(self, transport, format, _client=None):
95
87
        """Construct a RemoteBzrDir.
96
88
 
97
89
        :param _client: Private parameter for testing. Disables probing and the
101
93
        # this object holds a delegated bzrdir that uses file-level operations
102
94
        # to talk to the other side
103
95
        self._real_bzrdir = None
104
 
        self._has_working_tree = None
105
96
        # 1-shot cache for the call pattern 'create_branch; open_branch' - see
106
97
        # create_branch for details.
107
98
        self._next_open_branch_result = None
111
102
            self._client = client._SmartClient(medium)
112
103
        else:
113
104
            self._client = _client
114
 
            if not _force_probe:
115
 
                return
116
 
 
117
 
        self._probe_bzrdir()
118
 
 
119
 
    def __repr__(self):
120
 
        return '%s(%r)' % (self.__class__.__name__, self._client)
121
 
 
122
 
    def _probe_bzrdir(self):
123
 
        medium = self._client._medium
 
105
            return
 
106
 
124
107
        path = self._path_for_remote_call(self._client)
125
 
        if medium._is_remote_before((2, 1)):
126
 
            self._rpc_open(path)
127
 
            return
128
 
        try:
129
 
            self._rpc_open_2_1(path)
130
 
            return
131
 
        except errors.UnknownSmartMethod:
132
 
            medium._remember_remote_is_before((2, 1))
133
 
            self._rpc_open(path)
134
 
 
135
 
    def _rpc_open_2_1(self, path):
136
 
        response = self._call('BzrDir.open_2.1', path)
137
 
        if response == ('no',):
138
 
            raise errors.NotBranchError(path=self.root_transport.base)
139
 
        elif response[0] == 'yes':
140
 
            if response[1] == 'yes':
141
 
                self._has_working_tree = True
142
 
            elif response[1] == 'no':
143
 
                self._has_working_tree = False
144
 
            else:
145
 
                raise errors.UnexpectedSmartServerResponse(response)
146
 
        else:
147
 
            raise errors.UnexpectedSmartServerResponse(response)
148
 
 
149
 
    def _rpc_open(self, path):
150
108
        response = self._call('BzrDir.open', path)
151
109
        if response not in [('yes',), ('no',)]:
152
110
            raise errors.UnexpectedSmartServerResponse(response)
153
111
        if response == ('no',):
154
 
            raise errors.NotBranchError(path=self.root_transport.base)
 
112
            raise errors.NotBranchError(path=transport.base)
155
113
 
156
114
    def _ensure_real(self):
157
115
        """Ensure that there is a _real_bzrdir set.
159
117
        Used before calls to self._real_bzrdir.
160
118
        """
161
119
        if not self._real_bzrdir:
162
 
            if 'hpssvfs' in debug.debug_flags:
163
 
                import traceback
164
 
                warning('VFS BzrDir access triggered\n%s',
165
 
                    ''.join(traceback.format_stack()))
166
120
            self._real_bzrdir = BzrDir.open_from_transport(
167
121
                self.root_transport, _server_formats=False)
168
122
            self._format._network_name = \
244
198
        self._ensure_real()
245
199
        self._real_bzrdir.destroy_repository()
246
200
 
247
 
    def create_branch(self, name=None):
 
201
    def create_branch(self):
248
202
        # as per meta1 formats - just delegate to the format object which may
249
203
        # be parameterised.
250
 
        real_branch = self._format.get_branch_format().initialize(self,
251
 
            name=name)
 
204
        real_branch = self._format.get_branch_format().initialize(self)
252
205
        if not isinstance(real_branch, RemoteBranch):
253
 
            result = RemoteBranch(self, self.find_repository(), real_branch,
254
 
                                  name=name)
 
206
            result = RemoteBranch(self, self.find_repository(), real_branch)
255
207
        else:
256
208
            result = real_branch
257
209
        # BzrDir.clone_on_transport() uses the result of create_branch but does
263
215
        self._next_open_branch_result = result
264
216
        return result
265
217
 
266
 
    def destroy_branch(self, name=None):
 
218
    def destroy_branch(self):
267
219
        """See BzrDir.destroy_branch"""
268
220
        self._ensure_real()
269
 
        self._real_bzrdir.destroy_branch(name=name)
 
221
        self._real_bzrdir.destroy_branch()
270
222
        self._next_open_branch_result = None
271
223
 
272
224
    def create_workingtree(self, revision_id=None, from_branch=None):
291
243
    def _get_branch_reference(self):
292
244
        path = self._path_for_remote_call(self._client)
293
245
        medium = self._client._medium
294
 
        candidate_calls = [
295
 
            ('BzrDir.open_branchV3', (2, 1)),
296
 
            ('BzrDir.open_branchV2', (1, 13)),
297
 
            ('BzrDir.open_branch', None),
298
 
            ]
299
 
        for verb, required_version in candidate_calls:
300
 
            if required_version and medium._is_remote_before(required_version):
301
 
                continue
 
246
        if not medium._is_remote_before((1, 13)):
302
247
            try:
303
 
                response = self._call(verb, path)
 
248
                response = self._call('BzrDir.open_branchV2', path)
 
249
                if response[0] not in ('ref', 'branch'):
 
250
                    raise errors.UnexpectedSmartServerResponse(response)
 
251
                return response
304
252
            except errors.UnknownSmartMethod:
305
 
                if required_version is None:
306
 
                    raise
307
 
                medium._remember_remote_is_before(required_version)
308
 
            else:
309
 
                break
310
 
        if verb == 'BzrDir.open_branch':
311
 
            if response[0] != 'ok':
312
 
                raise errors.UnexpectedSmartServerResponse(response)
313
 
            if response[1] != '':
314
 
                return ('ref', response[1])
315
 
            else:
316
 
                return ('branch', '')
317
 
        if response[0] not in ('ref', 'branch'):
 
253
                medium._remember_remote_is_before((1, 13))
 
254
        response = self._call('BzrDir.open_branch', path)
 
255
        if response[0] != 'ok':
318
256
            raise errors.UnexpectedSmartServerResponse(response)
319
 
        return response
 
257
        if response[1] != '':
 
258
            return ('ref', response[1])
 
259
        else:
 
260
            return ('branch', '')
320
261
 
321
262
    def _get_tree_branch(self):
322
263
        """See BzrDir._get_tree_branch()."""
323
264
        return None, self.open_branch()
324
265
 
325
 
    def open_branch(self, name=None, unsupported=False,
326
 
                    ignore_fallbacks=False):
327
 
        if unsupported:
 
266
    def open_branch(self, _unsupported=False, ignore_fallbacks=False):
 
267
        if _unsupported:
328
268
            raise NotImplementedError('unsupported flag support not implemented yet.')
329
269
        if self._next_open_branch_result is not None:
330
270
            # See create_branch for details.
335
275
        if response[0] == 'ref':
336
276
            # a branch reference, use the existing BranchReference logic.
337
277
            format = BranchReferenceFormat()
338
 
            return format.open(self, name=name, _found=True,
339
 
                location=response[1], ignore_fallbacks=ignore_fallbacks)
 
278
            return format.open(self, _found=True, location=response[1],
 
279
                ignore_fallbacks=ignore_fallbacks)
340
280
        branch_format_name = response[1]
341
281
        if not branch_format_name:
342
282
            branch_format_name = None
343
283
        format = RemoteBranchFormat(network_name=branch_format_name)
344
284
        return RemoteBranch(self, self.find_repository(), format=format,
345
 
            setup_stacking=not ignore_fallbacks, name=name)
 
285
            setup_stacking=not ignore_fallbacks)
346
286
 
347
287
    def _open_repo_v1(self, path):
348
288
        verb = 'BzrDir.find_repository'
409
349
        else:
410
350
            raise errors.NoRepositoryPresent(self)
411
351
 
412
 
    def has_workingtree(self):
413
 
        if self._has_working_tree is None:
414
 
            self._ensure_real()
415
 
            self._has_working_tree = self._real_bzrdir.has_workingtree()
416
 
        return self._has_working_tree
417
 
 
418
352
    def open_workingtree(self, recommend_upgrade=True):
419
 
        if self.has_workingtree():
 
353
        self._ensure_real()
 
354
        if self._real_bzrdir.has_workingtree():
420
355
            raise errors.NotLocalUrl(self.root_transport)
421
356
        else:
422
357
            raise errors.NoWorkingTree(self.root_transport.base)
425
360
        """Return the path to be used for this bzrdir in a remote call."""
426
361
        return client.remote_path_from_transport(self.root_transport)
427
362
 
428
 
    def get_branch_transport(self, branch_format, name=None):
 
363
    def get_branch_transport(self, branch_format):
429
364
        self._ensure_real()
430
 
        return self._real_bzrdir.get_branch_transport(branch_format, name=name)
 
365
        return self._real_bzrdir.get_branch_transport(branch_format)
431
366
 
432
367
    def get_repository_transport(self, repository_format):
433
368
        self._ensure_real()
485
420
        self._custom_format = None
486
421
        self._network_name = None
487
422
        self._creating_bzrdir = None
488
 
        self._supports_chks = None
489
423
        self._supports_external_lookups = None
490
424
        self._supports_tree_reference = None
491
425
        self._rich_root_data = None
492
426
 
493
 
    def __repr__(self):
494
 
        return "%s(_network_name=%r)" % (self.__class__.__name__,
495
 
            self._network_name)
496
 
 
497
427
    @property
498
428
    def fast_deltas(self):
499
429
        self._ensure_real()
507
437
        return self._rich_root_data
508
438
 
509
439
    @property
510
 
    def supports_chks(self):
511
 
        if self._supports_chks is None:
512
 
            self._ensure_real()
513
 
            self._supports_chks = self._custom_format.supports_chks
514
 
        return self._supports_chks
515
 
 
516
 
    @property
517
440
    def supports_external_lookups(self):
518
441
        if self._supports_external_lookups is None:
519
442
            self._ensure_real()
620
543
        return self._custom_format._fetch_reconcile
621
544
 
622
545
    def get_format_description(self):
623
 
        self._ensure_real()
624
 
        return 'Remote: ' + self._custom_format.get_format_description()
 
546
        return 'bzr remote repository'
625
547
 
626
548
    def __eq__(self, other):
627
549
        return self.__class__ is other.__class__
628
550
 
 
551
    def check_conversion_target(self, target_format):
 
552
        if self.rich_root_data and not target_format.rich_root_data:
 
553
            raise errors.BadConversionTarget(
 
554
                'Does not support rich root data.', target_format)
 
555
        if (self.supports_tree_reference and
 
556
            not getattr(target_format, 'supports_tree_reference', False)):
 
557
            raise errors.BadConversionTarget(
 
558
                'Does not support nested trees', target_format)
 
559
 
629
560
    def network_name(self):
630
561
        if self._network_name:
631
562
            return self._network_name
643
574
        return self._custom_format._serializer
644
575
 
645
576
 
646
 
class RemoteRepository(_RpcHelper, lock._RelockDebugMixin,
647
 
    bzrdir.ControlComponent):
 
577
class RemoteRepository(_RpcHelper):
648
578
    """Repository accessed over rpc.
649
579
 
650
580
    For the moment most operations are performed using local transport-backed
693
623
        # Additional places to query for data.
694
624
        self._fallback_repositories = []
695
625
 
696
 
    @property
697
 
    def user_transport(self):
698
 
        return self.bzrdir.user_transport
699
 
 
700
 
    @property
701
 
    def control_transport(self):
702
 
        # XXX: Normally you shouldn't directly get at the remote repository
703
 
        # transport, but I'm not sure it's worth making this method
704
 
        # optional -- mbp 2010-04-21
705
 
        return self.bzrdir.get_repository_transport(None)
706
 
        
707
626
    def __str__(self):
708
627
        return "%s(%s)" % (self.__class__.__name__, self.base)
709
628
 
917
836
        parents_provider = self._make_parents_provider(other_repository)
918
837
        return graph.Graph(parents_provider)
919
838
 
920
 
    @needs_read_lock
921
 
    def get_known_graph_ancestry(self, revision_ids):
922
 
        """Return the known graph for a set of revision ids and their ancestors.
923
 
        """
924
 
        st = static_tuple.StaticTuple
925
 
        revision_keys = [st(r_id).intern() for r_id in revision_ids]
926
 
        known_graph = self.revisions.get_known_graph_ancestry(revision_keys)
927
 
        return graph.GraphThunkIdsToKeys(known_graph)
928
 
 
929
839
    def gather_stats(self, revid=None, committers=None):
930
840
        """See Repository.gather_stats()."""
931
841
        path = self.bzrdir._path_for_remote_call(self._client)
991
901
    def is_write_locked(self):
992
902
        return self._lock_mode == 'w'
993
903
 
994
 
    def _warn_if_deprecated(self, branch=None):
995
 
        # If we have a real repository, the check will be done there, if we
996
 
        # don't the check will be done remotely.
997
 
        pass
998
 
 
999
904
    def lock_read(self):
1000
905
        # wrong eventually - want a local lock cache context
1001
906
        if not self._lock_mode:
1002
 
            self._note_lock('r')
1003
907
            self._lock_mode = 'r'
1004
908
            self._lock_count = 1
1005
909
            self._unstacked_provider.enable_cache(cache_misses=True)
1025
929
 
1026
930
    def lock_write(self, token=None, _skip_rpc=False):
1027
931
        if not self._lock_mode:
1028
 
            self._note_lock('w')
1029
932
            if _skip_rpc:
1030
933
                if self._lock_token is not None:
1031
934
                    if token != self._lock_token:
1134
1037
        else:
1135
1038
            raise errors.UnexpectedSmartServerResponse(response)
1136
1039
 
1137
 
    @only_raises(errors.LockNotHeld, errors.LockBroken)
1138
1040
    def unlock(self):
1139
1041
        if not self._lock_count:
1140
1042
            return lock.cant_unlock_not_held(self)
1240
1142
            # state, so always add a lock here. If a caller passes us a locked
1241
1143
            # repository, they are responsible for unlocking it later.
1242
1144
            repository.lock_read()
1243
 
        self._check_fallback_repository(repository)
1244
1145
        self._fallback_repositories.append(repository)
1245
1146
        # If self._real_repository was parameterised already (e.g. because a
1246
1147
        # _real_branch had its get_stacked_on_url method called), then the
1247
1148
        # repository to be added may already be in the _real_repositories list.
1248
1149
        if self._real_repository is not None:
1249
 
            fallback_locations = [repo.user_url for repo in
 
1150
            fallback_locations = [repo.bzrdir.root_transport.base for repo in
1250
1151
                self._real_repository._fallback_repositories]
1251
 
            if repository.user_url not in fallback_locations:
 
1152
            if repository.bzrdir.root_transport.base not in fallback_locations:
1252
1153
                self._real_repository.add_fallback_repository(repository)
1253
1154
 
1254
 
    def _check_fallback_repository(self, repository):
1255
 
        """Check that this repository can fallback to repository safely.
1256
 
 
1257
 
        Raise an error if not.
1258
 
 
1259
 
        :param repository: A repository to fallback to.
1260
 
        """
1261
 
        return _mod_repository.InterRepository._assert_same_model(
1262
 
            self, repository)
1263
 
 
1264
1155
    def add_inventory(self, revid, inv, parents):
1265
1156
        self._ensure_real()
1266
1157
        return self._real_repository.add_inventory(revid, inv, parents)
1267
1158
 
1268
1159
    def add_inventory_by_delta(self, basis_revision_id, delta, new_revision_id,
1269
 
            parents, basis_inv=None, propagate_caches=False):
 
1160
                               parents):
1270
1161
        self._ensure_real()
1271
1162
        return self._real_repository.add_inventory_by_delta(basis_revision_id,
1272
 
            delta, new_revision_id, parents, basis_inv=basis_inv,
1273
 
            propagate_caches=propagate_caches)
 
1163
            delta, new_revision_id, parents)
1274
1164
 
1275
1165
    def add_revision(self, rev_id, rev, inv=None, config=None):
1276
1166
        self._ensure_real()
1282
1172
        self._ensure_real()
1283
1173
        return self._real_repository.get_inventory(revision_id)
1284
1174
 
1285
 
    def iter_inventories(self, revision_ids, ordering=None):
 
1175
    def iter_inventories(self, revision_ids):
1286
1176
        self._ensure_real()
1287
 
        return self._real_repository.iter_inventories(revision_ids, ordering)
 
1177
        return self._real_repository.iter_inventories(revision_ids)
1288
1178
 
1289
1179
    @needs_read_lock
1290
1180
    def get_revision(self, revision_id):
1535
1425
        return self._real_repository.get_signature_text(revision_id)
1536
1426
 
1537
1427
    @needs_read_lock
1538
 
    def _get_inventory_xml(self, revision_id):
1539
 
        self._ensure_real()
1540
 
        return self._real_repository._get_inventory_xml(revision_id)
 
1428
    def get_inventory_xml(self, revision_id):
 
1429
        self._ensure_real()
 
1430
        return self._real_repository.get_inventory_xml(revision_id)
 
1431
 
 
1432
    def deserialise_inventory(self, revision_id, xml):
 
1433
        self._ensure_real()
 
1434
        return self._real_repository.deserialise_inventory(revision_id, xml)
1541
1435
 
1542
1436
    def reconcile(self, other=None, thorough=False):
1543
1437
        self._ensure_real()
1570
1464
        return self._real_repository.get_revision_reconcile(revision_id)
1571
1465
 
1572
1466
    @needs_read_lock
1573
 
    def check(self, revision_ids=None, callback_refs=None, check_repo=True):
 
1467
    def check(self, revision_ids=None):
1574
1468
        self._ensure_real()
1575
 
        return self._real_repository.check(revision_ids=revision_ids,
1576
 
            callback_refs=callback_refs, check_repo=check_repo)
 
1469
        return self._real_repository.check(revision_ids=revision_ids)
1577
1470
 
1578
1471
    def copy_content_into(self, destination, revision_id=None):
1579
1472
        self._ensure_real()
1619
1512
        return self._real_repository.inventories
1620
1513
 
1621
1514
    @needs_write_lock
1622
 
    def pack(self, hint=None, clean_obsolete_packs=False):
 
1515
    def pack(self, hint=None):
1623
1516
        """Compress the data within the repository.
1624
1517
 
1625
1518
        This is not currently implemented within the smart server.
1626
1519
        """
1627
1520
        self._ensure_real()
1628
 
        return self._real_repository.pack(hint=hint, clean_obsolete_packs=clean_obsolete_packs)
 
1521
        return self._real_repository.pack(hint=hint)
1629
1522
 
1630
1523
    @property
1631
1524
    def revisions(self):
1719
1612
        self._ensure_real()
1720
1613
        return self._real_repository.revision_graph_can_have_wrong_parents()
1721
1614
 
1722
 
    def _find_inconsistent_revision_parents(self, revisions_iterator=None):
 
1615
    def _find_inconsistent_revision_parents(self):
1723
1616
        self._ensure_real()
1724
 
        return self._real_repository._find_inconsistent_revision_parents(
1725
 
            revisions_iterator)
 
1617
        return self._real_repository._find_inconsistent_revision_parents()
1726
1618
 
1727
1619
    def _check_for_inconsistent_revision_parents(self):
1728
1620
        self._ensure_real()
1782
1674
    def insert_stream(self, stream, src_format, resume_tokens):
1783
1675
        target = self.target_repo
1784
1676
        target._unstacked_provider.missing_keys.clear()
1785
 
        candidate_calls = [('Repository.insert_stream_1.19', (1, 19))]
1786
1677
        if target._lock_token:
1787
 
            candidate_calls.append(('Repository.insert_stream_locked', (1, 14)))
1788
 
            lock_args = (target._lock_token or '',)
 
1678
            verb = 'Repository.insert_stream_locked'
 
1679
            extra_args = (target._lock_token or '',)
 
1680
            required_version = (1, 14)
1789
1681
        else:
1790
 
            candidate_calls.append(('Repository.insert_stream', (1, 13)))
1791
 
            lock_args = ()
 
1682
            verb = 'Repository.insert_stream'
 
1683
            extra_args = ()
 
1684
            required_version = (1, 13)
1792
1685
        client = target._client
1793
1686
        medium = client._medium
 
1687
        if medium._is_remote_before(required_version):
 
1688
            # No possible way this can work.
 
1689
            return self._insert_real(stream, src_format, resume_tokens)
1794
1690
        path = target.bzrdir._path_for_remote_call(client)
1795
 
        # Probe for the verb to use with an empty stream before sending the
1796
 
        # real stream to it.  We do this both to avoid the risk of sending a
1797
 
        # large request that is then rejected, and because we don't want to
1798
 
        # implement a way to buffer, rewind, or restart the stream.
1799
 
        found_verb = False
1800
 
        for verb, required_version in candidate_calls:
1801
 
            if medium._is_remote_before(required_version):
1802
 
                continue
1803
 
            if resume_tokens:
1804
 
                # We've already done the probing (and set _is_remote_before) on
1805
 
                # a previous insert.
1806
 
                found_verb = True
1807
 
                break
 
1691
        if not resume_tokens:
 
1692
            # XXX: Ugly but important for correctness, *will* be fixed during
 
1693
            # 1.13 cycle. Pushing a stream that is interrupted results in a
 
1694
            # fallback to the _real_repositories sink *with a partial stream*.
 
1695
            # Thats bad because we insert less data than bzr expected. To avoid
 
1696
            # this we do a trial push to make sure the verb is accessible, and
 
1697
            # do not fallback when actually pushing the stream. A cleanup patch
 
1698
            # is going to look at rewinding/restarting the stream/partial
 
1699
            # buffering etc.
1808
1700
            byte_stream = smart_repo._stream_to_byte_stream([], src_format)
1809
1701
            try:
1810
1702
                response = client.call_with_body_stream(
1811
 
                    (verb, path, '') + lock_args, byte_stream)
 
1703
                    (verb, path, '') + extra_args, byte_stream)
1812
1704
            except errors.UnknownSmartMethod:
1813
1705
                medium._remember_remote_is_before(required_version)
1814
 
            else:
1815
 
                found_verb = True
1816
 
                break
1817
 
        if not found_verb:
1818
 
            # Have to use VFS.
1819
 
            return self._insert_real(stream, src_format, resume_tokens)
1820
 
        self._last_inv_record = None
1821
 
        self._last_substream = None
1822
 
        if required_version < (1, 19):
1823
 
            # Remote side doesn't support inventory deltas.  Wrap the stream to
1824
 
            # make sure we don't send any.  If the stream contains inventory
1825
 
            # deltas we'll interrupt the smart insert_stream request and
1826
 
            # fallback to VFS.
1827
 
            stream = self._stop_stream_if_inventory_delta(stream)
 
1706
                return self._insert_real(stream, src_format, resume_tokens)
1828
1707
        byte_stream = smart_repo._stream_to_byte_stream(
1829
1708
            stream, src_format)
1830
1709
        resume_tokens = ' '.join(resume_tokens)
1831
1710
        response = client.call_with_body_stream(
1832
 
            (verb, path, resume_tokens) + lock_args, byte_stream)
 
1711
            (verb, path, resume_tokens) + extra_args, byte_stream)
1833
1712
        if response[0][0] not in ('ok', 'missing-basis'):
1834
1713
            raise errors.UnexpectedSmartServerResponse(response)
1835
 
        if self._last_substream is not None:
1836
 
            # The stream included an inventory-delta record, but the remote
1837
 
            # side isn't new enough to support them.  So we need to send the
1838
 
            # rest of the stream via VFS.
1839
 
            self.target_repo.refresh_data()
1840
 
            return self._resume_stream_with_vfs(response, src_format)
1841
1714
        if response[0][0] == 'missing-basis':
1842
1715
            tokens, missing_keys = bencode.bdecode_as_tuple(response[0][1])
1843
1716
            resume_tokens = tokens
1846
1719
            self.target_repo.refresh_data()
1847
1720
            return [], set()
1848
1721
 
1849
 
    def _resume_stream_with_vfs(self, response, src_format):
1850
 
        """Resume sending a stream via VFS, first resending the record and
1851
 
        substream that couldn't be sent via an insert_stream verb.
1852
 
        """
1853
 
        if response[0][0] == 'missing-basis':
1854
 
            tokens, missing_keys = bencode.bdecode_as_tuple(response[0][1])
1855
 
            # Ignore missing_keys, we haven't finished inserting yet
1856
 
        else:
1857
 
            tokens = []
1858
 
        def resume_substream():
1859
 
            # Yield the substream that was interrupted.
1860
 
            for record in self._last_substream:
1861
 
                yield record
1862
 
            self._last_substream = None
1863
 
        def resume_stream():
1864
 
            # Finish sending the interrupted substream
1865
 
            yield ('inventory-deltas', resume_substream())
1866
 
            # Then simply continue sending the rest of the stream.
1867
 
            for substream_kind, substream in self._last_stream:
1868
 
                yield substream_kind, substream
1869
 
        return self._insert_real(resume_stream(), src_format, tokens)
1870
 
 
1871
 
    def _stop_stream_if_inventory_delta(self, stream):
1872
 
        """Normally this just lets the original stream pass-through unchanged.
1873
 
 
1874
 
        However if any 'inventory-deltas' substream occurs it will stop
1875
 
        streaming, and store the interrupted substream and stream in
1876
 
        self._last_substream and self._last_stream so that the stream can be
1877
 
        resumed by _resume_stream_with_vfs.
1878
 
        """
1879
 
                    
1880
 
        stream_iter = iter(stream)
1881
 
        for substream_kind, substream in stream_iter:
1882
 
            if substream_kind == 'inventory-deltas':
1883
 
                self._last_substream = substream
1884
 
                self._last_stream = stream_iter
1885
 
                return
1886
 
            else:
1887
 
                yield substream_kind, substream
1888
 
            
1889
1722
 
1890
1723
class RemoteStreamSource(repository.StreamSource):
1891
1724
    """Stream data from a remote server."""
1894
1727
        if (self.from_repository._fallback_repositories and
1895
1728
            self.to_format._fetch_order == 'topological'):
1896
1729
            return self._real_stream(self.from_repository, search)
1897
 
        sources = []
1898
 
        seen = set()
1899
 
        repos = [self.from_repository]
1900
 
        while repos:
1901
 
            repo = repos.pop(0)
1902
 
            if repo in seen:
1903
 
                continue
1904
 
            seen.add(repo)
1905
 
            repos.extend(repo._fallback_repositories)
1906
 
            sources.append(repo)
1907
 
        return self.missing_parents_chain(search, sources)
1908
 
 
1909
 
    def get_stream_for_missing_keys(self, missing_keys):
1910
 
        self.from_repository._ensure_real()
1911
 
        real_repo = self.from_repository._real_repository
1912
 
        real_source = real_repo._get_source(self.to_format)
1913
 
        return real_source.get_stream_for_missing_keys(missing_keys)
 
1730
        return self.missing_parents_chain(search, [self.from_repository] +
 
1731
            self.from_repository._fallback_repositories)
1914
1732
 
1915
1733
    def _real_stream(self, repo, search):
1916
1734
        """Get a stream for search from repo.
1923
1741
        """
1924
1742
        source = repo._get_source(self.to_format)
1925
1743
        if isinstance(source, RemoteStreamSource):
1926
 
            repo._ensure_real()
1927
 
            source = repo._real_repository._get_source(self.to_format)
 
1744
            return repository.StreamSource.get_stream(source, search)
1928
1745
        return source.get_stream(search)
1929
1746
 
1930
1747
    def _get_stream(self, repo, search):
1947
1764
            return self._real_stream(repo, search)
1948
1765
        client = repo._client
1949
1766
        medium = client._medium
 
1767
        if medium._is_remote_before((1, 13)):
 
1768
            # streaming was added in 1.13
 
1769
            return self._real_stream(repo, search)
1950
1770
        path = repo.bzrdir._path_for_remote_call(client)
1951
 
        search_bytes = repo._serialise_search_result(search)
1952
 
        args = (path, self.to_format.network_name())
1953
 
        candidate_verbs = [
1954
 
            ('Repository.get_stream_1.19', (1, 19)),
1955
 
            ('Repository.get_stream', (1, 13))]
1956
 
        found_verb = False
1957
 
        for verb, version in candidate_verbs:
1958
 
            if medium._is_remote_before(version):
1959
 
                continue
1960
 
            try:
1961
 
                response = repo._call_with_body_bytes_expecting_body(
1962
 
                    verb, args, search_bytes)
1963
 
            except errors.UnknownSmartMethod:
1964
 
                medium._remember_remote_is_before(version)
1965
 
            else:
1966
 
                response_tuple, response_handler = response
1967
 
                found_verb = True
1968
 
                break
1969
 
        if not found_verb:
 
1771
        try:
 
1772
            search_bytes = repo._serialise_search_result(search)
 
1773
            response = repo._call_with_body_bytes_expecting_body(
 
1774
                'Repository.get_stream',
 
1775
                (path, self.to_format.network_name()), search_bytes)
 
1776
            response_tuple, response_handler = response
 
1777
        except errors.UnknownSmartMethod:
 
1778
            medium._remember_remote_is_before((1,13))
1970
1779
            return self._real_stream(repo, search)
1971
1780
        if response_tuple[0] != 'ok':
1972
1781
            raise errors.UnexpectedSmartServerResponse(response_tuple)
1984
1793
        :param search: The overall search to satisfy with streams.
1985
1794
        :param sources: A list of Repository objects to query.
1986
1795
        """
1987
 
        self.from_serialiser = self.from_repository._format._serializer
 
1796
        self.serialiser = self.to_format._serializer
1988
1797
        self.seen_revs = set()
1989
1798
        self.referenced_revs = set()
1990
1799
        # If there are heads in the search, or the key count is > 0, we are not
2007
1816
    def missing_parents_rev_handler(self, substream):
2008
1817
        for content in substream:
2009
1818
            revision_bytes = content.get_bytes_as('fulltext')
2010
 
            revision = self.from_serialiser.read_revision_from_string(
2011
 
                revision_bytes)
 
1819
            revision = self.serialiser.read_revision_from_string(revision_bytes)
2012
1820
            self.seen_revs.add(content.key[-1])
2013
1821
            self.referenced_revs.update(revision.parent_ids)
2014
1822
            yield content
2053
1861
                self._network_name)
2054
1862
 
2055
1863
    def get_format_description(self):
2056
 
        self._ensure_real()
2057
 
        return 'Remote: ' + self._custom_format.get_format_description()
 
1864
        return 'Remote BZR Branch'
2058
1865
 
2059
1866
    def network_name(self):
2060
1867
        return self._network_name
2061
1868
 
2062
 
    def open(self, a_bzrdir, name=None, ignore_fallbacks=False):
2063
 
        return a_bzrdir.open_branch(name=name, 
2064
 
            ignore_fallbacks=ignore_fallbacks)
 
1869
    def open(self, a_bzrdir, ignore_fallbacks=False):
 
1870
        return a_bzrdir.open_branch(ignore_fallbacks=ignore_fallbacks)
2065
1871
 
2066
 
    def _vfs_initialize(self, a_bzrdir, name):
 
1872
    def _vfs_initialize(self, a_bzrdir):
2067
1873
        # Initialisation when using a local bzrdir object, or a non-vfs init
2068
1874
        # method is not available on the server.
2069
1875
        # self._custom_format is always set - the start of initialize ensures
2070
1876
        # that.
2071
1877
        if isinstance(a_bzrdir, RemoteBzrDir):
2072
1878
            a_bzrdir._ensure_real()
2073
 
            result = self._custom_format.initialize(a_bzrdir._real_bzrdir,
2074
 
                name)
 
1879
            result = self._custom_format.initialize(a_bzrdir._real_bzrdir)
2075
1880
        else:
2076
1881
            # We assume the bzrdir is parameterised; it may not be.
2077
 
            result = self._custom_format.initialize(a_bzrdir, name)
 
1882
            result = self._custom_format.initialize(a_bzrdir)
2078
1883
        if (isinstance(a_bzrdir, RemoteBzrDir) and
2079
1884
            not isinstance(result, RemoteBranch)):
2080
 
            result = RemoteBranch(a_bzrdir, a_bzrdir.find_repository(), result,
2081
 
                                  name=name)
 
1885
            result = RemoteBranch(a_bzrdir, a_bzrdir.find_repository(), result)
2082
1886
        return result
2083
1887
 
2084
 
    def initialize(self, a_bzrdir, name=None):
 
1888
    def initialize(self, a_bzrdir):
2085
1889
        # 1) get the network name to use.
2086
1890
        if self._custom_format:
2087
1891
            network_name = self._custom_format.network_name()
2093
1897
            network_name = reference_format.network_name()
2094
1898
        # Being asked to create on a non RemoteBzrDir:
2095
1899
        if not isinstance(a_bzrdir, RemoteBzrDir):
2096
 
            return self._vfs_initialize(a_bzrdir, name=name)
 
1900
            return self._vfs_initialize(a_bzrdir)
2097
1901
        medium = a_bzrdir._client._medium
2098
1902
        if medium._is_remote_before((1, 13)):
2099
 
            return self._vfs_initialize(a_bzrdir, name=name)
 
1903
            return self._vfs_initialize(a_bzrdir)
2100
1904
        # Creating on a remote bzr dir.
2101
1905
        # 2) try direct creation via RPC
2102
1906
        path = a_bzrdir._path_for_remote_call(a_bzrdir._client)
2103
 
        if name is not None:
2104
 
            # XXX JRV20100304: Support creating colocated branches
2105
 
            raise errors.NoColocatedBranchSupport(self)
2106
1907
        verb = 'BzrDir.create_branch'
2107
1908
        try:
2108
1909
            response = a_bzrdir._call(verb, path, network_name)
2109
1910
        except errors.UnknownSmartMethod:
2110
1911
            # Fallback - use vfs methods
2111
1912
            medium._remember_remote_is_before((1, 13))
2112
 
            return self._vfs_initialize(a_bzrdir, name=name)
 
1913
            return self._vfs_initialize(a_bzrdir)
2113
1914
        if response[0] != 'ok':
2114
1915
            raise errors.UnexpectedSmartServerResponse(response)
2115
1916
        # Turn the response into a RemoteRepository object.
2123
1924
                a_bzrdir._client)
2124
1925
        remote_repo = RemoteRepository(repo_bzrdir, repo_format)
2125
1926
        remote_branch = RemoteBranch(a_bzrdir, remote_repo,
2126
 
            format=format, setup_stacking=False, name=name)
 
1927
            format=format, setup_stacking=False)
2127
1928
        # XXX: We know this is a new branch, so it must have revno 0, revid
2128
1929
        # NULL_REVISION. Creating the branch locked would make this be unable
2129
1930
        # to be wrong; here its simply very unlikely to be wrong. RBC 20090225
2149
1950
        return self._custom_format.supports_set_append_revisions_only()
2150
1951
 
2151
1952
 
2152
 
class RemoteBranch(branch.Branch, _RpcHelper, lock._RelockDebugMixin):
 
1953
class RemoteBranch(branch.Branch, _RpcHelper):
2153
1954
    """Branch stored on a server accessed by HPSS RPC.
2154
1955
 
2155
1956
    At the moment most operations are mapped down to simple file operations.
2156
1957
    """
2157
1958
 
2158
1959
    def __init__(self, remote_bzrdir, remote_repository, real_branch=None,
2159
 
        _client=None, format=None, setup_stacking=True, name=None):
 
1960
        _client=None, format=None, setup_stacking=True):
2160
1961
        """Create a RemoteBranch instance.
2161
1962
 
2162
1963
        :param real_branch: An optional local implementation of the branch
2168
1969
        :param setup_stacking: If True make an RPC call to determine the
2169
1970
            stacked (or not) status of the branch. If False assume the branch
2170
1971
            is not stacked.
2171
 
        :param name: Colocated branch name
2172
1972
        """
2173
1973
        # We intentionally don't call the parent class's __init__, because it
2174
1974
        # will try to assign to self.tags, which is a property in this subclass.
2193
1993
            self._real_branch = None
2194
1994
        # Fill out expected attributes of branch for bzrlib API users.
2195
1995
        self._clear_cached_state()
2196
 
        # TODO: deprecate self.base in favor of user_url
2197
 
        self.base = self.bzrdir.user_url
2198
 
        self._name = name
 
1996
        self.base = self.bzrdir.root_transport.base
2199
1997
        self._control_files = None
2200
1998
        self._lock_mode = None
2201
1999
        self._lock_token = None
2212
2010
                    self._real_branch._format.network_name()
2213
2011
        else:
2214
2012
            self._format = format
2215
 
        # when we do _ensure_real we may need to pass ignore_fallbacks to the
2216
 
        # branch.open_branch method.
2217
 
        self._real_ignore_fallbacks = not setup_stacking
2218
2013
        if not self._format._network_name:
2219
2014
            # Did not get from open_branchV2 - old server.
2220
2015
            self._ensure_real()
2265
2060
                raise AssertionError('smart server vfs must be enabled '
2266
2061
                    'to use vfs implementation')
2267
2062
            self.bzrdir._ensure_real()
2268
 
            self._real_branch = self.bzrdir._real_bzrdir.open_branch(
2269
 
                ignore_fallbacks=self._real_ignore_fallbacks, name=self._name)
 
2063
            self._real_branch = self.bzrdir._real_bzrdir.open_branch()
2270
2064
            if self.repository._real_repository is None:
2271
2065
                # Give the remote repository the matching real repo.
2272
2066
                real_repo = self._real_branch.repository
2368
2162
            return self._vfs_get_tags_bytes()
2369
2163
        return response[0]
2370
2164
 
2371
 
    def _vfs_set_tags_bytes(self, bytes):
2372
 
        self._ensure_real()
2373
 
        return self._real_branch._set_tags_bytes(bytes)
2374
 
 
2375
 
    def _set_tags_bytes(self, bytes):
2376
 
        medium = self._client._medium
2377
 
        if medium._is_remote_before((1, 18)):
2378
 
            self._vfs_set_tags_bytes(bytes)
2379
 
            return
2380
 
        try:
2381
 
            args = (
2382
 
                self._remote_path(), self._lock_token, self._repo_lock_token)
2383
 
            response = self._call_with_body_bytes(
2384
 
                'Branch.set_tags_bytes', args, bytes)
2385
 
        except errors.UnknownSmartMethod:
2386
 
            medium._remember_remote_is_before((1, 18))
2387
 
            self._vfs_set_tags_bytes(bytes)
2388
 
 
2389
2165
    def lock_read(self):
2390
2166
        self.repository.lock_read()
2391
2167
        if not self._lock_mode:
2392
 
            self._note_lock('r')
2393
2168
            self._lock_mode = 'r'
2394
2169
            self._lock_count = 1
2395
2170
            if self._real_branch is not None:
2415
2190
 
2416
2191
    def lock_write(self, token=None):
2417
2192
        if not self._lock_mode:
2418
 
            self._note_lock('w')
2419
2193
            # Lock the branch and repo in one remote call.
2420
2194
            remote_tokens = self._remote_lock_write(token)
2421
2195
            self._lock_token, self._repo_lock_token = remote_tokens
2447
2221
            self.repository.lock_write(self._repo_lock_token)
2448
2222
        return self._lock_token or None
2449
2223
 
 
2224
    def _set_tags_bytes(self, bytes):
 
2225
        self._ensure_real()
 
2226
        return self._real_branch._set_tags_bytes(bytes)
 
2227
 
2450
2228
    def _unlock(self, branch_token, repo_token):
2451
2229
        err_context = {'token': str((branch_token, repo_token))}
2452
2230
        response = self._call(
2456
2234
            return
2457
2235
        raise errors.UnexpectedSmartServerResponse(response)
2458
2236
 
2459
 
    @only_raises(errors.LockNotHeld, errors.LockBroken)
2460
2237
    def unlock(self):
2461
2238
        try:
2462
2239
            self._lock_count -= 1
2502
2279
            raise NotImplementedError(self.dont_leave_lock_in_place)
2503
2280
        self._leave_lock = False
2504
2281
 
2505
 
    @needs_read_lock
2506
2282
    def get_rev_id(self, revno, history=None):
2507
2283
        if revno == 0:
2508
2284
            return _mod_revision.NULL_REVISION
2873
2649
                    'Missing key %r in context %r', key_err.args[0], context)
2874
2650
                raise err
2875
2651
 
2876
 
    if err.error_verb == 'IncompatibleRepositories':
2877
 
        raise errors.IncompatibleRepositories(err.error_args[0],
2878
 
            err.error_args[1], err.error_args[2])
2879
 
    elif err.error_verb == 'NoSuchRevision':
 
2652
    if err.error_verb == 'NoSuchRevision':
2880
2653
        raise NoSuchRevision(find('branch'), err.error_args[0])
2881
2654
    elif err.error_verb == 'nosuchrevision':
2882
2655
        raise NoSuchRevision(find('repository'), err.error_args[0])
2883
 
    elif err.error_verb == 'nobranch':
2884
 
        if len(err.error_args) >= 1:
2885
 
            extra = err.error_args[0]
2886
 
        else:
2887
 
            extra = None
2888
 
        raise errors.NotBranchError(path=find('bzrdir').root_transport.base,
2889
 
            detail=extra)
 
2656
    elif err.error_tuple == ('nobranch',):
 
2657
        raise errors.NotBranchError(path=find('bzrdir').root_transport.base)
2890
2658
    elif err.error_verb == 'norepository':
2891
2659
        raise errors.NoRepositoryPresent(find('bzrdir'))
2892
2660
    elif err.error_verb == 'LockContention':