~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/remote.py

  • Committer: Jelmer Vernooij
  • Date: 2010-12-20 11:57:14 UTC
  • mto: This revision was merged to the branch mainline in revision 5577.
  • Revision ID: jelmer@samba.org-20101220115714-2ru3hfappjweeg7q
Don't use no-plugins.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2006, 2007, 2008, 2009 Canonical Ltd
 
1
# Copyright (C) 2006-2010 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
21
21
    branch,
22
22
    bzrdir,
23
23
    config,
 
24
    controldir,
24
25
    debug,
25
26
    errors,
26
27
    graph,
27
28
    lock,
28
29
    lockdir,
29
30
    repository,
 
31
    repository as _mod_repository,
30
32
    revision,
31
33
    revision as _mod_revision,
 
34
    static_tuple,
32
35
    symbol_versioning,
 
36
    urlutils,
33
37
)
34
 
from bzrlib.branch import BranchReferenceFormat
 
38
from bzrlib.branch import BranchReferenceFormat, BranchWriteLockResult
35
39
from bzrlib.bzrdir import BzrDir, RemoteBzrDirFormat
36
 
from bzrlib.decorators import needs_read_lock, needs_write_lock
 
40
from bzrlib.decorators import needs_read_lock, needs_write_lock, only_raises
37
41
from bzrlib.errors import (
38
42
    NoSuchRevision,
39
43
    SmartProtocolError,
41
45
from bzrlib.lockable_files import LockableFiles
42
46
from bzrlib.smart import client, vfs, repository as smart_repo
43
47
from bzrlib.revision import ensure_null, NULL_REVISION
 
48
from bzrlib.repository import RepositoryWriteLockResult
44
49
from bzrlib.trace import mutter, note, warning
45
50
 
46
51
 
89
94
class RemoteBzrDir(BzrDir, _RpcHelper):
90
95
    """Control directory on a remote server, accessed via bzr:// or similar."""
91
96
 
92
 
    def __init__(self, transport, format, _client=None):
 
97
    def __init__(self, transport, format, _client=None, _force_probe=False):
93
98
        """Construct a RemoteBzrDir.
94
99
 
95
100
        :param _client: Private parameter for testing. Disables probing and the
99
104
        # this object holds a delegated bzrdir that uses file-level operations
100
105
        # to talk to the other side
101
106
        self._real_bzrdir = None
 
107
        self._has_working_tree = None
102
108
        # 1-shot cache for the call pattern 'create_branch; open_branch' - see
103
109
        # create_branch for details.
104
110
        self._next_open_branch_result = None
108
114
            self._client = client._SmartClient(medium)
109
115
        else:
110
116
            self._client = _client
111
 
            return
112
 
 
 
117
            if not _force_probe:
 
118
                return
 
119
 
 
120
        self._probe_bzrdir()
 
121
 
 
122
    def __repr__(self):
 
123
        return '%s(%r)' % (self.__class__.__name__, self._client)
 
124
 
 
125
    def _probe_bzrdir(self):
 
126
        medium = self._client._medium
113
127
        path = self._path_for_remote_call(self._client)
 
128
        if medium._is_remote_before((2, 1)):
 
129
            self._rpc_open(path)
 
130
            return
 
131
        try:
 
132
            self._rpc_open_2_1(path)
 
133
            return
 
134
        except errors.UnknownSmartMethod:
 
135
            medium._remember_remote_is_before((2, 1))
 
136
            self._rpc_open(path)
 
137
 
 
138
    def _rpc_open_2_1(self, path):
 
139
        response = self._call('BzrDir.open_2.1', path)
 
140
        if response == ('no',):
 
141
            raise errors.NotBranchError(path=self.root_transport.base)
 
142
        elif response[0] == 'yes':
 
143
            if response[1] == 'yes':
 
144
                self._has_working_tree = True
 
145
            elif response[1] == 'no':
 
146
                self._has_working_tree = False
 
147
            else:
 
148
                raise errors.UnexpectedSmartServerResponse(response)
 
149
        else:
 
150
            raise errors.UnexpectedSmartServerResponse(response)
 
151
 
 
152
    def _rpc_open(self, path):
114
153
        response = self._call('BzrDir.open', path)
115
154
        if response not in [('yes',), ('no',)]:
116
155
            raise errors.UnexpectedSmartServerResponse(response)
117
156
        if response == ('no',):
118
 
            raise errors.NotBranchError(path=transport.base)
 
157
            raise errors.NotBranchError(path=self.root_transport.base)
119
158
 
120
159
    def _ensure_real(self):
121
160
        """Ensure that there is a _real_bzrdir set.
123
162
        Used before calls to self._real_bzrdir.
124
163
        """
125
164
        if not self._real_bzrdir:
 
165
            if 'hpssvfs' in debug.debug_flags:
 
166
                import traceback
 
167
                warning('VFS BzrDir access triggered\n%s',
 
168
                    ''.join(traceback.format_stack()))
126
169
            self._real_bzrdir = BzrDir.open_from_transport(
127
170
                self.root_transport, _server_formats=False)
128
171
            self._format._network_name = \
172
215
        if len(branch_info) != 2:
173
216
            raise errors.UnexpectedSmartServerResponse(response)
174
217
        branch_ref, branch_name = branch_info
175
 
        format = bzrdir.network_format_registry.get(control_name)
 
218
        format = controldir.network_format_registry.get(control_name)
176
219
        if repo_name:
177
220
            format.repository_format = repository.network_format_registry.get(
178
221
                repo_name)
204
247
        self._ensure_real()
205
248
        self._real_bzrdir.destroy_repository()
206
249
 
207
 
    def create_branch(self):
 
250
    def create_branch(self, name=None, repository=None):
208
251
        # as per meta1 formats - just delegate to the format object which may
209
252
        # be parameterised.
210
 
        real_branch = self._format.get_branch_format().initialize(self)
 
253
        real_branch = self._format.get_branch_format().initialize(self,
 
254
            name=name, repository=repository)
211
255
        if not isinstance(real_branch, RemoteBranch):
212
 
            result = RemoteBranch(self, self.find_repository(), real_branch)
 
256
            if not isinstance(repository, RemoteRepository):
 
257
                raise AssertionError(
 
258
                    'need a RemoteRepository to use with RemoteBranch, got %r'
 
259
                    % (repository,))
 
260
            result = RemoteBranch(self, repository, real_branch, name=name)
213
261
        else:
214
262
            result = real_branch
215
263
        # BzrDir.clone_on_transport() uses the result of create_branch but does
221
269
        self._next_open_branch_result = result
222
270
        return result
223
271
 
224
 
    def destroy_branch(self):
 
272
    def destroy_branch(self, name=None):
225
273
        """See BzrDir.destroy_branch"""
226
274
        self._ensure_real()
227
 
        self._real_bzrdir.destroy_branch()
 
275
        self._real_bzrdir.destroy_branch(name=name)
228
276
        self._next_open_branch_result = None
229
277
 
230
 
    def create_workingtree(self, revision_id=None, from_branch=None):
 
278
    def create_workingtree(self, revision_id=None, from_branch=None,
 
279
        accelerator_tree=None, hardlink=False):
231
280
        raise errors.NotLocalUrl(self.transport.base)
232
281
 
233
 
    def find_branch_format(self):
 
282
    def find_branch_format(self, name=None):
234
283
        """Find the branch 'format' for this bzrdir.
235
284
 
236
285
        This might be a synthetic object for e.g. RemoteBranch and SVN.
237
286
        """
238
 
        b = self.open_branch()
 
287
        b = self.open_branch(name=name)
239
288
        return b._format
240
289
 
241
 
    def get_branch_reference(self):
 
290
    def get_branch_reference(self, name=None):
242
291
        """See BzrDir.get_branch_reference()."""
 
292
        if name is not None:
 
293
            # XXX JRV20100304: Support opening colocated branches
 
294
            raise errors.NoColocatedBranchSupport(self)
243
295
        response = self._get_branch_reference()
244
296
        if response[0] == 'ref':
245
297
            return response[1]
249
301
    def _get_branch_reference(self):
250
302
        path = self._path_for_remote_call(self._client)
251
303
        medium = self._client._medium
252
 
        if not medium._is_remote_before((1, 13)):
 
304
        candidate_calls = [
 
305
            ('BzrDir.open_branchV3', (2, 1)),
 
306
            ('BzrDir.open_branchV2', (1, 13)),
 
307
            ('BzrDir.open_branch', None),
 
308
            ]
 
309
        for verb, required_version in candidate_calls:
 
310
            if required_version and medium._is_remote_before(required_version):
 
311
                continue
253
312
            try:
254
 
                response = self._call('BzrDir.open_branchV2', path)
255
 
                if response[0] not in ('ref', 'branch'):
256
 
                    raise errors.UnexpectedSmartServerResponse(response)
257
 
                return response
 
313
                response = self._call(verb, path)
258
314
            except errors.UnknownSmartMethod:
259
 
                medium._remember_remote_is_before((1, 13))
260
 
        response = self._call('BzrDir.open_branch', path)
261
 
        if response[0] != 'ok':
 
315
                if required_version is None:
 
316
                    raise
 
317
                medium._remember_remote_is_before(required_version)
 
318
            else:
 
319
                break
 
320
        if verb == 'BzrDir.open_branch':
 
321
            if response[0] != 'ok':
 
322
                raise errors.UnexpectedSmartServerResponse(response)
 
323
            if response[1] != '':
 
324
                return ('ref', response[1])
 
325
            else:
 
326
                return ('branch', '')
 
327
        if response[0] not in ('ref', 'branch'):
262
328
            raise errors.UnexpectedSmartServerResponse(response)
263
 
        if response[1] != '':
264
 
            return ('ref', response[1])
265
 
        else:
266
 
            return ('branch', '')
 
329
        return response
267
330
 
268
 
    def _get_tree_branch(self):
 
331
    def _get_tree_branch(self, name=None):
269
332
        """See BzrDir._get_tree_branch()."""
270
 
        return None, self.open_branch()
 
333
        return None, self.open_branch(name=name)
271
334
 
272
 
    def open_branch(self, _unsupported=False, ignore_fallbacks=False):
273
 
        if _unsupported:
 
335
    def open_branch(self, name=None, unsupported=False,
 
336
                    ignore_fallbacks=False):
 
337
        if unsupported:
274
338
            raise NotImplementedError('unsupported flag support not implemented yet.')
275
339
        if self._next_open_branch_result is not None:
276
340
            # See create_branch for details.
281
345
        if response[0] == 'ref':
282
346
            # a branch reference, use the existing BranchReference logic.
283
347
            format = BranchReferenceFormat()
284
 
            return format.open(self, _found=True, location=response[1],
285
 
                ignore_fallbacks=ignore_fallbacks)
 
348
            return format.open(self, name=name, _found=True,
 
349
                location=response[1], ignore_fallbacks=ignore_fallbacks)
286
350
        branch_format_name = response[1]
287
351
        if not branch_format_name:
288
352
            branch_format_name = None
289
353
        format = RemoteBranchFormat(network_name=branch_format_name)
290
354
        return RemoteBranch(self, self.find_repository(), format=format,
291
 
            setup_stacking=not ignore_fallbacks)
 
355
            setup_stacking=not ignore_fallbacks, name=name)
292
356
 
293
357
    def _open_repo_v1(self, path):
294
358
        verb = 'BzrDir.find_repository'
355
419
        else:
356
420
            raise errors.NoRepositoryPresent(self)
357
421
 
 
422
    def has_workingtree(self):
 
423
        if self._has_working_tree is None:
 
424
            self._ensure_real()
 
425
            self._has_working_tree = self._real_bzrdir.has_workingtree()
 
426
        return self._has_working_tree
 
427
 
358
428
    def open_workingtree(self, recommend_upgrade=True):
359
 
        self._ensure_real()
360
 
        if self._real_bzrdir.has_workingtree():
 
429
        if self.has_workingtree():
361
430
            raise errors.NotLocalUrl(self.root_transport)
362
431
        else:
363
432
            raise errors.NoWorkingTree(self.root_transport.base)
366
435
        """Return the path to be used for this bzrdir in a remote call."""
367
436
        return client.remote_path_from_transport(self.root_transport)
368
437
 
369
 
    def get_branch_transport(self, branch_format):
 
438
    def get_branch_transport(self, branch_format, name=None):
370
439
        self._ensure_real()
371
 
        return self._real_bzrdir.get_branch_transport(branch_format)
 
440
        return self._real_bzrdir.get_branch_transport(branch_format, name=name)
372
441
 
373
442
    def get_repository_transport(self, repository_format):
374
443
        self._ensure_real()
426
495
        self._custom_format = None
427
496
        self._network_name = None
428
497
        self._creating_bzrdir = None
 
498
        self._supports_chks = None
429
499
        self._supports_external_lookups = None
430
500
        self._supports_tree_reference = None
431
501
        self._rich_root_data = None
432
502
 
 
503
    def __repr__(self):
 
504
        return "%s(_network_name=%r)" % (self.__class__.__name__,
 
505
            self._network_name)
 
506
 
433
507
    @property
434
508
    def fast_deltas(self):
435
509
        self._ensure_real()
443
517
        return self._rich_root_data
444
518
 
445
519
    @property
 
520
    def supports_chks(self):
 
521
        if self._supports_chks is None:
 
522
            self._ensure_real()
 
523
            self._supports_chks = self._custom_format.supports_chks
 
524
        return self._supports_chks
 
525
 
 
526
    @property
446
527
    def supports_external_lookups(self):
447
528
        if self._supports_external_lookups is None:
448
529
            self._ensure_real()
549
630
        return self._custom_format._fetch_reconcile
550
631
 
551
632
    def get_format_description(self):
552
 
        return 'bzr remote repository'
 
633
        self._ensure_real()
 
634
        return 'Remote: ' + self._custom_format.get_format_description()
553
635
 
554
636
    def __eq__(self, other):
555
637
        return self.__class__ is other.__class__
556
638
 
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
 
 
566
639
    def network_name(self):
567
640
        if self._network_name:
568
641
            return self._network_name
580
653
        return self._custom_format._serializer
581
654
 
582
655
 
583
 
class RemoteRepository(_RpcHelper):
 
656
class RemoteRepository(_RpcHelper, lock._RelockDebugMixin,
 
657
    controldir.ControlComponent):
584
658
    """Repository accessed over rpc.
585
659
 
586
660
    For the moment most operations are performed using local transport-backed
629
703
        # Additional places to query for data.
630
704
        self._fallback_repositories = []
631
705
 
 
706
    @property
 
707
    def user_transport(self):
 
708
        return self.bzrdir.user_transport
 
709
 
 
710
    @property
 
711
    def control_transport(self):
 
712
        # XXX: Normally you shouldn't directly get at the remote repository
 
713
        # transport, but I'm not sure it's worth making this method
 
714
        # optional -- mbp 2010-04-21
 
715
        return self.bzrdir.get_repository_transport(None)
 
716
        
632
717
    def __str__(self):
633
718
        return "%s(%s)" % (self.__class__.__name__, self.base)
634
719
 
820
905
    def _has_same_fallbacks(self, other_repo):
821
906
        """Returns true if the repositories have the same fallbacks."""
822
907
        # XXX: copied from Repository; it should be unified into a base class
823
 
        # <https://bugs.edge.launchpad.net/bzr/+bug/401622>
 
908
        # <https://bugs.launchpad.net/bzr/+bug/401622>
824
909
        my_fb = self._fallback_repositories
825
910
        other_fb = other_repo._fallback_repositories
826
911
        if len(my_fb) != len(other_fb):
842
927
        parents_provider = self._make_parents_provider(other_repository)
843
928
        return graph.Graph(parents_provider)
844
929
 
 
930
    @needs_read_lock
 
931
    def get_known_graph_ancestry(self, revision_ids):
 
932
        """Return the known graph for a set of revision ids and their ancestors.
 
933
        """
 
934
        st = static_tuple.StaticTuple
 
935
        revision_keys = [st(r_id).intern() for r_id in revision_ids]
 
936
        known_graph = self.revisions.get_known_graph_ancestry(revision_keys)
 
937
        return graph.GraphThunkIdsToKeys(known_graph)
 
938
 
845
939
    def gather_stats(self, revid=None, committers=None):
846
940
        """See Repository.gather_stats()."""
847
941
        path = self.bzrdir._path_for_remote_call(self._client)
907
1001
    def is_write_locked(self):
908
1002
        return self._lock_mode == 'w'
909
1003
 
 
1004
    def _warn_if_deprecated(self, branch=None):
 
1005
        # If we have a real repository, the check will be done there, if we
 
1006
        # don't the check will be done remotely.
 
1007
        pass
 
1008
 
910
1009
    def lock_read(self):
 
1010
        """Lock the repository for read operations.
 
1011
 
 
1012
        :return: A bzrlib.lock.LogicalLockResult.
 
1013
        """
911
1014
        # wrong eventually - want a local lock cache context
912
1015
        if not self._lock_mode:
 
1016
            self._note_lock('r')
913
1017
            self._lock_mode = 'r'
914
1018
            self._lock_count = 1
915
1019
            self._unstacked_provider.enable_cache(cache_misses=True)
919
1023
                repo.lock_read()
920
1024
        else:
921
1025
            self._lock_count += 1
 
1026
        return lock.LogicalLockResult(self.unlock)
922
1027
 
923
1028
    def _remote_lock_write(self, token):
924
1029
        path = self.bzrdir._path_for_remote_call(self._client)
935
1040
 
936
1041
    def lock_write(self, token=None, _skip_rpc=False):
937
1042
        if not self._lock_mode:
 
1043
            self._note_lock('w')
938
1044
            if _skip_rpc:
939
1045
                if self._lock_token is not None:
940
1046
                    if token != self._lock_token:
963
1069
            raise errors.ReadOnlyError(self)
964
1070
        else:
965
1071
            self._lock_count += 1
966
 
        return self._lock_token or None
 
1072
        return RepositoryWriteLockResult(self.unlock, self._lock_token or None)
967
1073
 
968
1074
    def leave_lock_in_place(self):
969
1075
        if not self._lock_token:
1043
1149
        else:
1044
1150
            raise errors.UnexpectedSmartServerResponse(response)
1045
1151
 
 
1152
    @only_raises(errors.LockNotHeld, errors.LockBroken)
1046
1153
    def unlock(self):
1047
1154
        if not self._lock_count:
1048
1155
            return lock.cant_unlock_not_held(self)
1148
1255
            # state, so always add a lock here. If a caller passes us a locked
1149
1256
            # repository, they are responsible for unlocking it later.
1150
1257
            repository.lock_read()
 
1258
        self._check_fallback_repository(repository)
1151
1259
        self._fallback_repositories.append(repository)
1152
1260
        # If self._real_repository was parameterised already (e.g. because a
1153
1261
        # _real_branch had its get_stacked_on_url method called), then the
1154
1262
        # repository to be added may already be in the _real_repositories list.
1155
1263
        if self._real_repository is not None:
1156
 
            fallback_locations = [repo.bzrdir.root_transport.base for repo in
 
1264
            fallback_locations = [repo.user_url for repo in
1157
1265
                self._real_repository._fallback_repositories]
1158
 
            if repository.bzrdir.root_transport.base not in fallback_locations:
 
1266
            if repository.user_url not in fallback_locations:
1159
1267
                self._real_repository.add_fallback_repository(repository)
1160
1268
 
 
1269
    def _check_fallback_repository(self, repository):
 
1270
        """Check that this repository can fallback to repository safely.
 
1271
 
 
1272
        Raise an error if not.
 
1273
 
 
1274
        :param repository: A repository to fallback to.
 
1275
        """
 
1276
        return _mod_repository.InterRepository._assert_same_model(
 
1277
            self, repository)
 
1278
 
1161
1279
    def add_inventory(self, revid, inv, parents):
1162
1280
        self._ensure_real()
1163
1281
        return self._real_repository.add_inventory(revid, inv, parents)
1164
1282
 
1165
1283
    def add_inventory_by_delta(self, basis_revision_id, delta, new_revision_id,
1166
 
                               parents):
 
1284
            parents, basis_inv=None, propagate_caches=False):
1167
1285
        self._ensure_real()
1168
1286
        return self._real_repository.add_inventory_by_delta(basis_revision_id,
1169
 
            delta, new_revision_id, parents)
 
1287
            delta, new_revision_id, parents, basis_inv=basis_inv,
 
1288
            propagate_caches=propagate_caches)
