/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/remote.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2009-08-05 18:56:37 UTC
  • mfrom: (4580.5.16 1.18-win32-buildbot)
  • Revision ID: pqm@pqm.ubuntu.com-20090805185637-3f0y10upzcdw7e0g
Updates to buildout.cfg etc to have 'make installer-all' start being
        the preferred way to build win32 installer.

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
 
from bzrlib.branch import BranchReferenceFormat, BranchWriteLockResult
 
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,
43
41
from bzrlib.lockable_files import LockableFiles
44
42
from bzrlib.smart import client, vfs, repository as smart_repo
45
43
from bzrlib.revision import ensure_null, NULL_REVISION
46
 
from bzrlib.repository import RepositoryWriteLockResult
47
44
from bzrlib.trace import mutter, note, warning
48
45
 
49
46
 
92
89
class RemoteBzrDir(BzrDir, _RpcHelper):
93
90
    """Control directory on a remote server, accessed via bzr:// or similar."""
94
91
 
95
 
    def __init__(self, transport, format, _client=None, _force_probe=False):
 
92
    def __init__(self, transport, format, _client=None):
96
93
        """Construct a RemoteBzrDir.
97
94
 
98
95
        :param _client: Private parameter for testing. Disables probing and the
102
99
        # this object holds a delegated bzrdir that uses file-level operations
103
100
        # to talk to the other side
104
101
        self._real_bzrdir = None
105
 
        self._has_working_tree = None
106
102
        # 1-shot cache for the call pattern 'create_branch; open_branch' - see
107
103
        # create_branch for details.
108
104
        self._next_open_branch_result = None
112
108
            self._client = client._SmartClient(medium)
113
109
        else:
114
110
            self._client = _client
115
 
            if not _force_probe:
116
 
                return
117
 
 
118
 
        self._probe_bzrdir()
119
 
 
120
 
    def __repr__(self):
121
 
        return '%s(%r)' % (self.__class__.__name__, self._client)
122
 
 
123
 
    def _probe_bzrdir(self):
124
 
        medium = self._client._medium
 
111
            return
 
112
 
125
113
        path = self._path_for_remote_call(self._client)
126
 
        if medium._is_remote_before((2, 1)):
127
 
            self._rpc_open(path)
128
 
            return
129
 
        try:
130
 
            self._rpc_open_2_1(path)
131
 
            return
132
 
        except errors.UnknownSmartMethod:
133
 
            medium._remember_remote_is_before((2, 1))
134
 
            self._rpc_open(path)
135
 
 
136
 
    def _rpc_open_2_1(self, path):
137
 
        response = self._call('BzrDir.open_2.1', path)
138
 
        if response == ('no',):
139
 
            raise errors.NotBranchError(path=self.root_transport.base)
140
 
        elif response[0] == 'yes':
141
 
            if response[1] == 'yes':
142
 
                self._has_working_tree = True
143
 
            elif response[1] == 'no':
144
 
                self._has_working_tree = False
145
 
            else:
146
 
                raise errors.UnexpectedSmartServerResponse(response)
147
 
        else:
148
 
            raise errors.UnexpectedSmartServerResponse(response)
149
 
 
150
 
    def _rpc_open(self, path):
151
114
        response = self._call('BzrDir.open', path)
152
115
        if response not in [('yes',), ('no',)]:
153
116
            raise errors.UnexpectedSmartServerResponse(response)
154
117
        if response == ('no',):
155
 
            raise errors.NotBranchError(path=self.root_transport.base)
 
118
            raise errors.NotBranchError(path=transport.base)
156
119
 
157
120
    def _ensure_real(self):
158
121
        """Ensure that there is a _real_bzrdir set.
160
123
        Used before calls to self._real_bzrdir.
