/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-07-20 08:56:45 UTC
  • mfrom: (4526.9.23 apply-inventory-delta)
  • Revision ID: pqm@pqm.ubuntu.com-20090720085645-54mtgybxua0yx6hw
(robertc) Add checks for inventory deltas which try to ensure that
        deltas that are not an exact fit are not applied. (Robert
        Collins, bug 397705, bug 367633)

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 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 (
24
27
    debug,
25
28
    errors,
26
29
    graph,
27
 
    lock,
28
30
    lockdir,
29
31
    repository,
30
 
    repository as _mod_repository,
31
32
    revision,
32
33
    revision as _mod_revision,
33
 
    static_tuple,
34
34
    symbol_versioning,
35
35
)
36
36
from bzrlib.branch import BranchReferenceFormat
37
37
from bzrlib.bzrdir import BzrDir, RemoteBzrDirFormat
38
 
from bzrlib.decorators import needs_read_lock, needs_write_lock, only_raises
 
38
from bzrlib.decorators import needs_read_lock, needs_write_lock
39
39
from bzrlib.errors import (
40
40
    NoSuchRevision,
41
41
    SmartProtocolError,
61
61
        except errors.ErrorFromSmartServer, err:
62
62
            self._translate_error(err, **err_context)
63
63
 
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
64
    def _call_with_body_bytes_expecting_body(self, method, args, body_bytes,
71
65
                                             **err_context):
72
66
        try:
91
85
class RemoteBzrDir(BzrDir, _RpcHelper):
92
86
    """Control directory on a remote server, accessed via bzr:// or similar."""
93
87
 
94
 
    def __init__(self, transport, format, _client=None, _force_probe=False):
 
88
    def __init__(self, transport, format, _client=None):
95
89
        """Construct a RemoteBzrDir.
96
90
 
97
91
        :param _client: Private parameter for testing. Disables probing and the
101
95
        # this object holds a delegated bzrdir that uses file-level operations
102
96
        # to talk to the other side
103
97
        self._real_bzrdir = None
104
 
        self._has_working_tree = None
105
98
        # 1-shot cache for the call pattern 'create_branch; open_branch' - see
106
99
        # create_branch for details.
107
100
        self._next_open_branch_result = None
111
104
            self._client = client._SmartClient(medium)
112
105
        else:
113
106
            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
 
107
            return
 
108
 
124
109
        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
110
        response = self._call('BzrDir.open', path)
151
111
        if response not in [('yes',), ('no',)]:
152
112
            raise errors.UnexpectedSmartServerResponse(response)
153
113
        if response == ('no',):
154
 
            raise errors.NotBranchError(path=self.root_transport.base)
 
114
            raise errors.NotBranchError(path=transport.base)
155
115
 
156
116
    def _ensure_real(self):
157
117
        """Ensure that there is a _real_bzrdir set.
159
119
        Used before calls to self._real_bzrdir.
160
120
        """
161
121
        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
122
            self._real_bzrdir = BzrDir.open_from_transport(
167
123
                self.root_transport, _server_formats=False)
168
124
            self._format._network_name = \
244
200
        self._ensure_real()
245
201
        self._real_bzrdir.destroy_repository()
246
202
 
247
 
    def create_branch(self, name=None):
 
203
    def create_branch(self):
248
204
        # as per meta1 formats - just delegate to the format object which may
249
205
        # be parameterised.
250
 
        real_branch = self._format.get_branch_format().initialize(self,
251
 
            name=name)
 
206
        real_branch = self._format.get_branch_format().initialize(self)
252
207
        if not isinstance(real_branch, RemoteBranch):
253
 
            result = RemoteBranch(self, self.find_repository(), real_branch,
254
 
                                  name=name)
 
208
            result = RemoteBranch(self, self.find_repository(), real_branch)
255
209
        else:
256
210
            result = real_branch
257
211
        # BzrDir.clone_on_transport() uses the result of create_branch but does
263
217
        self._next_open_branch_result = result
264
218
        return result
265
219
 
266
 
    def destroy_branch(self, name=None):
 
220
    def destroy_branch(self):
267
221
        """See BzrDir.destroy_branch"""
268
222
        self._ensure_real()
269
 
        self._real_bzrdir.destroy_branch(name=name)
 
223
        self._real_bzrdir.destroy_branch()
270
224
        self._next_open_branch_result = None
271
225
 
272
226
    def create_workingtree(self, revision_id=None, from_branch=None):
291
245
    def _get_branch_reference(self):
292
246
        path = self._path_for_remote_call(self._client)
293
247
        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
 
248
        if not medium._is_remote_before((1, 13)):
302
249
            try:
303
 
                response = self._call(verb, path)
 
250
                response = self._call('BzrDir.open_branchV2', path)
 
251
                if response[0] not in ('ref', 'branch'):
 
252
                    raise errors.UnexpectedSmartServerResponse(response)
 
253
                return response
304
254
            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'):
 
255
                medium._remember_remote_is_before((1, 13))
 
256
        response = self._call('BzrDir.open_branch', path)
 
257
        if response[0] != 'ok':
318
258
            raise errors.UnexpectedSmartServerResponse(response)
319
 
        return response
 
259
        if response[1] != '':
 
260
            return ('ref', response[1])
 
261
        else:
 
262
            return ('branch', '')
320
263
 
321
264
    def _get_tree_branch(self):
322
265
        """See BzrDir._get_tree_branch()."""
323
266
        return None, self.open_branch()
324
267
 
325
 
    def open_branch(self, name=None, unsupported=False,
326
 
                    ignore_fallbacks=False):
327
 
        if unsupported:
 
268
    def open_branch(self, _unsupported=False, ignore_fallbacks=False):
 
269
        if _unsupported:
328
270
            raise NotImplementedError('unsupported flag support not implemented yet.')
329
271
        if self._next_open_branch_result is not None:
330
272
            # See create_branch for details.
335
277
        if response[0] == 'ref':
336
278
            # a branch reference, use the existing BranchReference logic.
337
279
            format = BranchReferenceFormat()
338
 
            return format.open(self, name=name, _found=True,
339
 
                location=response[1], ignore_fallbacks=ignore_fallbacks)
 
280
            return format.open(self, _found=True, location=response[1],
 
281
                ignore_fallbacks=ignore_fallbacks)
340
282
        branch_format_name = response[1]
341
283
        if not branch_format_name:
342
284
            branch_format_name = None
343
285
        format = RemoteBranchFormat(network_name=branch_format_name)
344
286
        return RemoteBranch(self, self.find_repository(), format=format,
345
 
            setup_stacking=not ignore_fallbacks, name=name)
 
287
            setup_stacking=not ignore_fallbacks)
346
288
 
347
289
    def _open_repo_v1(self, path):
348
290
        verb = 'BzrDir.find_repository'
409
351
        else:
410
352
            raise errors.NoRepositoryPresent(self)
411
353
 
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
354
    def open_workingtree(self, recommend_upgrade=True):
419
 
        if self.has_workingtree():
 
355
        self._ensure_real()
 
356
        if self._real_bzrdir.has_workingtree():
420
357
            raise errors.NotLocalUrl(self.root_transport)
421
358
        else:
422
359
            raise errors.NoWorkingTree(self.root_transport.base)
425
362
        """Return the path to be used for this bzrdir in a remote call."""
426
363
        return client.remote_path_from_transport(self.root_transport)
427
364
 
428
 
    def get_branch_transport(self, branch_format, name=None):
 
365
    def get_branch_transport(self, branch_format):
429
366
        self._ensure_real()
430
 
        return self._real_bzrdir.get_branch_transport(branch_format, name=name)
 
367
        return self._real_bzrdir.get_branch_transport(branch_format)
431
368
 
432
369
    def get_repository_transport(self, repository_format):
433
370
        self._ensure_real()
485
422
        self._custom_format = None
486
423
        self._network_name = None
487
424
        self._creating_bzrdir = None
488
 
        self._supports_chks = None
489
425
        self._supports_external_lookups = None
490
426
        self._supports_tree_reference = None
491
427
        self._rich_root_data = None
492
428
 
493
 
    def __repr__(self):
494
 
        return "%s(_network_name=%r)" % (self.__class__.__name__,
495
 
            self._network_name)
496
 
 
497
429
    @property
498
430
    def fast_deltas(self):
499
431
        self._ensure_real()
507
439
        return self._rich_root_data
508
440
 
509
441
    @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
442
    def supports_external_lookups(self):
518
443
        if self._supports_external_lookups is None:
519
444
            self._ensure_real()
620
545
        return self._custom_format._fetch_reconcile
621
546
 
622
547
    def get_format_description(self):
623
 
        self._ensure_real()
624
 
        return 'Remote: ' + self._custom_format.get_format_description()
 
548
        return 'bzr remote repository'
625
549
 
626
550
    def __eq__(self, other):
627
551
        return self.__class__ is other.__class__
628
552
 
 
553
    def check_conversion_target(self, target_format):
 
554
        if self.rich_root_data and not target_format.rich_root_data:
 
555
            raise errors.BadConversionTarget(
 
556
                'Does not support rich root data.', target_format)
 
557
        if (self.supports_tree_reference and
 
558
            not getattr(target_format, 'supports_tree_reference', False)):
 
559
            raise errors.BadConversionTarget(
 
560
                'Does not support nested trees', target_format)
 
561
 
629
562
    def network_name(self):
630
563
        if self._network_name:
631
564
            return self._network_name
643
576
        return self._custom_format._serializer
644
577
 
645
578
 
646
 
class RemoteRepository(_RpcHelper, lock._RelockDebugMixin,
647
 
    bzrdir.ControlComponent):
 
579
class RemoteRepository(_RpcHelper):
648
580
    """Repository accessed over rpc.
649
581
 
650
582
    For the moment most operations are performed using local transport-backed
693
625
        # Additional places to query for data.
694
626
        self._fallback_repositories = []
695
627
 
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
628
    def __str__(self):
708
629
        return "%s(%s)" % (self.__class__.__name__, self.base)
709
630
 
892
813
            result.add(_mod_revision.NULL_REVISION)
893
814
        return result
894
815
 
895
 
    def _has_same_fallbacks(self, other_repo):
896
 
        """Returns true if the repositories have the same fallbacks."""
897
 
        # XXX: copied from Repository; it should be unified into a base class
898
 
        # <https://bugs.edge.launchpad.net/bzr/+bug/401622>
899
 
        my_fb = self._fallback_repositories
900
 
        other_fb = other_repo._fallback_repositories
901
 
        if len(my_fb) != len(other_fb):
902
 
            return False
903
 
        for f, g in zip(my_fb, other_fb):
904
 
            if not f.has_same_location(g):
905
 
                return False
906
 
        return True
907
 
 
908
816
    def has_same_location(self, other):
909
 
        # TODO: Move to RepositoryBase and unify with the regular Repository
910
 
        # one; unfortunately the tests rely on slightly different behaviour at
911
 
        # present -- mbp 20090710
912
817
        return (self.__class__ is other.__class__ and
913
818
                self.bzrdir.transport.base == other.bzrdir.transport.base)
914
819
 
917
822
        parents_provider = self._make_parents_provider(other_repository)
918
823
        return graph.Graph(parents_provider)
919
824
 
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
825
    def gather_stats(self, revid=None, committers=None):
930
826
        """See Repository.gather_stats()."""
931
827
        path = self.bzrdir._path_for_remote_call(self._client)
991
887
    def is_write_locked(self):
992
888
        return self._lock_mode == 'w'
993
889
 
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
890
    def lock_read(self):
1000
891
        # wrong eventually - want a local lock cache context
1001
892
        if not self._lock_mode:
1002
 
            self._note_lock('r')
1003
893
            self._lock_mode = 'r'
1004
894
            self._lock_count = 1
1005
895
            self._unstacked_provider.enable_cache(cache_misses=True)
1025
915
 
1026
916
    def lock_write(self, token=None, _skip_rpc=False):
1027
917
        if not self._lock_mode:
1028
 
            self._note_lock('w')
1029
918
            if _skip_rpc:
1030
919
                if self._lock_token is not None:
1031
920
                    if token != self._lock_token:
1134
1023
        else:
1135
1024
            raise errors.UnexpectedSmartServerResponse(response)
1136
1025
 
1137
 
    @only_raises(errors.LockNotHeld, errors.LockBroken)
1138
1026
    def unlock(self):
1139
1027
        if not self._lock_count:
1140
 
            return lock.cant_unlock_not_held(self)
 
1028
            raise errors.LockNotHeld(self)
1141
1029
        self._lock_count -= 1
1142
1030
        if self._lock_count > 0:
1143
1031
            return
1240
1128
            # state, so always add a lock here. If a caller passes us a locked
1241
1129
            # repository, they are responsible for unlocking it later.
1242
1130
            repository.lock_read()
1243
 
        self._check_fallback_repository(repository)
1244
1131
        self._fallback_repositories.append(repository)
1245
1132
        # If self._real_repository was parameterised already (e.g. because a
1246
1133
        # _real_branch had its get_stacked_on_url method called), then the
1247
1134
        # repository to be added may already be in the _real_repositories list.
1248
1135
        if self._real_repository is not None:
1249
 
            fallback_locations = [repo.user_url for repo in
 
1136
            fallback_locations = [repo.bzrdir.root_transport.base for repo in
1250
1137
                self._real_repository._fallback_repositories]
1251
 
            if repository.user_url not in fallback_locations:
 
1138
            if repository.bzrdir.root_transport.base not in fallback_locations:
1252
1139
                self._real_repository.add_fallback_repository(repository)
1253
1140
 
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
1141
    def add_inventory(self, revid, inv, parents):
1265
1142
        self._ensure_real()
1266
1143
        return self._real_repository.add_inventory(revid, inv, parents)
1267
1144
 
1268
1145
    def add_inventory_by_delta(self, basis_revision_id, delta, new_revision_id,
1269
 
            parents, basis_inv=None, propagate_caches=False):
 
1146
                               parents):
1270
1147
        self._ensure_real()
1271
1148
        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)
 