1170
1289
 
1171
1290
    def add_revision(self, rev_id, rev, inv=None, config=None):
1172
1291
        self._ensure_real()
1178
1297
        self._ensure_real()
1179
1298
        return self._real_repository.get_inventory(revision_id)
1180
1299
 
1181
 
    def iter_inventories(self, revision_ids):
 
1300
    def iter_inventories(self, revision_ids, ordering=None):
1182
1301
        self._ensure_real()
1183
 
        return self._real_repository.iter_inventories(revision_ids)
 
1302
        return self._real_repository.iter_inventories(revision_ids, ordering)
1184
1303
 
1185
1304
    @needs_read_lock
1186
1305
    def get_revision(self, revision_id):
1202
1321
        return self._real_repository.make_working_trees()
1203
1322
 
1204
1323
    def refresh_data(self):
1205
 
        """Re-read any data needed to to synchronise with disk.
 
1324
        """Re-read any data needed to synchronise with disk.
1206
1325
 
1207
1326
        This method is intended to be called after another repository instance
1208
1327
        (such as one used by a smart server) has inserted data into the
1209
 
        repository. It may not be called during a write group, but may be
1210
 
        called at any other time.
 
1328
        repository. On all repositories this will work outside of write groups.
 
1329
        Some repository formats (pack and newer for bzrlib native formats)
 