161
124
        """
162
125
        if not self._real_bzrdir:
163
 
            if 'hpssvfs' in debug.debug_flags:
164
 
                import traceback
165
 
                warning('VFS BzrDir access triggered\n%s',
166
 
                    ''.join(traceback.format_stack()))
167
126
            self._real_bzrdir = BzrDir.open_from_transport(
168
127
                self.root_transport, _server_formats=False)
169
128
            self._format._network_name = \
245
204
        self._ensure_real()
246
205
        self._real_bzrdir.destroy_repository()
247
206
 
248
 
    def create_branch(self, name=None):
 
207
    def create_branch(self):
249
208
        # as per meta1 formats - just delegate to the format object which may
250
209
        # be parameterised.
251
 
        real_branch = self._format.get_branch_format().initialize(self,
252
 
            name=name)
 
210
        real_branch = self._format.get_branch_format().initialize(self)
253
211
        if not isinstance(real_branch, RemoteBranch):
254
 
            result = RemoteBranch(self, self.find_repository(), real_branch,
255
 
                                  name=name)
 
212
            result = RemoteBranch(self, self.find_repository(), real_branch)
256
213
        else:
257
214
            result = real_branch
258
215
        # BzrDir.clone_on_transport() uses the result of create_branch but does
264
221
        self._next_open_branch_result = result
265
222
        return result
266
223
 
267
 
    def destroy_branch(self, name=None):
 
224
    def destroy_branch(self):
268
225
        """See BzrDir.destroy_branch"""
269
226
        self._ensure_real()
270
 
        self._real_bzrdir.destroy_branch(name=name)
 
227
        self._real_bzrdir.destroy_branch()
271
228
        self._next_open_branch_result = None
272
229
 
273
230
    def create_workingtree(self, revision_id=None, from_branch=None):
292
249
    def _get_branch_reference(self):
293
250
        path = self._path_for_remote_call(self._client)
294
251
        medium = self._client._medium
295
 
        candidate_calls = [
296
 
            ('BzrDir.open_branchV3', (2, 1)),
297
 
            ('BzrDir.open_branchV2', (1, 13)),
298
 
            ('BzrDir.open_branch', None),
299
 
            ]
300
 
        for verb, required_version in candidate_calls:
301
 
            if required_version and medium._is_remote_before(required_version):
302
 
                continue
 
252
        if not medium._is_remote_before((1, 13)):
303
253
            try:
304
 
                response = self._call(verb, path)
 
254
                response = self._call('BzrDir.open_branchV2', path)
 
255
                if response[0] not in ('ref', 'branch'):
 
256
                    raise errors.UnexpectedSmartServerResponse(response)
 
257
                return response
305
258
            except errors.UnknownSmartMethod:
306
 
                if required_version is None:
307
 
                    raise
308
 
                medium._remember_remote_is_before(required_version)
309
 
            else:
310
 
                break
311
 
        if verb == 'BzrDir.open_branch':
312
 
            if response[0] != 'ok':
313
 
                raise errors.UnexpectedSmartServerResponse(response)
314
 
            if response[1] != '':
315
 
                return ('ref', response[1])
316
 
            else:
317
 
                return ('branch', '')
318
 
        if response[0] not in ('ref', 'branch'):
 
259
                medium._remember_remote_is_before((1, 13))
 
260
        response = self._call('BzrDir.open_branch', path)
 
261
        if response[0] != 'ok':
319
262
            raise errors.UnexpectedSmartServerResponse(response)
320
 
        return response
 
263
        if response[1] != '':
 
264
            return ('ref', response[1])
 
265
        else:
 
266
            return ('branch', '')
321
267
 
322
268
    def _get_tree_branch(self):
323
269
        """See BzrDir._get_tree_branch()."""
324
270
        return None, self.open_branch()
325
271
 
326
 
    def open_branch(self, name=None, unsupported=False,
327
 
                    ignore_fallbacks=False):
328
 
        if unsupported:
 
272
    def open_branch(self, _unsupported=False, ignore_fallbacks=False):
 
273
        if _unsupported:
329
274
            raise NotImplementedError('unsupported flag support not implemented yet.')
330
275
        if self._next_open_branch_result is not None:
331
276
            # See create_branch for details.
336
281
        if response[0] == 'ref':
337
282
            # a branch reference, use the existing BranchReference logic.
338
283
            format = BranchReferenceFormat()
339
 
            return format.open(self, name=name, _found=True,
340
 
                location=response[1], ignore_fallbacks=ignore_fallbacks)
 
284
            return format.open(self, _found=True, location=response[1],
 
285
                ignore_fallbacks=ignore_fallbacks)
341
286
        branch_format_name = response[1]
342
287
        if not branch_format_name:
343
288
            branch_format_name = None
344
289
        format = RemoteBranchFormat(network_name=branch_format_name)
345
290
        return RemoteBranch(self, self.find_repository(), format=format,
346
 
            setup_stacking=not ignore_fallbacks, name=name)
 
291
            setup_stacking=not ignore_fallbacks)
347
292
 
348
293
    def _open_repo_v1(self, path):
349
294
        verb = 'BzrDir.find_repository'
410
355
        else:
411
356
            raise errors.NoRepositoryPresent(self)
412
357
 
413
 
    def has_workingtree(self):
414
 
        if self._has_working_tree is None:
415
 
            self._ensure_real()
416
 
            self._has_working_tree = self._real_bzrdir.has_workingtree()
417
 
        return self._has_working_tree
418
 
 
419
358
    def open_workingtree(self, recommend_upgrade=True):
420
 
        if self.has_workingtree():
 
359
        self._ensure_real()
 
360
        if self._real_bzrdir.has_workingtree():
421
361
            raise errors.NotLocalUrl(self.root_transport)
422
362
        else:
423
363
            raise errors.NoWorkingTree(self.root_transport.base)
426
366
        """Return the path to be used for this bzrdir in a remote call."""
427
367
        return client.remote_path_from_transport(self.root_transport)
428
368
 
429
 
    def get_branch_transport(self, branch_format, name=None):
 
369
    def get_branch_transport(self, branch_format):
430
370
        self._ensure_real()
431
 
        return self._real_bzrdir.get_branch_transport(branch_format, name=name)
 
371
        return self._real_bzrdir.get_branch_transport(branch_format)
432
372
 
433
373
    def get_repository_transport(self, repository_format):
434
374
        self._ensure_real()
486
426
        self._custom_format = None
487
427
        self._network_name = None
488
428
        self._creating_bzrdir = None
489
 
        self._supports_chks = None
490
429
        self._supports_external_lookups = None
491
430
        self._supports_tree_reference = None
492
431
        self._rich_root_data = None
493
432
 
494
 
    def __repr__(self):
495
 
        return "%s(_network_name=%r)" % (self.__class__.__name__,
496
 
            self._network_name)
497
 
 
498
433
    @property
499
434
    def fast_deltas(self):
500
435
        self._ensure_real()
508
443
        return self._rich_root_data
509
444
 
510
445
    @property
511
 
    def supports_chks(self):
512
 
        if self._supports_chks is None:
513
 
            self._ensure_real()
514
 
            self._supports_chks = self._custom_format.supports_chks
515
 
        return self._supports_chks
516
 
 
517
 
    @property
518
446
    def supports_external_lookups(self):
519
447
        if self._supports_external_lookups is None:
520
448
            self._ensure_real()
621
549
        return self._custom_format._fetch_reconcile
622
550
 
623
551
    def get_format_description(self):
624
 
        self._ensure_real()
625
 
        return 'Remote: ' + self._custom_format.get_format_description()
 
552
        return 'bzr remote repository'
626
553
 
627
554
    def __eq__(self, other):
628
555
        return self.__class__ is other.__class__
629
556
 
 
557
    def check_conversion_target(self, target_format):
 
558
        if self.rich_root_data and not target_format.rich_root_data:
 
559
            raise errors.BadConversionTarget(
 
560
                'Does not support rich root data.', target_format)
 
561
        if (self.supports_tree_reference and
 
562
            not getattr(target_format, 'supports_tree_reference', False)):
 
563
            raise errors.BadConversionTarget(
 
564
                'Does not support nested trees', target_format)
 
565
 
630
566
    def network_name(self):
631
567
        if self._network_name:
632
568
            return self._network_name
644
580
        return self._custom_format._serializer
645
581
 
646
582
 
647
 
class RemoteRepository(_RpcHelper, lock._RelockDebugMixin,
648
 
    bzrdir.ControlComponent):
 
583
class RemoteRepository(_RpcHelper):
649
584
    """Repository accessed over rpc.