1149
            delta, new_revision_id, parents)
1274
1150
 
1275
1151
    def add_revision(self, rev_id, rev, inv=None, config=None):
1276
1152
        self._ensure_real()
1282
1158
        self._ensure_real()
1283
1159
        return self._real_repository.get_inventory(revision_id)
1284
1160
 
1285
 
    def iter_inventories(self, revision_ids, ordering=None):
 
1161
    def iter_inventories(self, revision_ids):
1286
1162
        self._ensure_real()
1287
 
        return self._real_repository.iter_inventories(revision_ids, ordering)
 
1163
        return self._real_repository.iter_inventories(revision_ids)
1288
1164
 
1289
1165
    @needs_read_lock
1290
1166
    def get_revision(self, revision_id):
1354
1230
            raise errors.InternalBzrError(
1355
1231
                "May not fetch while in a write group.")
1356
1232
        # fast path same-url fetch operations
1357
 
        if (self.has_same_location(source)
1358
 
            and fetch_spec is None
1359
 
            and self._has_same_fallbacks(source)):
 
1233
        if self.has_same_location(source) and fetch_spec is None:
1360
1234
            # check that last_revision is in 'from' and then return a
1361
1235
            # no-operation.
1362
1236
            if (revision_id is not None and
1535
1409
        return self._real_repository.get_signature_text(revision_id)
1536
1410
 
1537
1411
    @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)
 