1330
        support refresh_data inside write groups. If called inside a write
 
1331
        group on a repository that does not support refreshing in a write group
 
1332
        IsInWriteGroupError will be raised.
1211
1333
        """
1212
 
        if self.is_in_write_group():
1213
 
            raise errors.InternalBzrError(
1214
 
                "May not refresh_data while in a write group.")
1215
1334
        if self._real_repository is not None:
1216
1335
            self._real_repository.refresh_data()
1217
1336
 
1431
1550
        return self._real_repository.get_signature_text(revision_id)
1432
1551
 
1433
1552
    @needs_read_lock
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)
 
1553
    def _get_inventory_xml(self, revision_id):
 
1554
        self._ensure_real()
 
1555
        return self._real_repository._get_inventory_xml(revision_id)
1441
1556
 
1442
1557
    def reconcile(self, other=None, thorough=False):
1443
1558
        self._ensure_real()
1470
1585
        return self._real_repository.get_revision_reconcile(revision_id)
1471
1586
 
1472
1587
    @needs_read_lock
1473
 
    def check(self, revision_ids=None):
 
1588
    def check(self, revision_ids=None, callback_refs=None, check_repo=True):
1474
1589
        self._ensure_real()
1475
 
        return self._real_repository.check(revision_ids=revision_ids)
 
1590
        return self._real_repository.check(revision_ids=revision_ids,
 
1591
            callback_refs=callback_refs, check_repo=check_repo)
1476
1592
 
1477
1593
    def copy_content_into(self, destination, revision_id=None):
1478
1594
        self._ensure_real()
1518
1634
        return self._real_repository.inventories
1519
1635
 
1520
1636
    @needs_write_lock
1521
 
    def pack(self, hint=None):
 
1637
    def pack(self, hint=None, clean_obsolete_packs=False):
1522
1638
        """Compress the data within the repository.