650
585
 
651
586
    For the moment most operations are performed using local transport-backed
694
629
        # Additional places to query for data.
695
630
        self._fallback_repositories = []
696
631
 
697
 
    @property
698
 
    def user_transport(self):
699
 
        return self.bzrdir.user_transport
700
 
 
701
 
    @property
702
 
    def control_transport(self):
703
 
        # XXX: Normally you shouldn't directly get at the remote repository
704
 
        # transport, but I'm not sure it's worth making this method
705
 
        # optional -- mbp 2010-04-21
706
 
        return self.bzrdir.get_repository_transport(None)
707
 
        
708
632
    def __str__(self):
709
633
        return "%s(%s)" % (self.__class__.__name__, self.base)
710
634
 
918
842
        parents_provider = self._make_parents_provider(other_repository)
919
843
        return graph.Graph(parents_provider)
920
844
 
921
 
    @needs_read_lock
922
 
    def get_known_graph_ancestry(self, revision_ids):
923
 
        """Return the known graph for a set of revision ids and their ancestors.
924
 
        """
925
 
        st = static_tuple.StaticTuple
926
 
        revision_keys = [st(r_id).intern() for r_id in revision_ids]
927
 
        known_graph = self.revisions.get_known_graph_ancestry(revision_keys)
928
 
        return graph.GraphThunkIdsToKeys(known_graph)
929
 
 
930
845
    def gather_stats(self, revid=None, committers=None):
931
846
        """See Repository.gather_stats()."""
932
847
        path = self.bzrdir._path_for_remote_call(self._client)
992
907
    def is_write_locked(self):
993
908
        return self._lock_mode == 'w'
994
909
 
995
 
    def _warn_if_deprecated(self, branch=None):
996
 
        # If we have a real repository, the check will be done there, if we
997
 
        # don't the check will be done remotely.
998
 
        pass
999
 
 
1000
910
    def lock_read(self):
1001
 
        """Lock the repository for read operations.
1002
 
 
1003
 
        :return: A bzrlib.lock.LogicalLockResult.
1004
 
        """
1005
911
        # wrong eventually - want a local lock cache context
1006
912
        if not self._lock_mode:
1007
 
            self._note_lock('r')
1008
913
            self._lock_mode = 'r'
1009
914
            self._lock_count = 1
1010
915
            self._unstacked_provider.enable_cache(cache_misses=True)
1014
919
                repo.lock_read()
1015
920
        else:
1016
921
            self._lock_count += 1
1017
 
        return lock.LogicalLockResult(self.unlock)
1018
922
 
1019
923
    def _remote_lock_write(self, token):
1020
924
        path = self.bzrdir._path_for_remote_call(self._client)
1031
935
 
1032
936
    def lock_write(self, token=None, _skip_rpc=False):
1033
937
        if not self._lock_mode:
1034
 
            self._note_lock('w')
1035
938
            if _skip_rpc:
1036
939
                if self._lock_token is not None:
1037
940
                    if token != self._lock_token:
1060
963
            raise errors.ReadOnlyError(self)
1061
964
        else:
1062
965
            self._lock_count += 1
1063
 
        return RepositoryWriteLockResult(self.unlock, self._lock_token or None)
 
966
        return self._lock_token or None
1064
967
 
1065
968
    def leave_lock_in_place(self):
1066
969
        if not self._lock_token:
1140
1043
        else:
1141
1044
            raise errors.UnexpectedSmartServerResponse(response)
1142
1045
 
1143
 
    @only_raises(errors.LockNotHeld, errors.LockBroken)
1144
1046
    def unlock(self):
1145
1047
        if not self._lock_count:
1146
1048
            return lock.cant_unlock_not_held(self)
1246
1148
            # state, so always add a lock here. If a caller passes us a locked
1247
1149
            # repository, they are responsible for unlocking it later.
1248
1150
            repository.lock_read()
1249
 
        self._check_fallback_repository(repository)
1250
1151
        self._fallback_repositories.append(repository)
1251
1152
        # If self._real_repository was parameterised already (e.g. because a
1252
1153
        # _real_branch had its get_stacked_on_url method called), then the
1253
1154
        # repository to be added may already be in the _real_repositories list.