1412
    def get_inventory_xml(self, revision_id):
 
1413
        self._ensure_real()
 
1414
        return self._real_repository.get_inventory_xml(revision_id)
 
1415
 
 
1416
    def deserialise_inventory(self, revision_id, xml):
 
1417
        self._ensure_real()
 
1418
        return self._real_repository.deserialise_inventory(revision_id, xml)
1541
1419
 
1542
1420
    def reconcile(self, other=None, thorough=False):
1543
1421
        self._ensure_real()
1570
1448
        return self._real_repository.get_revision_reconcile(revision_id)
1571
1449
 
1572
1450
    @needs_read_lock
1573
 
    def check(self, revision_ids=None, callback_refs=None, check_repo=True):
 
1451
    def check(self, revision_ids=None):
1574
1452
        self._ensure_real()
1575
 
        return self._real_repository.check(revision_ids=revision_ids,
1576
 
            callback_refs=callback_refs, check_repo=check_repo)
 
1453
        return self._real_repository.check(revision_ids=revision_ids)
1577
1454
 
1578
1455
    def copy_content_into(self, destination, revision_id=None):
1579
1456
        self._ensure_real()
1619
1496
        return self._real_repository.inventories
1620
1497
 
1621
1498
    @needs_write_lock
1622
 
    def pack(self, hint=None, clean_obsolete_packs=False):
 