1523
1639
 
1524
1640
        This is not currently implemented within the smart server.
1525
1641
        """
1526
1642
        self._ensure_real()
1527
 
        return self._real_repository.pack(hint=hint)
 
1643
        return self._real_repository.pack(hint=hint, clean_obsolete_packs=clean_obsolete_packs)
1528
1644
 
1529
1645
    @property
1530
1646
    def revisions(self):
1618
1734
        self._ensure_real()
1619
1735
        return self._real_repository.revision_graph_can_have_wrong_parents()
1620
1736
 
1621
 
    def _find_inconsistent_revision_parents(self):
 
1737
    def _find_inconsistent_revision_parents(self, revisions_iterator=None):
1622
1738
        self._ensure_real()
1623
 
        return self._real_repository._find_inconsistent_revision_parents()
 
1739
        return self._real_repository._find_inconsistent_revision_parents(
 
1740
            revisions_iterator)
1624
1741
 
1625
1742
    def _check_for_inconsistent_revision_parents(self):
1626
1743
        self._ensure_real()
1680
1797
    def insert_stream(self, stream, src_format, resume_tokens):
1681
1798
        target = self.target_repo
1682
1799
        target._unstacked_provider.missing_keys.clear()
 
1800
        candidate_calls = [('Repository.insert_stream_1.19', (1, 19))]
1683
1801
        if target._lock_token:
1684
 
            verb = 'Repository.insert_stream_locked'
1685
 
            extra_args = (target._lock_token or '',)
1686
 
            required_version = (1, 14)
 
1802
            candidate_calls.append(('Repository.insert_stream_locked', (1, 14)))
 
1803
            lock_args = (target._lock_token or '',)
1687
1804
        else:
1688
 
            verb = 'Repository.insert_stream'
1689
 
            extra_args = ()
1690
 
            required_version = (1, 13)
 
1805
            candidate_calls.append(('Repository.insert_stream', (1, 13)))
 
1806
            lock_args = ()
1691
1807
        client = target._client
1692
1808
        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)
1696
1809
        path = target.bzrdir._path_for_remote_call(client)
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.
 
1810
        # Probe for the verb to use with an empty stream before sending the
 
1811
        # real stream to it.  We do this both to avoid the risk of sending a
 
1812
        # large request that is then rejected, and because we don't want to
 
1813
        # implement a way to buffer, rewind, or restart the stream.
 
1814
        found_verb = False
 
1815
        for verb, required_version in candidate_calls:
 
1816
            if medium._is_remote_before(required_version):
 
1817
                continue
 
1818
            if resume_tokens:
 
1819
                # We've already done the probing (and set _is_remote_before) on
 
1820
                # a previous insert.
 
1821
                found_verb = True
 
1822
                break
1706
1823
            byte_stream = smart_repo._stream_to_byte_stream([], src_format)
1707
1824
            try:
1708
1825
                response = client.call_with_body_stream(
1709
 
                    (verb, path, '') + extra_args, byte_stream)
 
1826
                    (verb, path, '') + lock_args, byte_stream)
1710
1827
            except errors.UnknownSmartMethod:
1711
1828
                medium._remember_remote_is_before(required_version)
1712
 
                return self._insert_real(stream, src_format, resume_tokens)
 
1829
            else:
 
1830
                found_verb = True
 
1831
                break
 
1832
        if not found_verb:
 
1833
            # Have to use VFS.
 
1834
            return self._insert_real(stream, src_format, resume_tokens)
 
1835
        self._last_inv_record = None
 
1836
        self._last_substream = None
 
1837
        if required_version < (1, 19):
 
1838
            # Remote side doesn't support inventory deltas.  Wrap the stream to
 
1839
            # make sure we don't send any.  If the stream contains inventory
 
1840
            # deltas we'll interrupt the smart insert_stream request and
 
1841
            # fallback to VFS.
 
1842
            stream = self._stop_stream_if_inventory_delta(stream)
1713
1843
        byte_stream = smart_repo._stream_to_byte_stream(
1714
1844
            stream, src_format)
1715
1845
        resume_tokens = ' '.join(resume_tokens)
1716
1846
        response = client.call_with_body_stream(
1717
 
            (verb, path, resume_tokens) + extra_args, byte_stream)
 
1847
            (verb, path, resume_tokens) + lock_args, byte_stream)
1718
1848
        if response[0][0] not in ('ok', 'missing-basis'):
1719
1849
            raise errors.UnexpectedSmartServerResponse(response)
 
1850
        if self._last_substream is not None:
 
1851
            # The stream included an inventory-delta record, but the remote
 
1852
            # side isn't new enough to support them.  So we need to send the
 
1853
            # rest of the stream via VFS.
 
1854
            self.target_repo.refresh_data()
 
1855
            return self._resume_stream_with_vfs(response, src_format)
1720
1856
        if response[0][0] == 'missing-basis':
1721
1857
            tokens, missing_keys = bencode.bdecode_as_tuple(response[0][1])
1722
1858
            resume_tokens = tokens
1725
1861
            self.target_repo.refresh_data()
1726
1862
            return [], set()
1727
1863
 
 
1864
    def _resume_stream_with_vfs(self, response, src_format):
 
1865
        """Resume sending a stream via VFS, first resending the record and
 