1254
1155
        if self._real_repository is not None:
1255
 
            fallback_locations = [repo.user_url for repo in
 
1156
            fallback_locations = [repo.bzrdir.root_transport.base for repo in
1256
1157
                self._real_repository._fallback_repositories]
1257
 
            if repository.user_url not in fallback_locations:
 
1158
            if repository.bzrdir.root_transport.base not in fallback_locations:
1258
1159
                self._real_repository.add_fallback_repository(repository)
1259
1160
 
1260
 
    def _check_fallback_repository(self, repository):
1261
 
        """Check that this repository can fallback to repository safely.
1262
 
 
1263
 
        Raise an error if not.
1264
 
 
1265
 
        :param repository: A repository to fallback to.
1266
 
        """
1267
 
        return _mod_repository.InterRepository._assert_same_model(
1268
 
            self, repository)
1269
 
 
1270
1161
    def add_inventory(self, revid, inv, parents):
1271
1162
        self._ensure_real()
1272
1163
        return self._real_repository.add_inventory(revid, inv, parents)
1273
1164
 
1274
1165
    def add_inventory_by_delta(self, basis_revision_id, delta, new_revision_id,
1275
 
            parents, basis_inv=None, propagate_caches=False):
 
1166
                               parents):
1276
1167
        self._ensure_real()
1277
1168
        return self._real_repository.add_inventory_by_delta(basis_revision_id,
1278
 
            delta, new_revision_id, parents, basis_inv=basis_inv,
1279
 
            propagate_caches=propagate_caches)
 
1169
            delta, new_revision_id, parents)
1280
1170
 
1281
1171
    def add_revision(self, rev_id, rev, inv=None, config=None):
1282
1172
        self._ensure_real()
1288
1178
        self._ensure_real()
1289
1179
        return self._real_repository.get_inventory(revision_id)
1290
1180
 
1291
 
    def iter_inventories(self, revision_ids, ordering=None):
 
1181
    def iter_inventories(self, revision_ids):
1292
1182
        self._ensure_real()
1293
 
        return self._real_repository.iter_inventories(revision_ids, ordering)
 
1183
        return self._real_repository.iter_inventories(revision_ids)
1294
1184
 
1295
1185
    @needs_read_lock
1296
1186
    def get_revision(self, revision_id):
1541
1431
        return self._real_repository.get_signature_text(revision_id)
1542
1432
 
1543
1433
    @needs_read_lock
1544
 
    def _get_inventory_xml(self, revision_id):
1545
 
        self._ensure_real()
1546
 
        return self._real_repository._get_inventory_xml(revision_id)
 
1434
    def get_inventory_xml(self, revision_id):
 
1435
        self._ensure_real()
 
1436
        return self._real_repository.get_inventory_xml(revision_id)
 
1437
 
 
1438
    def deserialise_inventory(self, revision_id, xml):
 
1439
        self._ensure_real()
 
1440
        return self._real_repository.deserialise_inventory(revision_id, xml)
1547
1441
 
1548
1442
    def reconcile(self, other=None, thorough=False):
1549
1443
        self._ensure_real()
1576
1470
        return self._real_repository.get_revision_reconcile(revision_id)
1577
1471
 
1578
1472
    @needs_read_lock
1579
 
    def check(self, revision_ids=None, callback_refs=None, check_repo=True):
 
1473
    def check(self, revision_ids=None):
1580
1474
        self._ensure_real()
1581
 
        return self._real_repository.check(revision_ids=revision_ids,
1582
 
            callback_refs=callback_refs, check_repo=check_repo)
 
1475
        return self._real_repository.check(revision_ids=revision_ids)
1583
1476
 
1584
1477
    def copy_content_into(self, destination, revision_id=None):
1585
1478
        self._ensure_real()
1625
1518
        return self._real_repository.inventories
1626
1519
 
1627
1520
    @needs_write_lock
1628
 
    def pack(self, hint=None, clean_obsolete_packs=False):
 
1521
    def pack(self, hint=None):
1629
1522
        """Compress the data within the repository.
1630
1523
 
1631
1524
        This is not currently implemented within the smart server.
1632
1525
        """
1633
1526
        self._ensure_real()
1634
 
        return self._real_repository.pack(hint=hint, clean_obsolete_packs=clean_obsolete_packs)
 
1527
        return self._real_repository.pack(hint=hint)
1635
1528
 
1636
1529
    @property
1637
1530
    def revisions(self):
1725
1618
        self._ensure_real()
1726
1619
        return self._real_repository.revision_graph_can_have_wrong_parents()
1727
1620
 
1728
 
    def _find_inconsistent_revision_parents(self, revisions_iterator=None):
 
1621
    def _find_inconsistent_revision_parents(self):
1729
1622
        self._ensure_real()
1730
 
        return self._real_repository._find_inconsistent_revision_parents(
1731
 
            revisions_iterator)
 
1623
        return self._real_repository._find_inconsistent_revision_parents()
1732
1624
 
1733
1625
    def _check_for_inconsistent_revision_parents(self):
1734
1626
        self._ensure_real()
1788
1680
    def insert_stream(self, stream, src_format, resume_tokens):
1789
1681
        target = self.target_repo
1790
1682
        target._unstacked_provider.missing_keys.clear()
1791
 
        candidate_calls = [('Repository.insert_stream_1.19', (1, 19))]
1792
1683
        if target._lock_token:
1793
 
            candidate_calls.append(('Repository.insert_stream_locked', (1, 14)))
1794
 
            lock_args = (target._lock_token or '',)
 