1499
    def pack(self, hint=None):
1623
1500
        """Compress the data within the repository.
1624
1501
 
1625
1502
        This is not currently implemented within the smart server.
1626
1503
        """
1627
1504
        self._ensure_real()
1628
 
        return self._real_repository.pack(hint=hint, clean_obsolete_packs=clean_obsolete_packs)
 
1505
        return self._real_repository.pack(hint=hint)
1629
1506
 
1630
1507
    @property
1631
1508
    def revisions(self):
1719
1596
        self._ensure_real()
1720
1597
        return self._real_repository.revision_graph_can_have_wrong_parents()
1721
1598
 
1722
 
    def _find_inconsistent_revision_parents(self, revisions_iterator=None):
 
1599
    def _find_inconsistent_revision_parents(self):
1723
1600
        self._ensure_real()
1724
 
        return self._real_repository._find_inconsistent_revision_parents(
1725
 
            revisions_iterator)
 
1601
        return self._real_repository._find_inconsistent_revision_parents()
1726
1602
 
1727
1603
    def _check_for_inconsistent_revision_parents(self):
1728
1604
        self._ensure_real()
1782
1658
    def insert_stream(self, stream, src_format, resume_tokens):
1783
1659
        target = self.target_repo
1784
1660
        target._unstacked_provider.missing_keys.clear()