1866
        substream that couldn't be sent via an insert_stream verb.
 
1867
        """
 
1868
        if response[0][0] == 'missing-basis':
 
1869
            tokens, missing_keys = bencode.bdecode_as_tuple(response[0][1])
 
1870
            # Ignore missing_keys, we haven't finished inserting yet
 
1871
        else:
 
1872
            tokens = []
 
1873
        def resume_substream():
 
1874
            # Yield the substream that was interrupted.
 
1875
            for record in self._last_substream:
 
1876
                yield record
 
1877
            self._last_substream = None
 
1878
        def resume_stream():
 
1879
            # Finish sending the interrupted substream
 
1880
            yield ('inventory-deltas', resume_substream())
 
1881
            # Then simply continue sending the rest of the stream.
 
1882
            for substream_kind, substream in self._last_stream:
 
1883
                yield substream_kind, substream
 
1884
        return self._insert_real(resume_stream(), src_format, tokens)
 
1885
 
 
1886
    def _stop_stream_if_inventory_delta(self, stream):
 
1887
        """Normally this just lets the original stream pass-through unchanged.
 
1888
 
 
1889
        However if any 'inventory-deltas' substream occurs it will stop
 
1890
        streaming, and store the interrupted substream and stream in
 
1891
        self._last_substream and self._last_stream so that the stream can be
 
1892
        resumed by _resume_stream_with_vfs.
 
1893
        """
 
1894
                    
 
1895
        stream_iter = iter(stream)
 
1896
        for substream_kind, substream in stream_iter:
 
1897
            if substream_kind == 'inventory-deltas':
 
1898
                self._last_substream = substream
 
1899
                self._last_stream = stream_iter
 
1900
                return
 
1901
            else:
 
1902
                yield substream_kind, substream
 
1903
            
1728
1904
 
1729
1905
class RemoteStreamSource(repository.StreamSource):
1730
1906
    """Stream data from a remote server."""
1733
1909
        if (self.from_repository._fallback_repositories and
1734
1910
            self.to_format._fetch_order == 'topological'):
1735
1911
            return self._real_stream(self.from_repository, search)
1736
 
        return self.missing_parents_chain(search, [self.from_repository] +
1737
 
            self.from_repository._fallback_repositories)
 
1912
        sources = []
 
1913
        seen = set()
 
1914
        repos = [self.from_repository]
 
1915
        while repos:
 
1916
            repo = repos.pop(0)
 
1917
            if repo in seen:
 
1918
                continue
 
1919
            seen.add(repo)
 
1920
            repos.extend(repo._fallback_repositories)
 
1921
            sources.append(repo)
 
1922
        return self.missing_parents_chain(search, sources)
 
1923
 
 
1924
    def get_stream_for_missing_keys(self, missing_keys):
 
1925
        self.from_repository._ensure_real()
 
1926
        real_repo = self.from_repository._real_repository
 
1927
        real_source = real_repo._get_source(self.to_format)
 
1928
        return real_source.get_stream_for_missing_keys(missing_keys)
1738
1929
 
1739
1930
    def _real_stream(self, repo, search):
1740
1931
        """Get a stream for search from repo.