1684
            verb = 'Repository.insert_stream_locked'
 
1685
            extra_args = (target._lock_token or '',)
 
1686
            required_version = (1, 14)
1795
1687
        else:
1796
 
            candidate_calls.append(('Repository.insert_stream', (1, 13)))
1797
 
            lock_args = ()
 
1688
            verb = 'Repository.insert_stream'
 
1689
            extra_args = ()
 
1690
            required_version = (1, 13)
1798
1691
        client = target._client
1799
1692
        medium = client._medium
 
1693
        if medium._is_remote_before(required_version):
 
1694
            # No possible way this can work.
 
1695
            return self._insert_real(stream, src_format, resume_tokens)
1800
1696
        path = target.bzrdir._path_for_remote_call(client)
1801
 
        # Probe for the verb to use with an empty stream before sending the
1802
 
        # real stream to it.  We do this both to avoid the risk of sending a
1803
 
        # large request that is then rejected, and because we don't want to
1804
 
        # implement a way to buffer, rewind, or restart the stream.
1805
 
        found_verb = False
1806
 
        for verb, required_version in candidate_calls:
1807
 
            if medium._is_remote_before(required_version):
1808
 
                continue
1809
 
            if resume_tokens:
1810
 
                # We've already done the probing (and set _is_remote_before) on
1811
 
                # a previous insert.
1812
 
                found_verb = True
1813
 
                break
 
1697
        if not resume_tokens:
 
1698
            # XXX: Ugly but important for correctness, *will* be fixed during
 
1699
            # 1.13 cycle. Pushing a stream that is interrupted results in a
 
1700
            # fallback to the _real_repositories sink *with a partial stream*.
 
1701
            # Thats bad because we insert less data than bzr expected. To avoid
 
1702
            # this we do a trial push to make sure the verb is accessible, and
 
1703
            # do not fallback when actually pushing the stream. A cleanup patch
 
1704
            # is going to look at rewinding/restarting the stream/partial
 
1705
            # buffering etc.
1814
1706
            byte_stream = smart_repo._stream_to_byte_stream([], src_format)
1815
1707
            try:
1816
1708
                response = client.call_with_body_stream(
1817
 
                    (verb, path, '') + lock_args, byte_stream)
 
1709
                    (verb, path, '') + extra_args, byte_stream)
1818
1710
            except errors.UnknownSmartMethod:
1819
1711
                medium._remember_remote_is_before(required_version)
1820
 
            else:
1821
 
                found_verb = True
1822
 
                break
1823
 
        if not found_verb:
1824
 
            # Have to use VFS.
1825
 
            return self._insert_real(stream, src_format, resume_tokens)
1826
 
        self._last_inv_record = None
1827
 
        self._last_substream = None
1828
 
        if required_version < (1, 19):
1829
 
            # Remote side doesn't support inventory deltas.  Wrap the stream to
1830
 
            # make sure we don't send any.  If the stream contains inventory
1831
 
            # deltas we'll interrupt the smart insert_stream request and
1832
 
            # fallback to VFS.
1833
 
            stream = self._stop_stream_if_inventory_delta(stream)
 
1712
                return self._insert_real(stream, src_format, resume_tokens)
1834
1713
        byte_stream = smart_repo._stream_to_byte_stream(
1835
1714
            stream, src_format)
1836
1715
        resume_tokens = ' '.join(resume_tokens)
1837
1716
        response = client.call_with_body_stream(
1838
 
            (verb, path, resume_tokens) + lock_args, byte_stream)
 
1717
            (verb, path, resume_tokens) + extra_args, byte_stream)
1839
1718
        if response[0][0] not in ('ok', 'missing-basis'):
1840
1719
            raise errors.UnexpectedSmartServerResponse(response)
1841
 
        if self._last_substream is not None:
1842
 
            # The stream included an inventory-delta record, but the remote
1843
 
            # side isn't new enough to support them.  So we need to send the
1844
 
            # rest of the stream via VFS.
1845
 
            self.target_repo.refresh_data()
1846
 
            return self._resume_stream_with_vfs(response, src_format)
1847
1720
        if response[0][0] == 'missing-basis':
1848
1721
            tokens, missing_keys = bencode.bdecode_as_tuple(response[0][1])
1849
1722
            resume_tokens = tokens
1852
1725
            self.target_repo.refresh_data()
1853
1726
            return [], set()
1854
1727
 
1855
 
    def _resume_stream_with_vfs(self, response, src_format):
1856
 
        """Resume sending a stream via VFS, first resending the record and
1857
 
        substream that couldn't be sent via an insert_stream verb.
1858
 
        """
1859
 
        if response[0][0] == 'missing-basis':
1860
 
            tokens, missing_keys = bencode.bdecode_as_tuple(response[0][1])
1861
 
            # Ignore missing_keys, we haven't finished inserting yet
1862
 
        else:
1863
 
            tokens = []
1864
 
        def resume_substream():
1865
 
            # Yield the substream that was interrupted.
1866
 
            for record in self._last_substream:
1867
 
                yield record
1868
 
            self._last_substream = None
1869
 
        def resume_stream():
1870
 
            # Finish sending the interrupted substream
1871
 
            yield ('inventory-deltas', resume_substream())
1872
 
            # Then simply continue sending the rest of the stream.
1873
 
            for substream_kind, substream in self._last_stream:
1874
 
                yield substream_kind, substream
1875
 
        return self._insert_real(resume_stream(), src_format, tokens)
1876
 
 
1877
 
    def _stop_stream_if_inventory_delta(self, stream):