1785
 
        candidate_calls = [('Repository.insert_stream_1.19', (1, 19))]
1786
1661
        if target._lock_token:
1787
 
            candidate_calls.append(('Repository.insert_stream_locked', (1, 14)))
1788
 
            lock_args = (target._lock_token or '',)
 
1662
            verb = 'Repository.insert_stream_locked'
 
1663
            extra_args = (target._lock_token or '',)
 
1664
            required_version = (1, 14)
1789
1665
        else:
1790
 
            candidate_calls.append(('Repository.insert_stream', (1, 13)))
1791
 
            lock_args = ()
 
1666
            verb = 'Repository.insert_stream'
 
1667
            extra_args = ()
 
1668
            required_version = (1, 13)
1792
1669
        client = target._client
1793
1670
        medium = client._medium
 
1671
        if medium._is_remote_before(required_version):
 
1672
            # No possible way this can work.
 
1673
            return self._insert_real(stream, src_format, resume_tokens)
1794
1674
        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
 
1675
        if not resume_tokens:
 
1676
            # XXX: Ugly but important for correctness, *will* be fixed during
 
1677
            # 1.13 cycle. Pushing a stream that is interrupted results in a
 
1678
            # fallback to the _real_repositories sink *with a partial stream*.
 
1679
            # Thats bad because we insert less data than bzr expected. To avoid
 
1680
            # this we do a trial push to make sure the verb is accessible, and
 
1681
            # do not fallback when actually pushing the stream. A cleanup patch
 
1682
            # is going to look at rewinding/restarting the stream/partial
 
1683
            # buffering etc.
1808
1684
            byte_stream = smart_repo._stream_to_byte_stream([], src_format)
1809
1685
            try:
1810
1686
                response = client.call_with_body_stream(
1811
 
                    (verb, path, '') + lock_args, byte_stream)
 
1687
                    (verb, path, '') + extra_args, byte_stream)
1812
1688
            except errors.UnknownSmartMethod:
1813
1689
                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)
 
1690
                return self._insert_real(stream, src_format, resume_tokens)
1828
1691
        byte_stream = smart_repo._stream_to_byte_stream(
1829
1692
            stream, src_format)
1830
1693
        resume_tokens = ' '.join(resume_tokens)
1831
1694
        response = client.call_with_body_stream(
1832
 
            (verb, path, resume_tokens) + lock_args, byte_stream)
 
1695
            (verb, path, resume_tokens) + extra_args, byte_stream)
1833
1696
        if response[0][0] not in ('ok', 'missing-basis'):
1834
1697
            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
1698
        if response[0][0] == 'missing-basis':