1747
1938
        """
1748
1939
        source = repo._get_source(self.to_format)
1749
1940
        if isinstance(source, RemoteStreamSource):
1750
 
            return repository.StreamSource.get_stream(source, search)
 
1941
            repo._ensure_real()
 
1942
            source = repo._real_repository._get_source(self.to_format)
1751
1943
        return source.get_stream(search)
1752
1944
 
1753
1945
    def _get_stream(self, repo, search):
1770
1962
            return self._real_stream(repo, search)
1771
1963
        client = repo._client
1772
1964
        medium = client._medium
1773
 
        if medium._is_remote_before((1, 13)):
1774
 
            # streaming was added in 1.13
1775
 
            return self._real_stream(repo, search)
1776
1965
        path = repo.bzrdir._path_for_remote_call(client)
1777
 
        try:
1778
 
            search_bytes = repo._serialise_search_result(search)
1779
 
            response = repo._call_with_body_bytes_expecting_body(
1780
 
                'Repository.get_stream',
1781
 
                (path, self.to_format.network_name()), search_bytes)
1782
 
            response_tuple, response_handler = response
1783
 
        except errors.UnknownSmartMethod:
1784
 
            medium._remember_remote_is_before((1,13))
 
1966
        search_bytes = repo._serialise_search_result(search)
 
1967
        args = (path, self.to_format.network_name())
 
1968
        candidate_verbs = [
 
1969
            ('Repository.get_stream_1.19', (1, 19)),
 
1970
            ('Repository.get_stream', (1, 13))]
 
1971
        found_verb = False
 
1972
        for verb, version in candidate_verbs:
 
1973
            if medium._is_remote_before(version):
 
1974
                continue
 
1975
            try:
 
1976
                response = repo._call_with_body_bytes_expecting_body(
 
1977
                    verb, args, search_bytes)
 
1978
            except errors.UnknownSmartMethod:
 
1979
                medium._remember_remote_is_before(version)
 
1980
            else:
 
1981
                response_tuple, response_handler = response
 
1982
                found_verb = True
 
1983
                break
 
1984
        if not found_verb:
1785
1985
            return self._real_stream(repo, search)
1786
1986
        if response_tuple[0] != 'ok':
1787
1987
            raise errors.UnexpectedSmartServerResponse(response_tuple)
1788
1988
        byte_stream = response_handler.read_streamed_body()
1789
 
        src_format, stream = smart_repo._byte_stream_to_stream(byte_stream)
 
1989
        src_format, stream = smart_repo._byte_stream_to_stream(byte_stream,
 
1990
            self._record_counter)
1790
1991
        if src_format.network_name() != repo._format.network_name():
1791
1992
            raise AssertionError(
1792
1993
                "Mismatched RemoteRepository and stream src %r, %r" % (
1799
2000
        :param search: The overall search to satisfy with streams.
1800
2001
        :param sources: A list of Repository objects to query.
1801
2002
        """
1802
 
        self.serialiser = self.to_format._serializer
 
2003
        self.from_serialiser = self.from_repository._format._serializer
1803
2004
        self.seen_revs = set()
1804
2005
        self.referenced_revs = set()
1805
2006
        # If there are heads in the search, or the key count is > 0, we are not
1822
2023
    def missing_parents_rev_handler(self, substream):
1823
2024
        for content in substream:
1824
2025
            revision_bytes = content.get_bytes_as('fulltext')
1825
 
            revision = self.serialiser.read_revision_from_string(revision_bytes)
 
2026
            revision = self.from_serialiser.read_revision_from_string(
 
2027
                revision_bytes)
1826
2028
            self.seen_revs.add(content.key[-1])
1827
2029
            self.referenced_revs.update(revision.parent_ids)
1828
2030
            yield content
1867
2069
                self._network_name)
1868
2070
 
1869
2071
    def get_format_description(self):
1870
 
        return 'Remote BZR Branch'
 
2072
        self._ensure_real()
 
2073
        return 'Remote: ' + self._custom_format.get_format_description()
1871
2074
 
1872
2075
    def network_name(self):
1873
2076
        return self._network_name
1874
2077
 
1875
 
    def open(self, a_bzrdir, ignore_fallbacks=False):
1876
 
        return a_bzrdir.open_branch(ignore_fallbacks=ignore_fallbacks)
 
2078
    def open(self, a_bzrdir, name=None, ignore_fallbacks=False):
 
2079
        return a_bzrdir.open_branch(name=name, 
 
2080
            ignore_fallbacks=ignore_fallbacks)
1877
2081
 
1878
 
    def _vfs_initialize(self, a_bzrdir):
 
2082
    def _vfs_initialize(self, a_bzrdir, name):
1879
2083
        # Initialisation when using a local bzrdir object, or a non-vfs init
1880
2084
        # method is not available on the server.
1881
2085
        # self._custom_format is always set - the start of initialize ensures
1882
2086
        # that.
1883
2087
        if isinstance(a_bzrdir, RemoteBzrDir):
1884
2088
            a_bzrdir._ensure_real()
1885
 
            result = self._custom_format.initialize(a_bzrdir._real_bzrdir)
 
2089
            result = self._custom_format.initialize(a_bzrdir._real_bzrdir,
 
2090
                name)
1886
2091
        else:
1887
2092
            # We assume the bzrdir is parameterised; it may not be.
1888
 
            result = self._custom_format.initialize(a_bzrdir)
 
2093
            result = self._custom_format.initialize(a_bzrdir, name)
1889
2094
        if (isinstance(a_bzrdir, RemoteBzrDir) and
1890
2095
            not isinstance(result, RemoteBranch)):
1891
 
            result = RemoteBranch(a_bzrdir, a_bzrdir.find_repository(), result)
 
2096
            result = RemoteBranch(a_bzrdir, a_bzrdir.find_repository(), result,
 
2097
                                  name=name)
1892
2098
        return result
1893
2099
 
1894
 
    def initialize(self, a_bzrdir):
 
2100
    def initialize(self, a_bzrdir, name=None, repository=None):
1895
2101
        # 1) get the network name to use.
1896
2102
        if self._custom_format:
1897
2103
            network_name = self._custom_format.network_name()
1903
2109
            network_name = reference_format.network_name()
1904
2110
        # Being asked to create on a non RemoteBzrDir:
1905
2111
        if not isinstance(a_bzrdir, RemoteBzrDir):
1906
 
            return self._vfs_initialize(a_bzrdir)
 
2112
            return self._vfs_initialize(a_bzrdir, name=name)
1907
2113
        medium = a_bzrdir._client._medium
1908
2114
        if medium._is_remote_before((1, 13)):
1909
 
            return self._vfs_initialize(a_bzrdir)
 
2115
            return self._vfs_initialize(a_bzrdir, name=name)
1910
2116
        # Creating on a remote bzr dir.
1911
2117
        # 2) try direct creation via RPC
1912
2118
        path = a_bzrdir._path_for_remote_call(a_bzrdir._client)
 
2119
        if name is not None:
 
2120
            # XXX JRV20100304: Support creating colocated branches
 
2121
            raise errors.NoColocatedBranchSupport(self)
1913
2122
        verb = 'BzrDir.create_branch'
1914
2123
        try:
1915
2124
            response = a_bzrdir._call(verb, path, network_name)
1916
2125
        except errors.UnknownSmartMethod:
1917
2126
            # Fallback - use vfs methods
1918
2127
            medium._remember_remote_is_before((1, 13))
1919
 
            return self._vfs_initialize(a_bzrdir)
 
2128
            return self._vfs_initialize(a_bzrdir, name=name)
1920
2129
        if response[0] != 'ok':
1921
2130
            raise errors.UnexpectedSmartServerResponse(response)
1922
2131
        # Turn the response into a RemoteRepository object.
1923
2132
        format = RemoteBranchFormat(network_name=response[1])
1924
2133
        repo_format = response_tuple_to_repo_format(response[3:])
1925
 
        if response[2] == '':
1926
 
            repo_bzrdir = a_bzrdir
 
2134
        repo_path = response[2]
 