1878
 
        """Normally this just lets the original stream pass-through unchanged.
1879
 
 
1880
 
        However if any 'inventory-deltas' substream occurs it will stop
1881
 
        streaming, and store the interrupted substream and stream in
1882
 
        self._last_substream and self._last_stream so that the stream can be
1883
 
        resumed by _resume_stream_with_vfs.
1884
 
        """
1885
 
                    
1886
 
        stream_iter = iter(stream)
1887
 
        for substream_kind, substream in stream_iter:
1888
 
            if substream_kind == 'inventory-deltas':
1889
 
                self._last_substream = substream
1890
 
                self._last_stream = stream_iter
1891
 
                return
1892
 
            else:
1893
 
                yield substream_kind, substream
1894
 
            
1895
1728
 
1896
1729
class RemoteStreamSource(repository.StreamSource):
1897
1730
    """Stream data from a remote server."""
1912
1745
            sources.append(repo)
1913
1746
        return self.missing_parents_chain(search, sources)
1914
1747
 
1915
 
    def get_stream_for_missing_keys(self, missing_keys):
1916
 
        self.from_repository._ensure_real()
1917
 
        real_repo = self.from_repository._real_repository
1918
 
        real_source = real_repo._get_source(self.to_format)
1919
 
        return real_source.get_stream_for_missing_keys(missing_keys)
1920
 
 
1921
1748
    def _real_stream(self, repo, search):
1922
1749
        """Get a stream for search from repo.
1923
1750
        
1929
1756
        """
1930
1757
        source = repo._get_source(self.to_format)
1931
1758
        if isinstance(source, RemoteStreamSource):
1932
 
            repo._ensure_real()
1933
 
            source = repo._real_repository._get_source(self.to_format)
 
1759
            return repository.StreamSource.get_stream(source, search)
1934
1760
        return source.get_stream(search)
1935
1761
 
1936
1762
    def _get_stream(self, repo, search):
1953
1779
            return self._real_stream(repo, search)
1954
1780
        client = repo._client
1955
1781
        medium = client._medium
 
1782
        if medium._is_remote_before((1, 13)):
 
1783
            # streaming was added in 1.13
 
1784
            return self._real_stream(repo, search)
1956
1785
        path = repo.bzrdir._path_for_remote_call(client)
1957
 
        search_bytes = repo._serialise_search_result(search)
1958
 
        args = (path, self.to_format.network_name())
1959
 
        candidate_verbs = [
1960
 
            ('Repository.get_stream_1.19', (1, 19)),
1961
 
            ('Repository.get_stream', (1, 13))]
1962
 
        found_verb = False
1963
 
        for verb, version in candidate_verbs:
1964
 
            if medium._is_remote_before(version):
1965
 
                continue
1966
 
            try:
1967
 
                response = repo._call_with_body_bytes_expecting_body(
1968
 
                    verb, args, search_bytes)
1969
 
            except errors.UnknownSmartMethod:
1970
 
                medium._remember_remote_is_before(version)
1971
 
            else:
1972
 
                response_tuple, response_handler = response
1973
 
                found_verb = True
1974
 
                break
1975
 
        if not found_verb:
 
1786
        try:
 
1787
            search_bytes = repo._serialise_search_result(search)
 
1788
            response = repo._call_with_body_bytes_expecting_body(
 
1789
                'Repository.get_stream',
 
1790
                (path, self.to_format.network_name()), search_bytes)
 
1791
            response_tuple, response_handler = response
 
1792
        except errors.UnknownSmartMethod:
 
1793
            medium._remember_remote_is_before((1,13))
1976
1794
            return self._real_stream(repo, search)
1977
1795
        if response_tuple[0] != 'ok':
1978
1796
            raise errors.UnexpectedSmartServerResponse(response_tuple)
1990
1808
        :param search: The overall search to satisfy with streams.
1991
1809
        :param sources: A list of Repository objects to query.