1842
1699
            tokens, missing_keys = bencode.bdecode_as_tuple(response[0][1])
1843
1700
            resume_tokens = tokens
1846
1703
            self.target_repo.refresh_data()
1847
1704
            return [], set()
1848
1705
 
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
1706
 
1890
1707
class RemoteStreamSource(repository.StreamSource):
1891
1708
    """Stream data from a remote server."""
1894
1711
        if (self.from_repository._fallback_repositories and
1895
1712
            self.to_format._fetch_order == 'topological'):
1896
1713
            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)
 
1714
        return self.missing_parents_chain(search, [self.from_repository] +
 
1715
            self.from_repository._fallback_repositories)
1914
1716
 
1915
1717
    def _real_stream(self, repo, search):
1916
1718
        """Get a stream for search from repo.
1923
1725
        """
1924
1726
        source = repo._get_source(self.to_format)
1925
1727
        if isinstance(source, RemoteStreamSource):
1926
 
            repo._ensure_real()
1927
 
            source = repo._real_repository._get_source(self.to_format)
 
1728
            return repository.StreamSource.get_stream(source, search)
1928
1729
        return source.get_stream(search)
1929
1730
 
1930
1731
    def _get_stream(self, repo, search):
1947
1748
            return self._real_stream(repo, search)
1948
1749
        client = repo._client
1949
1750
        medium = client._medium
 
1751
        if medium._is_remote_before((1, 13)):
 
1752
            # streaming was added in 1.13
 
1753
            return self._real_stream(repo, search)
1950
1754
        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:
 
1755
        try:
 
1756
            search_bytes = repo._serialise_search_result(search)
 
1757
            response = repo._call_with_body_bytes_expecting_body(
 
1758
                'Repository.get_stream',
 
1759
                (path, self.to_format.network_name()), search_bytes)
 
1760
            response_tuple, response_handler = response
 
1761
        except errors.UnknownSmartMethod:
 
1762
            medium._remember_remote_is_before((1,13))
1970
1763
            return self._real_stream(repo, search)
1971
1764
        if response_tuple[0] != 'ok':
1972
1765
            raise errors.UnexpectedSmartServerResponse(response_tuple)
1984
1777
        :param search: The overall search to satisfy with streams.
1985
1778
        :param sources: A list of Repository objects to query.