2135
        if repository is not None:
 
2136
            remote_repo_url = urlutils.join(medium.base, repo_path)
 
2137
            url_diff = urlutils.relative_url(repository.user_url,
 
2138
                    remote_repo_url)
 
2139
            if url_diff != '.':
 
2140
                raise AssertionError(
 
2141
                    'repository.user_url %r does not match URL from server '
 
2142
                    'response (%r + %r)'
 
2143
                    % (repository.user_url, medium.base, repo_path))
 
2144
            remote_repo = repository
1927
2145
        else:
1928
 
            repo_bzrdir = RemoteBzrDir(
1929
 
                a_bzrdir.root_transport.clone(response[2]), a_bzrdir._format,
1930
 
                a_bzrdir._client)
1931
 
        remote_repo = RemoteRepository(repo_bzrdir, repo_format)
 
2146
            if repo_path == '':
 
2147
                repo_bzrdir = a_bzrdir
 
2148
            else:
 
2149
                repo_bzrdir = RemoteBzrDir(
 
2150
                    a_bzrdir.root_transport.clone(repo_path), a_bzrdir._format,
 
2151
                    a_bzrdir._client)
 
2152
            remote_repo = RemoteRepository(repo_bzrdir, repo_format)
1932
2153
        remote_branch = RemoteBranch(a_bzrdir, remote_repo,
1933
 
            format=format, setup_stacking=False)
 
2154
            format=format, setup_stacking=False, name=name)
1934
2155
        # XXX: We know this is a new branch, so it must have revno 0, revid
1935
2156
        # NULL_REVISION. Creating the branch locked would make this be unable
1936
2157
        # to be wrong; here its simply very unlikely to be wrong. RBC 20090225
1956
2177
        return self._custom_format.supports_set_append_revisions_only()
1957
2178
 
1958
2179
 
1959
 
class RemoteBranch(branch.Branch, _RpcHelper):
 
2180
class RemoteBranch(branch.Branch, _RpcHelper, lock._RelockDebugMixin):
1960
2181
    """Branch stored on a server accessed by HPSS RPC.
1961
2182
 
1962
2183
    At the moment most operations are mapped down to simple file operations.
1963
2184
    """
1964
2185
 
1965
2186
    def __init__(self, remote_bzrdir, remote_repository, real_branch=None,
1966
 
        _client=None, format=None, setup_stacking=True):
 
2187
        _client=None, format=None, setup_stacking=True, name=None):
1967
2188
        """Create a RemoteBranch instance.
1968
2189
 
1969
2190
        :param real_branch: An optional local implementation of the branch
1975
2196
        :param setup_stacking: If True make an RPC call to determine the
1976
2197
            stacked (or not) status of the branch. If False assume the branch
1977
2198
            is not stacked.
 
2199
        :param name: Colocated branch name
1978
2200
        """
1979
2201
        # We intentionally don't call the parent class's __init__, because it
1980
2202
        # will try to assign to self.tags, which is a property in this subclass.
1999
2221
            self._real_branch = None
2000
2222
        # Fill out expected attributes of branch for bzrlib API users.
2001
2223
        self._clear_cached_state()
2002
 
        self.base = self.bzrdir.root_transport.base
 
2224
        # TODO: deprecate self.base in favor of user_url
 
2225
        self.base = self.bzrdir.user_url
 
2226
        self._name = name
2003
2227
        self._control_files = None
2004
2228
        self._lock_mode = None
2005
2229
        self._lock_token = None
2016
2240
                    self._real_branch._format.network_name()
2017
2241
        else:
2018
2242
            self._format = format
 
2243
        # when we do _ensure_real we may need to pass ignore_fallbacks to the
 
2244
        # branch.open_branch method.
 
2245
        self._real_ignore_fallbacks = not setup_stacking
2019
2246
        if not self._format._network_name:
2020
2247
            # Did not get from open_branchV2 - old server.
2021
2248
            self._ensure_real()
2066
2293
                raise AssertionError('smart server vfs must be enabled '
2067
2294
                    'to use vfs implementation')
2068
2295
            self.bzrdir._ensure_real()
2069
 
            self._real_branch = self.bzrdir._real_bzrdir.open_branch()
 
2296
            self._real_branch = self.bzrdir._real_bzrdir.open_branch(
 
2297
                ignore_fallbacks=self._real_ignore_fallbacks, name=self._name)
2070
2298
            if self.repository._real_repository is None:
2071
2299
                # Give the remote repository the matching real repo.
2072
2300
                real_repo = self._real_branch.repository
2157
2385
        self._ensure_real()
2158
2386
        return self._real_branch._get_tags_bytes()
2159
2387
 
 
2388
    @needs_read_lock
2160
2389
    def _get_tags_bytes(self):
 
2390
        if self._tags_bytes is None:
 
2391
            self._tags_bytes = self._get_tags_bytes_via_hpss()
 
2392
        return self._tags_bytes
 
2393
 
 
2394
    def _get_tags_bytes_via_hpss(self):
2161
2395
        medium = self._client._medium
2162
2396
        if medium._is_remote_before((1, 13)):
2163
2397
            return self._vfs_get_tags_bytes()
2173
2407
        return self._real_branch._set_tags_bytes(bytes)
2174
2408
 
2175
2409
    def _set_tags_bytes(self, bytes):
 
2410
        if self.is_locked():
 
2411
            self._tags_bytes = bytes
2176
2412
        medium = self._client._medium
2177
2413
        if medium._is_remote_before((1, 18)):
2178
2414
            self._vfs_set_tags_bytes(bytes)
 
2415
            return
2179
2416
        try:
2180
2417
            args = (
2181
2418
                self._remote_path(), self._lock_token, self._repo_lock_token)
2186
2423
            self._vfs_set_tags_bytes(bytes)
2187
2424
 
2188
2425
    def lock_read(self):
 
2426
        """Lock the branch for read operations.
 
2427
 
 
2428
        :return: A bzrlib.lock.LogicalLockResult.
 
2429
        """
2189
2430
        self.repository.lock_read()
2190
2431
        if not self._lock_mode:
 
2432
            self._note_lock('r')
2191
2433
            self._lock_mode = 'r'
2192
2434
            self._lock_count = 1
2193
2435
            if self._real_branch is not None:
2194
2436
                self._real_branch.lock_read()
2195
2437
        else:
2196
2438
            self._lock_count += 1
 
2439
        return lock.LogicalLockResult(self.unlock)
2197
2440
 
2198
2441
    def _remote_lock_write(self, token):
2199
2442
        if token is None:
2200
2443
            branch_token = repo_token = ''
2201
2444
        else:
2202
2445
            branch_token = token
2203
 
            repo_token = self.repository.lock_write()
 