1992
1810
        """
1993
 
        self.from_serialiser = self.from_repository._format._serializer
 
1811
        self.serialiser = self.to_format._serializer
1994
1812
        self.seen_revs = set()
1995
1813
        self.referenced_revs = set()
1996
1814
        # If there are heads in the search, or the key count is > 0, we are not
2013
1831
    def missing_parents_rev_handler(self, substream):
2014
1832
        for content in substream:
2015
1833
            revision_bytes = content.get_bytes_as('fulltext')
2016
 
            revision = self.from_serialiser.read_revision_from_string(
2017
 
                revision_bytes)
 
1834
            revision = self.serialiser.read_revision_from_string(revision_bytes)
2018
1835
            self.seen_revs.add(content.key[-1])
2019
1836
            self.referenced_revs.update(revision.parent_ids)
2020
1837
            yield content
2059
1876
                self._network_name)
2060
1877
 
2061
1878
    def get_format_description(self):
2062
 
        self._ensure_real()
2063
 
        return 'Remote: ' + self._custom_format.get_format_description()
 
1879
        return 'Remote BZR Branch'
2064
1880
 
2065
1881
    def network_name(self):
2066
1882
        return self._network_name
2067
1883
 
2068
 
    def open(self, a_bzrdir, name=None, ignore_fallbacks=False):
2069
 
        return a_bzrdir.open_branch(name=name, 
2070
 
            ignore_fallbacks=ignore_fallbacks)
 
1884
    def open(self, a_bzrdir, ignore_fallbacks=False):
 
1885
        return a_bzrdir.open_branch(ignore_fallbacks=ignore_fallbacks)
2071
1886
 
2072
 
    def _vfs_initialize(self, a_bzrdir, name):
 
1887
    def _vfs_initialize(self, a_bzrdir):
2073
1888
        # Initialisation when using a local bzrdir object, or a non-vfs init
2074
1889
        # method is not available on the server.
2075
1890
        # self._custom_format is always set - the start of initialize ensures
2076
1891
        # that.
2077
1892
        if isinstance(a_bzrdir, RemoteBzrDir):
2078
1893
            a_bzrdir._ensure_real()
2079
 
            result = self._custom_format.initialize(a_bzrdir._real_bzrdir,
2080
 
                name)
 
1894
            result = self._custom_format.initialize(a_bzrdir._real_bzrdir)
2081
1895
        else:
2082
1896
            # We assume the bzrdir is parameterised; it may not be.
2083
 
            result = self._custom_format.initialize(a_bzrdir, name)
 
1897
            result = self._custom_format.initialize(a_bzrdir)
2084
1898
        if (isinstance(a_bzrdir, RemoteBzrDir) and
2085
1899
            not isinstance(result, RemoteBranch)):
2086
 
            result = RemoteBranch(a_bzrdir, a_bzrdir.find_repository(), result,
2087
 
                                  name=name)
 
1900
            result = RemoteBranch(a_bzrdir, a_bzrdir.find_repository(), result)
2088
1901
        return result
2089
1902
 
2090
 
    def initialize(self, a_bzrdir, name=None):
 
1903
    def initialize(self, a_bzrdir):
2091
1904
        # 1) get the network name to use.
2092
1905
        if self._custom_format:
2093
1906
            network_name = self._custom_format.network_name()
2099
1912
            network_name = reference_format.network_name()
2100
1913
        # Being asked to create on a non RemoteBzrDir:
2101
1914
        if not isinstance(a_bzrdir, RemoteBzrDir):
2102
 
            return self._vfs_initialize(a_bzrdir, name=name)
 
1915
            return self._vfs_initialize(a_bzrdir)
2103
1916
        medium = a_bzrdir._client._medium
2104
1917
        if medium._is_remote_before((1, 13)):
2105
 
            return self._vfs_initialize(a_bzrdir, name=name)
 
1918
            return self._vfs_initialize(a_bzrdir)
2106
1919
        # Creating on a remote bzr dir.
2107
1920
        # 2) try direct creation via RPC
2108
1921
        path = a_bzrdir._path_for_remote_call(a_bzrdir._client)
2109
 
        if name is not None:
2110
 
            # XXX JRV20100304: Support creating colocated branches
2111
 
            raise errors.NoColocatedBranchSupport(self)
2112
1922
        verb = 'BzrDir.create_branch'
2113
1923
        try:
2114
1924
            response = a_bzrdir._call(verb, path, network_name)
2115
1925
        except errors.UnknownSmartMethod:
2116
1926
            # Fallback - use vfs methods
2117
1927
            medium._remember_remote_is_before((1, 13))
2118
 
            return self._vfs_initialize(a_bzrdir, name=name)
 
1928
            return self._vfs_initialize(a_bzrdir)
2119
1929
        if response[0] != 'ok':
2120
1930
            raise errors.UnexpectedSmartServerResponse(response)
2121
1931
        # Turn the response into a RemoteRepository object.
2129
1939
                a_bzrdir._client)
2130
1940
        remote_repo = RemoteRepository(repo_bzrdir, repo_format)
2131
1941
        remote_branch = RemoteBranch(a_bzrdir, remote_repo,
2132
 
            format=format, setup_stacking=False, name=name)
 
1942
            format=format, setup_stacking=False)
2133
1943
        # XXX: We know this is a new branch, so it must have revno 0, revid
2134
1944
        # NULL_REVISION. Creating the branch locked would make this be unable
2135
1945
        # to be wrong; here its simply very unlikely to be wrong. RBC 20090225
2155
1965
        return self._custom_format.supports_set_append_revisions_only()
2156
1966
 
2157
1967
 
2158
 
class RemoteBranch(branch.Branch, _RpcHelper, lock._RelockDebugMixin):
 
1968
class RemoteBranch(branch.Branch, _RpcHelper):
2159
1969
    """Branch stored on a server accessed by HPSS RPC.
2160
1970
 
2161
1971
    At the moment most operations are mapped down to simple file operations.
2162
1972
    """
2163
1973
 
2164
1974
    def __init__(self, remote_bzrdir, remote_repository, real_branch=None,
2165
 
        _client=None, format=None, setup_stacking=True, name=None):
 
1975
        _client=None, format=None, setup_stacking=True):
2166
1976
        """Create a RemoteBranch instance.
2167
1977
 
2168
1978
        :param real_branch: An optional local implementation of the branch
2174
1984
        :param setup_stacking: If True make an RPC call to determine the
2175
1985
            stacked (or not) status of the branch. If False assume the branch
2176
1986
            is not stacked.
2177
 
        :param name: Colocated branch name