1986
1779
        """
1987
 
        self.from_serialiser = self.from_repository._format._serializer
 
1780
        self.serialiser = self.to_format._serializer
1988
1781
        self.seen_revs = set()
1989
1782
        self.referenced_revs = set()
1990
1783
        # If there are heads in the search, or the key count is > 0, we are not
2007
1800
    def missing_parents_rev_handler(self, substream):
2008
1801
        for content in substream:
2009
1802
            revision_bytes = content.get_bytes_as('fulltext')
2010
 
            revision = self.from_serialiser.read_revision_from_string(
2011
 
                revision_bytes)
 
1803
            revision = self.serialiser.read_revision_from_string(revision_bytes)
2012
1804
            self.seen_revs.add(content.key[-1])
2013
1805
            self.referenced_revs.update(revision.parent_ids)
2014
1806
            yield content
2053
1845
                self._network_name)
2054
1846
 
2055
1847
    def get_format_description(self):
2056
 
        self._ensure_real()
2057
 
        return 'Remote: ' + self._custom_format.get_format_description()
 
1848
        return 'Remote BZR Branch'
2058
1849
 
2059
1850
    def network_name(self):
2060
1851
        return self._network_name
2061
1852
 
2062
 
    def open(self, a_bzrdir, name=None, ignore_fallbacks=False):
2063
 
        return a_bzrdir.open_branch(name=name, 
2064
 
            ignore_fallbacks=ignore_fallbacks)
 
1853
    def open(self, a_bzrdir, ignore_fallbacks=False):
 
1854
        return a_bzrdir.open_branch(ignore_fallbacks=ignore_fallbacks)
2065
1855
 
2066
 
    def _vfs_initialize(self, a_bzrdir, name):
 
1856
    def _vfs_initialize(self, a_bzrdir):
2067
1857
        # Initialisation when using a local bzrdir object, or a non-vfs init
2068
1858
        # method is not available on the server.
2069
1859
        # self._custom_format is always set - the start of initialize ensures
2070
1860
        # that.
2071
1861
        if isinstance(a_bzrdir, RemoteBzrDir):
2072
1862
            a_bzrdir._ensure_real()
2073
 
            result = self._custom_format.initialize(a_bzrdir._real_bzrdir,
2074
 
                name)
 
1863
            result = self._custom_format.initialize(a_bzrdir._real_bzrdir)
2075
1864
        else:
2076
1865
            # We assume the bzrdir is parameterised; it may not be.
2077
 
            result = self._custom_format.initialize(a_bzrdir, name)
 
1866
            result = self._custom_format.initialize(a_bzrdir)
2078
1867
        if (isinstance(a_bzrdir, RemoteBzrDir) and
2079
1868
            not isinstance(result, RemoteBranch)):
2080
 
            result = RemoteBranch(a_bzrdir, a_bzrdir.find_repository(), result,
2081
 
                                  name=name)
 
1869
            result = RemoteBranch(a_bzrdir, a_bzrdir.find_repository(), result)
2082
1870
        return result
2083
1871
 
2084
 
    def initialize(self, a_bzrdir, name=None):
 
1872
    def initialize(self, a_bzrdir):
2085
1873
        # 1) get the network name to use.
2086
1874
        if self._custom_format:
2087
1875
            network_name = self._custom_format.network_name()
2093
1881
            network_name = reference_format.network_name()
2094
1882
        # Being asked to create on a non RemoteBzrDir:
2095
1883
        if not isinstance(a_bzrdir, RemoteBzrDir):
2096
 
            return self._vfs_initialize(a_bzrdir, name=name)
 
1884
            return self._vfs_initialize(a_bzrdir)
2097
1885
        medium = a_bzrdir._client._medium
2098
1886
        if medium._is_remote_before((1, 13)):
2099
 
            return self._vfs_initialize(a_bzrdir, name=name)
 
1887
            return self._vfs_initialize(a_bzrdir)
2100
1888
        # Creating on a remote bzr dir.
2101
1889
        # 2) try direct creation via RPC
2102
1890
        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
1891
        verb = 'BzrDir.create_branch'
2107
1892
        try:
2108
1893
            response = a_bzrdir._call(verb, path, network_name)
2109
1894
        except errors.UnknownSmartMethod:
2110
1895
            # Fallback - use vfs methods
2111
1896
            medium._remember_remote_is_before((1, 13))
2112
 
            return self._vfs_initialize(a_bzrdir, name=name)
 
1897
            return self._vfs_initialize(a_bzrdir)
2113
1898
        if response[0] != 'ok':
2114
1899
            raise errors.UnexpectedSmartServerResponse(response)
2115
1900
        # Turn the response into a RemoteRepository object.
2123
1908
                a_bzrdir._client)
2124
1909
        remote_repo = RemoteRepository(repo_bzrdir, repo_format)
2125
1910
        remote_branch = RemoteBranch(a_bzrdir, remote_repo,
2126
 
            format=format, setup_stacking=False, name=name)
 
1911
            format=format, setup_stacking=False)
2127
1912
        # XXX: We know this is a new branch, so it must have revno 0, revid
2128
1913
        # NULL_REVISION. Creating the branch locked would make this be unable
2129
1914
        # to be wrong; here its simply very unlikely to be wrong. RBC 20090225
2149
1934
        return self._custom_format.supports_set_append_revisions_only()
2150
1935
 
2151
1936
 
2152
 
class RemoteBranch(branch.Branch, _RpcHelper, lock._RelockDebugMixin):
 
1937
class RemoteBranch(branch.Branch, _RpcHelper):
2153
1938
    """Branch stored on a server accessed by HPSS RPC.
2154
1939
 
2155
1940
    At the moment most operations are mapped down to simple file operations.
2156
1941
    """
2157
1942
 
2158
1943
    def __init__(self, remote_bzrdir, remote_repository, real_branch=None,
2159
 
        _client=None, format=None, setup_stacking=True, name=None):
 
1944
        _client=None, format=None, setup_stacking=True):
2160
1945
        """Create a RemoteBranch instance.
2161
1946
 
2162
1947
        :param real_branch: An optional local implementation of the branch