2446
            repo_token = self.repository.lock_write().repository_token
2204
2447
            self.repository.unlock()
2205
2448
        err_context = {'token': token}
2206
 
        response = self._call(
2207
 
            'Branch.lock_write', self._remote_path(), branch_token,
2208
 
            repo_token or '', **err_context)
 
2449
        try:
 
2450
            response = self._call(
 
2451
                'Branch.lock_write', self._remote_path(), branch_token,
 
2452
                repo_token or '', **err_context)
 
2453
        except errors.LockContention, e:
 
2454
            # The LockContention from the server doesn't have any
 
2455
            # information about the lock_url. We re-raise LockContention
 
2456
            # with valid lock_url.
 
2457
            raise errors.LockContention('(remote lock)',
 
2458
                self.repository.base.split('.bzr/')[0])
2209
2459
        if response[0] != 'ok':
2210
2460
            raise errors.UnexpectedSmartServerResponse(response)
2211
2461
        ok, branch_token, repo_token = response
2213
2463
 
2214
2464
    def lock_write(self, token=None):
2215
2465
        if not self._lock_mode:
 
2466
            self._note_lock('w')
2216
2467
            # Lock the branch and repo in one remote call.
2217
2468
            remote_tokens = self._remote_lock_write(token)
2218
2469
            self._lock_token, self._repo_lock_token = remote_tokens
2231
2482
            self._lock_mode = 'w'
2232
2483
            self._lock_count = 1
2233
2484
        elif self._lock_mode == 'r':
2234
 
            raise errors.ReadOnlyTransaction
 
2485
            raise errors.ReadOnlyError(self)
2235
2486
        else:
2236
2487
            if token is not None:
2237
2488
                # A token was given to lock_write, and we're relocking, so
2242
2493
            self._lock_count += 1
2243
2494
            # Re-lock the repository too.
2244
2495
            self.repository.lock_write(self._repo_lock_token)
2245
 
        return self._lock_token or None
 
2496
        return BranchWriteLockResult(self.unlock, self._lock_token or None)
2246
2497
 
2247
2498
    def _unlock(self, branch_token, repo_token):
2248
2499
        err_context = {'token': str((branch_token, repo_token))}
2253
2504
            return
2254
2505
        raise errors.UnexpectedSmartServerResponse(response)
2255
2506
 
 
2507
    @only_raises(errors.LockNotHeld, errors.LockBroken)
2256
2508
    def unlock(self):
2257
2509
        try:
2258
2510
            self._lock_count -= 1
2298
2550
            raise NotImplementedError(self.dont_leave_lock_in_place)
2299
2551
        self._leave_lock = False
2300
2552
 
 
2553
    @needs_read_lock
2301
2554
    def get_rev_id(self, revno, history=None):
2302
2555
        if revno == 0:
2303
2556
            return _mod_revision.NULL_REVISION
2569
2822
        medium = self._branch._client._medium
2570
2823
        if medium._is_remote_before((1, 14)):
2571
2824
            return self._vfs_set_option(value, name, section)
 
2825
        if isinstance(value, dict):
 
2826
            if medium._is_remote_before((2, 2)):
 
2827
                return self._vfs_set_option(value, name, section)
 
2828
            return self._set_config_option_dict(value, name, section)
 
2829
        else:
 
2830
            return self._set_config_option(value, name, section)
 
2831
 
 
2832
    def _set_config_option(self, value, name, section):
2572
2833
        try:
2573
2834
            path = self._branch._remote_path()
2574
2835
            response = self._branch._client.call('Branch.set_config_option',
2575
2836
                path, self._branch._lock_token, self._branch._repo_lock_token,
2576
2837
                value.encode('utf8'), name, section or '')
2577
2838
        except errors.UnknownSmartMethod:
 
2839
            medium = self._branch._client._medium
2578
2840
            medium._remember_remote_is_before((1, 14))
2579
2841
            return self._vfs_set_option(value, name, section)
2580
2842
        if response != ():
2581
2843
            raise errors.UnexpectedSmartServerResponse(response)
2582
2844
 
 
2845
    def _serialize_option_dict(self, option_dict):
 
2846
        utf8_dict = {}
 
2847
        for key, value in option_dict.items():
 
2848
            if isinstance(key, unicode):
 
2849
                key = key.encode('utf8')
 
2850
            if isinstance(value, unicode):
 
2851
                value = value.encode('utf8')
 
2852
            utf8_dict[key] = value
 
2853
        return bencode.bencode(utf8_dict)
 
2854
 
 
2855
    def _set_config_option_dict(self, value, name, section):
 
2856
        try:
 
2857
            path = self._branch._remote_path()
 
2858
            serialised_dict = self._serialize_option_dict(value)
 
2859
            response = self._branch._client.call(
 
2860
                'Branch.set_config_option_dict',
 
2861
                path, self._branch._lock_token, self._branch._repo_lock_token,
 
2862
                serialised_dict, name, section or '')
 
2863
        except errors.UnknownSmartMethod:
 
2864
            medium = self._branch._client._medium
 
2865
            medium._remember_remote_is_before((2, 2))
 
2866
            return self._vfs_set_option(value, name, section)
 
2867
        if response != ():
 
2868
            raise errors.UnexpectedSmartServerResponse(response)
 
2869
 
2583
2870
    def _real_object(self):
2584
2871
        self._branch._ensure_real()
2585
2872
        return self._branch._real_branch
2668
2955
                    'Missing key %r in context %r', key_err.args[0], context)
2669
2956
                raise err
2670
2957
 
2671
 
    if err.error_verb == 'NoSuchRevision':
 
2958
    if err.error_verb == 'IncompatibleRepositories':
 
2959
        raise errors.IncompatibleRepositories(err.error_args[0],
 
2960
            err.error_args[1], err.error_args[2])
 
2961
    elif err.error_verb == 'NoSuchRevision':
2672
2962
        raise NoSuchRevision(find('branch'), err.error_args[0])
2673
2963
    elif err.error_verb == 'nosuchrevision':
2674
2964
        raise NoSuchRevision(find('repository'), err.error_args[0])
2675
 
    elif err.error_tuple == ('nobranch',):
2676
 
        raise errors.NotBranchError(path=find('bzrdir').root_transport.base)
 
2965
    elif err.error_verb == 'nobranch':
 
2966
        if len(err.error_args) >= 1:
 
2967
            extra = err.error_args[0]
 
2968
        else:
 
2969
            extra = None
 
2970
        raise errors.NotBranchError(path=find('bzrdir').root_transport.base,
 
2971
            detail=extra)
2677
2972
    elif err.error_verb == 'norepository':
2678
2973
        raise errors.NoRepositoryPresent(find('bzrdir'))
2679
2974
    elif err.error_verb == 'LockContention':