2178
1987
        """
2179
1988
        # We intentionally don't call the parent class's __init__, because it
2180
1989
        # will try to assign to self.tags, which is a property in this subclass.
2199
2008
            self._real_branch = None
2200
2009
        # Fill out expected attributes of branch for bzrlib API users.
2201
2010
        self._clear_cached_state()
2202
 
        # TODO: deprecate self.base in favor of user_url
2203
 
        self.base = self.bzrdir.user_url
2204
 
        self._name = name
 
2011
        self.base = self.bzrdir.root_transport.base
2205
2012
        self._control_files = None
2206
2013
        self._lock_mode = None
2207
2014
        self._lock_token = None
2218
2025
                    self._real_branch._format.network_name()
2219
2026
        else:
2220
2027
            self._format = format
2221
 
        # when we do _ensure_real we may need to pass ignore_fallbacks to the
2222
 
        # branch.open_branch method.
2223
 
        self._real_ignore_fallbacks = not setup_stacking
2224
2028
        if not self._format._network_name:
2225
2029
            # Did not get from open_branchV2 - old server.
2226
2030
            self._ensure_real()
2271
2075
                raise AssertionError('smart server vfs must be enabled '
2272
2076
                    'to use vfs implementation')
2273
2077
            self.bzrdir._ensure_real()
2274
 
            self._real_branch = self.bzrdir._real_bzrdir.open_branch(
2275
 
                ignore_fallbacks=self._real_ignore_fallbacks, name=self._name)
 
2078
            self._real_branch = self.bzrdir._real_bzrdir.open_branch()
2276
2079
            if self.repository._real_repository is None:
2277
2080
                # Give the remote repository the matching real repo.
2278
2081
                real_repo = self._real_branch.repository
2382
2185
        medium = self._client._medium
2383
2186
        if medium._is_remote_before((1, 18)):
2384
2187
            self._vfs_set_tags_bytes(bytes)
2385
 
            return
2386
2188
        try:
2387
2189
            args = (
2388
2190
                self._remote_path(), self._lock_token, self._repo_lock_token)
2393
2195
            self._vfs_set_tags_bytes(bytes)
2394
2196
 
2395
2197
    def lock_read(self):
2396
 
        """Lock the branch for read operations.
2397
 
 
2398
 
        :return: A bzrlib.lock.LogicalLockResult.
2399
 
        """
2400
2198
        self.repository.lock_read()
2401
2199
        if not self._lock_mode:
2402
 
            self._note_lock('r')
2403
2200
            self._lock_mode = 'r'
2404
2201
            self._lock_count = 1
2405
2202
            if self._real_branch is not None:
2406
2203
                self._real_branch.lock_read()
2407
2204
        else:
2408
2205
            self._lock_count += 1
2409
 
        return lock.LogicalLockResult(self.unlock)
2410
2206
 
2411
2207
    def _remote_lock_write(self, token):
2412
2208
        if token is None:
2413
2209
            branch_token = repo_token = ''
2414
2210
        else:
2415
2211
            branch_token = token
2416
 
            repo_token = self.repository.lock_write().repository_token
 
2212
            repo_token = self.repository.lock_write()
2417
2213
            self.repository.unlock()
2418
2214
        err_context = {'token': token}
2419
2215
        response = self._call(
2426
2222
 
2427
2223
    def lock_write(self, token=None):
2428
2224
        if not self._lock_mode:
2429
 
            self._note_lock('w')
2430
2225
            # Lock the branch and repo in one remote call.
2431
2226
            remote_tokens = self._remote_lock_write(token)
2432
2227
            self._lock_token, self._repo_lock_token = remote_tokens
2456
2251
            self._lock_count += 1
2457
2252
            # Re-lock the repository too.
2458
2253
            self.repository.lock_write(self._repo_lock_token)
2459
 
        return BranchWriteLockResult(self.unlock, self._lock_token or None)
 
2254
        return self._lock_token or None
2460
2255
 
2461
2256
    def _unlock(self, branch_token, repo_token):
2462
2257
        err_context = {'token': str((branch_token, repo_token))}
2467
2262
            return
2468
2263
        raise errors.UnexpectedSmartServerResponse(response)
2469
2264
 
2470
 
    @only_raises(errors.LockNotHeld, errors.LockBroken)
2471
2265
    def unlock(self):
2472
2266
        try:
2473
2267
            self._lock_count -= 1
2513
2307
            raise NotImplementedError(self.dont_leave_lock_in_place)
2514
2308
        self._leave_lock = False
2515
2309
 
2516
 
    @needs_read_lock
2517
2310
    def get_rev_id(self, revno, history=None):
2518
2311
        if revno == 0:
2519
2312
            return _mod_revision.NULL_REVISION
2884
2677
                    'Missing key %r in context %r', key_err.args[0], context)
2885
2678
                raise err
2886
2679
 
2887
 
    if err.error_verb == 'IncompatibleRepositories':
2888
 
        raise errors.IncompatibleRepositories(err.error_args[0],
2889
 
            err.error_args[1], err.error_args[2])
2890
 
    elif err.error_verb == 'NoSuchRevision':
 
2680
    if err.error_verb == 'NoSuchRevision':
2891
2681
        raise NoSuchRevision(find('branch'), err.error_args[0])
2892
2682
    elif err.error_verb == 'nosuchrevision':
2893
2683
        raise NoSuchRevision(find('repository'), err.error_args[0])
2894
 
    elif err.error_verb == 'nobranch':
2895
 
        if len(err.error_args) >= 1:
2896
 
            extra = err.error_args[0]
2897
 
        else:
2898
 
            extra = None
2899
 
        raise errors.NotBranchError(path=find('bzrdir').root_transport.base,
2900
 
            detail=extra)
 
2684
    elif err.error_tuple == ('nobranch',):
 
2685
        raise errors.NotBranchError(path=find('bzrdir').root_transport.base)
2901
2686
    elif err.error_verb == 'norepository':
2902
2687
        raise errors.NoRepositoryPresent(find('bzrdir'))
2903
2688
    elif err.error_verb == 'LockContention':