2168
1953
        :param setup_stacking: If True make an RPC call to determine the
2169
1954
            stacked (or not) status of the branch. If False assume the branch
2170
1955
            is not stacked.
2171
 
        :param name: Colocated branch name
2172
1956
        """
2173
1957
        # We intentionally don't call the parent class's __init__, because it
2174
1958
        # will try to assign to self.tags, which is a property in this subclass.
2193
1977
            self._real_branch = None
2194
1978
        # Fill out expected attributes of branch for bzrlib API users.
2195
1979
        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
 
1980
        self.base = self.bzrdir.root_transport.base
2199
1981
        self._control_files = None
2200
1982
        self._lock_mode = None
2201
1983
        self._lock_token = None
2212
1994
                    self._real_branch._format.network_name()
2213
1995
        else:
2214
1996
            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
1997
        if not self._format._network_name:
2219
1998
            # Did not get from open_branchV2 - old server.
2220
1999
            self._ensure_real()
2265
2044
                raise AssertionError('smart server vfs must be enabled '
2266
2045
                    'to use vfs implementation')
2267
2046
            self.bzrdir._ensure_real()
2268
 
            self._real_branch = self.bzrdir._real_bzrdir.open_branch(
2269
 
                ignore_fallbacks=self._real_ignore_fallbacks, name=self._name)
 
2047
            self._real_branch = self.bzrdir._real_bzrdir.open_branch()
2270
2048
            if self.repository._real_repository is None:
2271
2049
                # Give the remote repository the matching real repo.
2272
2050
                real_repo = self._real_branch.repository
2368
2146
            return self._vfs_get_tags_bytes()
2369
2147
        return response[0]
2370
2148
 
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
2149
    def lock_read(self):
2390
2150
        self.repository.lock_read()
2391
2151
        if not self._lock_mode:
2392
 
            self._note_lock('r')
2393
2152
            self._lock_mode = 'r'
2394
2153
            self._lock_count = 1
2395
2154
            if self._real_branch is not None:
2415
2174
 
2416
2175
    def lock_write(self, token=None):
2417
2176
        if not self._lock_mode:
2418
 
            self._note_lock('w')
2419
2177
            # Lock the branch and repo in one remote call.
2420
2178
            remote_tokens = self._remote_lock_write(token)
2421
2179
            self._lock_token, self._repo_lock_token = remote_tokens
2447
2205
            self.repository.lock_write(self._repo_lock_token)
2448
2206
        return self._lock_token or None
2449
2207
 
 
2208
    def _set_tags_bytes(self, bytes):
 
2209
        self._ensure_real()
 
2210
        return self._real_branch._set_tags_bytes(bytes)
 
2211
 
2450
2212
    def _unlock(self, branch_token, repo_token):
2451
2213
        err_context = {'token': str((branch_token, repo_token))}
2452
2214
        response = self._call(
2456
2218
            return
2457
2219
        raise errors.UnexpectedSmartServerResponse(response)
2458
2220
 
2459
 
    @only_raises(errors.LockNotHeld, errors.LockBroken)
2460
2221
    def unlock(self):
2461
2222
        try:
2462
2223
            self._lock_count -= 1
2502
2263
            raise NotImplementedError(self.dont_leave_lock_in_place)
2503
2264
        self._leave_lock = False
2504
2265
 
2505
 
    @needs_read_lock
2506
2266
    def get_rev_id(self, revno, history=None):
2507
2267
        if revno == 0:
2508
2268
            return _mod_revision.NULL_REVISION
2873
2633
                    'Missing key %r in context %r', key_err.args[0], context)
2874
2634
                raise err
2875
2635
 
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':
 
2636
    if err.error_verb == 'NoSuchRevision':
2880
2637
        raise NoSuchRevision(find('branch'), err.error_args[0])
2881
2638
    elif err.error_verb == 'nosuchrevision':
2882
2639
        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)
 
2640
    elif err.error_tuple == ('nobranch',):
 
2641
        raise errors.NotBranchError(path=find('bzrdir').root_transport.base)
2890
2642
    elif err.error_verb == 'norepository':
2891
2643
        raise errors.NoRepositoryPresent(find('bzrdir'))
2892
2644
    elif err.error_verb == 'LockContention':