← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/remote.py

  • Committer: Max Bowsher
  • Date: 2011-08-23 09:29:27 UTC
  • mto: This revision was merged to the branch mainline in revision 6104.
  • Revision ID: _@maxb.eu-20110823092927-c7fnueriuunvv9mh
Per jam's review comments, get rid of features.meliae_feature, which is new in
2.5 and so will not be missed, assigning the corrected behaviour to the
features.meliae name.

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-2011 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
19
19
from bzrlib import (
20
20
    bencode,
21
21
    branch,
22
 
    bzrdir,
 
22
    bzrdir as _mod_bzrdir,
23
23
    config,
 
24
    controldir,
24
25
    debug,
25
26
    errors,
26
27
    graph,
27
28
    lock,
28
29
    lockdir,
29
 
    repository,
30
30
    repository as _mod_repository,
31
 
    revision,
32
31
    revision as _mod_revision,
33
32
    static_tuple,
34
33
    symbol_versioning,
35
 
)
36
 
from bzrlib.branch import BranchReferenceFormat
37
 
from bzrlib.bzrdir import BzrDir, RemoteBzrDirFormat
 
34
    urlutils,
 
35
    vf_repository,
 
36
    )
 
37
from bzrlib.branch import BranchReferenceFormat, BranchWriteLockResult
38
38
from bzrlib.decorators import needs_read_lock, needs_write_lock, only_raises
39
39
from bzrlib.errors import (
40
40
    NoSuchRevision,
42
42
    )
43
43
from bzrlib.lockable_files import LockableFiles
44
44
from bzrlib.smart import client, vfs, repository as smart_repo
45
 
from bzrlib.revision import ensure_null, NULL_REVISION
 
45
from bzrlib.smart.client import _SmartClient
 
46
from bzrlib.revision import NULL_REVISION
 
47
from bzrlib.repository import RepositoryWriteLockResult, _LazyListJoin
46
48
from bzrlib.trace import mutter, note, warning
47
49
 
48
50
 
86
88
    return format
87
89
 
88
90
 
89
 
# Note: RemoteBzrDirFormat is in bzrdir.py
90
 
 
91
 
class RemoteBzrDir(BzrDir, _RpcHelper):
 
91
# Note that RemoteBzrDirProber lives in bzrlib.bzrdir so bzrlib.remote
 
92
# does not have to be imported unless a remote format is involved.
 
93
 
 
94
class RemoteBzrDirFormat(_mod_bzrdir.BzrDirMetaFormat1):
 
95
    """Format representing bzrdirs accessed via a smart server"""
 
96
 
 
97
    supports_workingtrees = False
 
98
 
 
99
    def __init__(self):
 
100
        _mod_bzrdir.BzrDirMetaFormat1.__init__(self)
 
101
        # XXX: It's a bit ugly that the network name is here, because we'd
 
102
        # like to believe that format objects are stateless or at least
 
103
        # immutable,  However, we do at least avoid mutating the name after
 
104
        # it's returned.  See <https://bugs.launchpad.net/bzr/+bug/504102>
 
105
        self._network_name = None
 
106
 
 
107
    def __repr__(self):
 
108
        return "%s(_network_name=%r)" % (self.__class__.__name__,
 
109
            self._network_name)
 
110
 
 
111
    def get_format_description(self):
 
112
        if self._network_name:
 
113
            real_format = controldir.network_format_registry.get(self._network_name)
 
114
            return 'Remote: ' + real_format.get_format_description()
 
115
        return 'bzr remote bzrdir'
 
116
 
 
117
    def get_format_string(self):
 
118
        raise NotImplementedError(self.get_format_string)
 
119
 
 
120
    def network_name(self):
 
121
        if self._network_name:
 
122
            return self._network_name
 
123
        else:
 
124
            raise AssertionError("No network name set.")
 
125
 
 
126
    def initialize_on_transport(self, transport):
 
127
        try:
 
128
            # hand off the request to the smart server
 
129
            client_medium = transport.get_smart_medium()
 
130
        except errors.NoSmartMedium:
 
131
            # TODO: lookup the local format from a server hint.
 
132
            local_dir_format = _mod_bzrdir.BzrDirMetaFormat1()
 
133
            return local_dir_format.initialize_on_transport(transport)
 
134
        client = _SmartClient(client_medium)
 
135
        path = client.remote_path_from_transport(transport)
 
136
        try:
 
137
            response = client.call('BzrDirFormat.initialize', path)
 
138
        except errors.ErrorFromSmartServer, err:
 
139
            _translate_error(err, path=path)
 
140
        if response[0] != 'ok':
 
141
            raise errors.SmartProtocolError('unexpected response code %s' % (response,))
 
142
        format = RemoteBzrDirFormat()
 
143
        self._supply_sub_formats_to(format)
 
144
        return RemoteBzrDir(transport, format)
 
145
 
 
146
    def parse_NoneTrueFalse(self, arg):
 
147
        if not arg:
 
148
            return None
 
149
        if arg == 'False':
 
150
            return False
 
151
        if arg == 'True':
 
152
            return True
 
153
        raise AssertionError("invalid arg %r" % arg)
 
154
 
 
155
    def _serialize_NoneTrueFalse(self, arg):
 
156
        if arg is False:
 
157
            return 'False'
 
158
        if arg:
 
159
            return 'True'
 
160
        return ''
 
161
 
 
162
    def _serialize_NoneString(self, arg):
 
163
        return arg or ''
 
164
 
 
165
    def initialize_on_transport_ex(self, transport, use_existing_dir=False,
 
166
        create_prefix=False, force_new_repo=False, stacked_on=None,
 
167
        stack_on_pwd=None, repo_format_name=None, make_working_trees=None,
 
168
        shared_repo=False):
 
169
        try:
 
170
            # hand off the request to the smart server
 
171
            client_medium = transport.get_smart_medium()
 
172
        except errors.NoSmartMedium:
 
173
            do_vfs = True
 
174
        else:
 
175
            # Decline to open it if the server doesn't support our required
 
176
            # version (3) so that the VFS-based transport will do it.
 
177
            if client_medium.should_probe():
 
178
                try:
 
179
                    server_version = client_medium.protocol_version()
 
180
                    if server_version != '2':
 
181
                        do_vfs = True
 
182
                    else:
 
183
                        do_vfs = False
 
184
                except errors.SmartProtocolError:
 
185
                    # Apparently there's no usable smart server there, even though
 
186
                    # the medium supports the smart protocol.
 
187
                    do_vfs = True
 
188
            else:
 
189
                do_vfs = False
 
190
        if not do_vfs:
 
191
            client = _SmartClient(client_medium)
 
192
            path = client.remote_path_from_transport(transport)
 
193
            if client_medium._is_remote_before((1, 16)):
 
194
                do_vfs = True
 
195
        if do_vfs:
 
196
            # TODO: lookup the local format from a server hint.
 
197
            local_dir_format = _mod_bzrdir.BzrDirMetaFormat1()
 
198
            self._supply_sub_formats_to(local_dir_format)
 
199
            return local_dir_format.initialize_on_transport_ex(transport,
 
200
                use_existing_dir=use_existing_dir, create_prefix=create_prefix,
 
201
                force_new_repo=force_new_repo, stacked_on=stacked_on,
 
202
                stack_on_pwd=stack_on_pwd, repo_format_name=repo_format_name,
 
203
                make_working_trees=make_working_trees, shared_repo=shared_repo,
 
204
                vfs_only=True)
 
205
        return self._initialize_on_transport_ex_rpc(client, path, transport,
 
206
            use_existing_dir, create_prefix, force_new_repo, stacked_on,
 
207
            stack_on_pwd, repo_format_name, make_working_trees, shared_repo)
 
208
 
 
209
    def _initialize_on_transport_ex_rpc(self, client, path, transport,
 
210
        use_existing_dir, create_prefix, force_new_repo, stacked_on,
 
211
        stack_on_pwd, repo_format_name, make_working_trees, shared_repo):
 
212
        args = []
 
213
        args.append(self._serialize_NoneTrueFalse(use_existing_dir))
 
214
        args.append(self._serialize_NoneTrueFalse(create_prefix))
 
215
        args.append(self._serialize_NoneTrueFalse(force_new_repo))
 
216
        args.append(self._serialize_NoneString(stacked_on))
 
217
        # stack_on_pwd is often/usually our transport
 
218
        if stack_on_pwd:
 
219
            try:
 
220
                stack_on_pwd = transport.relpath(stack_on_pwd)
 
221
                if not stack_on_pwd:
 
222
                    stack_on_pwd = '.'
 
223
            except errors.PathNotChild:
 
224
                pass
 
225
        args.append(self._serialize_NoneString(stack_on_pwd))
 
226
        args.append(self._serialize_NoneString(repo_format_name))
 
227
        args.append(self._serialize_NoneTrueFalse(make_working_trees))
 
228
        args.append(self._serialize_NoneTrueFalse(shared_repo))
 
229
        request_network_name = self._network_name or \
 
230
            _mod_bzrdir.BzrDirFormat.get_default_format().network_name()
 
231
        try:
 
232
            response = client.call('BzrDirFormat.initialize_ex_1.16',
 
233
                request_network_name, path, *args)
 
234
        except errors.UnknownSmartMethod:
 
235
            client._medium._remember_remote_is_before((1,16))
 
236
            local_dir_format = _mod_bzrdir.BzrDirMetaFormat1()
 
237
            self._supply_sub_formats_to(local_dir_format)
 
238
            return local_dir_format.initialize_on_transport_ex(transport,
 
239
                use_existing_dir=use_existing_dir, create_prefix=create_prefix,
 
240
                force_new_repo=force_new_repo, stacked_on=stacked_on,
 
241
                stack_on_pwd=stack_on_pwd, repo_format_name=repo_format_name,
 
242
                make_working_trees=make_working_trees, shared_repo=shared_repo,
 
243
                vfs_only=True)
 
244
        except errors.ErrorFromSmartServer, err:
 
245
            _translate_error(err, path=path)
 
246
        repo_path = response[0]
 
247
        bzrdir_name = response[6]
 
248
        require_stacking = response[7]
 
249
        require_stacking = self.parse_NoneTrueFalse(require_stacking)
 
250
        format = RemoteBzrDirFormat()
 
251
        format._network_name = bzrdir_name
 
252
        self._supply_sub_formats_to(format)
 
253
        bzrdir = RemoteBzrDir(transport, format, _client=client)
 
254
        if repo_path:
 
255
            repo_format = response_tuple_to_repo_format(response[1:])
 
256
            if repo_path == '.':
 
257
                repo_path = ''
 
258
            if repo_path:
 
259
                repo_bzrdir_format = RemoteBzrDirFormat()
 
260
                repo_bzrdir_format._network_name = response[5]
 
261
                repo_bzr = RemoteBzrDir(transport.clone(repo_path),
 
262
                    repo_bzrdir_format)
 
263
            else:
 
264
                repo_bzr = bzrdir
 
265
            final_stack = response[8] or None
 
266
            final_stack_pwd = response[9] or None
 
267
            if final_stack_pwd:
 
268
                final_stack_pwd = urlutils.join(
 
269
                    transport.base, final_stack_pwd)
 
270
            remote_repo = RemoteRepository(repo_bzr, repo_format)
 
271
            if len(response) > 10:
 
272
                # Updated server verb that locks remotely.
 
273
                repo_lock_token = response[10] or None
 
274
                remote_repo.lock_write(repo_lock_token, _skip_rpc=True)
 
275
                if repo_lock_token:
 
276
                    remote_repo.dont_leave_lock_in_place()
 
277
            else:
 
278
                remote_repo.lock_write()
 
279
            policy = _mod_bzrdir.UseExistingRepository(remote_repo, final_stack,
 
280
                final_stack_pwd, require_stacking)
 
281
            policy.acquire_repository()
 
282
        else:
 
283
            remote_repo = None
 
284
            policy = None
 
285
        bzrdir._format.set_branch_format(self.get_branch_format())
 
286
        if require_stacking:
 
287
            # The repo has already been created, but we need to make sure that
 
288
            # we'll make a stackable branch.
 
289
            bzrdir._format.require_stacking(_skip_repo=True)
 
290
        return remote_repo, bzrdir, require_stacking, policy
 
291
 
 
292
    def _open(self, transport):
 
293
        return RemoteBzrDir(transport, self)
 
294
 
 
295
    def __eq__(self, other):
 
296
        if not isinstance(other, RemoteBzrDirFormat):
 
297
            return False
 
298
        return self.get_format_description() == other.get_format_description()
 
299
 
 
300
    def __return_repository_format(self):
 
301
        # Always return a RemoteRepositoryFormat object, but if a specific bzr
 
302
        # repository format has been asked for, tell the RemoteRepositoryFormat
 
303
        # that it should use that for init() etc.
 
304
        result = RemoteRepositoryFormat()
 
305
        custom_format = getattr(self, '_repository_format', None)
 
306
        if custom_format:
 
307
            if isinstance(custom_format, RemoteRepositoryFormat):
 
308
                return custom_format
 
309
            else:
 
310
                # We will use the custom format to create repositories over the
 
311
                # wire; expose its details like rich_root_data for code to
 
312
                # query
 
313
                result._custom_format = custom_format
 
314
        return result
 
315
 
 
316
    def get_branch_format(self):
 
317
        result = _mod_bzrdir.BzrDirMetaFormat1.get_branch_format(self)
 
318
        if not isinstance(result, RemoteBranchFormat):
 
319
            new_result = RemoteBranchFormat()
 
320
            new_result._custom_format = result
 
321
            # cache the result
 
322
            self.set_branch_format(new_result)
 
323
            result = new_result
 
324
        return result
 
325
 
 
326
    repository_format = property(__return_repository_format,
 
327
        _mod_bzrdir.BzrDirMetaFormat1._set_repository_format) #.im_func)
 
328
 
 
329
 
 
330
class RemoteBzrDir(_mod_bzrdir.BzrDir, _RpcHelper):
92
331
    """Control directory on a remote server, accessed via bzr:// or similar."""
93
332
 
94
333
    def __init__(self, transport, format, _client=None, _force_probe=False):
97
336
        :param _client: Private parameter for testing. Disables probing and the
98
337
            use of a real bzrdir.
99
338
        """
100
 
        BzrDir.__init__(self, transport, format)
 
339
        _mod_bzrdir.BzrDir.__init__(self, transport, format)
101
340
        # this object holds a delegated bzrdir that uses file-level operations
102
341
        # to talk to the other side
103
342
        self._real_bzrdir = None
163
402
                import traceback
164
403
                warning('VFS BzrDir access triggered\n%s',
165
404
                    ''.join(traceback.format_stack()))
166
 
            self._real_bzrdir = BzrDir.open_from_transport(
 
405
            self._real_bzrdir = _mod_bzrdir.BzrDir.open_from_transport(
167
406
                self.root_transport, _server_formats=False)
168
407
            self._format._network_name = \
169
408
                self._real_bzrdir._format.network_name()
175
414
        # Prevent aliasing problems in the next_open_branch_result cache.
176
415
        # See create_branch for rationale.
177
416
        self._next_open_branch_result = None
178
 
        return BzrDir.break_lock(self)
 
417
        return _mod_bzrdir.BzrDir.break_lock(self)
179
418
 
180
419
    def _vfs_cloning_metadir(self, require_stacking=False):
181
420
        self._ensure_real()
212
451
        if len(branch_info) != 2:
213
452
            raise errors.UnexpectedSmartServerResponse(response)
214
453
        branch_ref, branch_name = branch_info
215
 
        format = bzrdir.network_format_registry.get(control_name)
 
454
        format = controldir.network_format_registry.get(control_name)
216
455
        if repo_name:
217
 
            format.repository_format = repository.network_format_registry.get(
 
456
            format.repository_format = _mod_repository.network_format_registry.get(
218
457
                repo_name)
219
458
        if branch_ref == 'ref':
220
459
            # XXX: we need possible_transports here to avoid reopening the
221
460
            # connection to the referenced location
222
 
            ref_bzrdir = BzrDir.open(branch_name)
 
461
            ref_bzrdir = _mod_bzrdir.BzrDir.open(branch_name)
223
462
            branch_format = ref_bzrdir.cloning_metadir().get_branch_format()
224
463
            format.set_branch_format(branch_format)
225
464
        elif branch_ref == 'branch':
244
483
        self._ensure_real()
245
484
        self._real_bzrdir.destroy_repository()
246
485
 
247
 
    def create_branch(self, name=None):
 
486
    def create_branch(self, name=None, repository=None):
248
487
        # as per meta1 formats - just delegate to the format object which may
249
488
        # be parameterised.
250
489
        real_branch = self._format.get_branch_format().initialize(self,
251
 
            name=name)
 
490
            name=name, repository=repository)
252
491
        if not isinstance(real_branch, RemoteBranch):
253
 
            result = RemoteBranch(self, self.find_repository(), real_branch,
254
 
                                  name=name)
 
492
            if not isinstance(repository, RemoteRepository):
 
493
                raise AssertionError(
 
494
                    'need a RemoteRepository to use with RemoteBranch, got %r'
 
495
                    % (repository,))
 
496
            result = RemoteBranch(self, repository, real_branch, name=name)
255
497
        else:
256
498
            result = real_branch
257
499
        # BzrDir.clone_on_transport() uses the result of create_branch but does
269
511
        self._real_bzrdir.destroy_branch(name=name)
270
512
        self._next_open_branch_result = None
271
513
 
272
 
    def create_workingtree(self, revision_id=None, from_branch=None):
 
514
    def create_workingtree(self, revision_id=None, from_branch=None,
 
515
        accelerator_tree=None, hardlink=False):
273
516
        raise errors.NotLocalUrl(self.transport.base)
274
517
 
275
 
    def find_branch_format(self):
 
518
    def find_branch_format(self, name=None):
276
519
        """Find the branch 'format' for this bzrdir.
277
520
 
278
521
        This might be a synthetic object for e.g. RemoteBranch and SVN.
279
522
        """
280
 
        b = self.open_branch()
 
523
        b = self.open_branch(name=name)
281
524
        return b._format
282
525
 
283
 
    def get_branch_reference(self):
 
526
    def get_branch_reference(self, name=None):
284
527
        """See BzrDir.get_branch_reference()."""
 
528
        if name is not None:
 
529
            # XXX JRV20100304: Support opening colocated branches
 
530
            raise errors.NoColocatedBranchSupport(self)
285
531
        response = self._get_branch_reference()
286
532
        if response[0] == 'ref':
287
533
            return response[1]
318
564
            raise errors.UnexpectedSmartServerResponse(response)
319
565
        return response
320
566
 
321
 
    def _get_tree_branch(self):
 
567
    def _get_tree_branch(self, name=None):
322
568
        """See BzrDir._get_tree_branch()."""
323
 
        return None, self.open_branch()
 
569
        return None, self.open_branch(name=name)
324
570
 
325
571
    def open_branch(self, name=None, unsupported=False,
326
572
                    ignore_fallbacks=False):
423
669
 
424
670
    def _path_for_remote_call(self, client):
425
671
        """Return the path to be used for this bzrdir in a remote call."""
426
 
        return client.remote_path_from_transport(self.root_transport)
 
672
        return urlutils.split_segment_parameters_raw(
 
673
            client.remote_path_from_transport(self.root_transport))[0]
427
674
 
428
675
    def get_branch_transport(self, branch_format, name=None):
429
676
        self._ensure_real()
441
688
        """Upgrading of remote bzrdirs is not supported yet."""
442
689
        return False
443
690
 
444
 
    def needs_format_conversion(self, format=None):
 
691
    def needs_format_conversion(self, format):
445
692
        """Upgrading of remote bzrdirs is not supported yet."""
446
 
        if format is None:
447
 
            symbol_versioning.warn(symbol_versioning.deprecated_in((1, 13, 0))
448
 
                % 'needs_format_conversion(format=None)')
449
693
        return False
450
694
 
451
695
    def clone(self, url, revision_id=None, force_new_repo=False,
458
702
        return RemoteBzrDirConfig(self)
459
703
 
460
704
 
461
 
class RemoteRepositoryFormat(repository.RepositoryFormat):
 
705
class RemoteRepositoryFormat(vf_repository.VersionedFileRepositoryFormat):
462
706
    """Format for repositories accessed over a _SmartClient.
463
707
 
464
708
    Instances of this repository are represented by RemoteRepository
479
723
    """
480
724
 
481
725
    _matchingbzrdir = RemoteBzrDirFormat()
 
726
    supports_full_versioned_files = True
 
727
    supports_leaving_lock = True
482
728
 
483
729
    def __init__(self):
484
 
        repository.RepositoryFormat.__init__(self)
 
730
        _mod_repository.RepositoryFormat.__init__(self)
485
731
        self._custom_format = None
486
732
        self._network_name = None
487
733
        self._creating_bzrdir = None
 
734
        self._revision_graph_can_have_wrong_parents = None
488
735
        self._supports_chks = None
489
736
        self._supports_external_lookups = None
490
737
        self._supports_tree_reference = None
 
738
        self._supports_funky_characters = None
491
739
        self._rich_root_data = None
492
740
 
493
741
    def __repr__(self):
522
770
        return self._supports_external_lookups
523
771
 
524
772
    @property
 
773
    def supports_funky_characters(self):
 
774
        if self._supports_funky_characters is None:
 
775
            self._ensure_real()
 
776
            self._supports_funky_characters = \
 
777
                self._custom_format.supports_funky_characters
 
778
        return self._supports_funky_characters
 
779
 
 
780
    @property
525
781
    def supports_tree_reference(self):
526
782
        if self._supports_tree_reference is None:
527
783
            self._ensure_real()
529
785
                self._custom_format.supports_tree_reference
530
786
        return self._supports_tree_reference
531
787
 
 
788
    @property
 
789
    def revision_graph_can_have_wrong_parents(self):
 
790
        if self._revision_graph_can_have_wrong_parents is None:
 
791
            self._ensure_real()
 
792
            self._revision_graph_can_have_wrong_parents = \
 
793
                self._custom_format.revision_graph_can_have_wrong_parents
 
794
        return self._revision_graph_can_have_wrong_parents
 
795
 
532
796
    def _vfs_initialize(self, a_bzrdir, shared):
533
797
        """Helper for common code in initialize."""
534
798
        if self._custom_format:
569
833
            network_name = self._network_name
570
834
        else:
571
835
            # Select the current bzrlib default and ask for that.
572
 
            reference_bzrdir_format = bzrdir.format_registry.get('default')()
 
836
            reference_bzrdir_format = _mod_bzrdir.format_registry.get('default')()
573
837
            reference_format = reference_bzrdir_format.repository_format
574
838
            network_name = reference_format.network_name()
575
839
        # 2) try direct creation via RPC
601
865
 
602
866
    def _ensure_real(self):
603
867
        if self._custom_format is None:
604
 
            self._custom_format = repository.network_format_registry.get(
 
868
            self._custom_format = _mod_repository.network_format_registry.get(
605
869
                self._network_name)
606
870
 
607
871
    @property
644
908
 
645
909
 
646
910
class RemoteRepository(_RpcHelper, lock._RelockDebugMixin,
647
 
    bzrdir.ControlComponent):
 
911
    controldir.ControlComponent):
648
912
    """Repository accessed over rpc.
649
913
 
650
914
    For the moment most operations are performed using local transport-backed
703
967
        # transport, but I'm not sure it's worth making this method
704
968
        # optional -- mbp 2010-04-21
705
969
        return self.bzrdir.get_repository_transport(None)
706
 
        
 
970
 
707
971
    def __str__(self):
708
972
        return "%s(%s)" % (self.__class__.__name__, self.base)
709
973
 
817
1081
    def find_text_key_references(self):
818
1082
        """Find the text key references within the repository.
819
1083
 
820
 
        :return: a dictionary mapping (file_id, revision_id) tuples to altered file-ids to an iterable of
821
 
        revision_ids. Each altered file-ids has the exact revision_ids that
822
 
        altered it listed explicitly.
823
1084
        :return: A dictionary mapping text keys ((fileid, revision_id) tuples)
824
1085
            to whether they were referred to by the inventory of the
825
1086
            revision_id that they contain. The inventory texts from all present
843
1104
        """Private method for using with old (< 1.2) servers to fallback."""
844
1105
        if revision_id is None:
845
1106
            revision_id = ''
846
 
        elif revision.is_null(revision_id):
 
1107
        elif _mod_revision.is_null(revision_id):
847
1108
            return {}
848
1109
 
849
1110
        path = self.bzrdir._path_for_remote_call(self._client)
873
1134
        return RemoteStreamSource(self, to_format)
874
1135
 
875
1136
    @needs_read_lock
 
1137
    def get_file_graph(self):
 
1138
        return graph.Graph(self.texts)
 
1139
 
 
1140
    @needs_read_lock
876
1141
    def has_revision(self, revision_id):
877
1142
        """True if this repository has a copy of the revision."""
878
1143
        # Copy of bzrlib.repository.Repository.has_revision
895
1160
    def _has_same_fallbacks(self, other_repo):
896
1161
        """Returns true if the repositories have the same fallbacks."""
897
1162
        # XXX: copied from Repository; it should be unified into a base class
898
 
        # <https://bugs.edge.launchpad.net/bzr/+bug/401622>
 
1163
        # <https://bugs.launchpad.net/bzr/+bug/401622>
899
1164
        my_fb = self._fallback_repositories
900
1165
        other_fb = other_repo._fallback_repositories
901
1166
        if len(my_fb) != len(other_fb):
930
1195
        """See Repository.gather_stats()."""
931
1196
        path = self.bzrdir._path_for_remote_call(self._client)
932
1197
        # revid can be None to indicate no revisions, not just NULL_REVISION
933
 
        if revid is None or revision.is_null(revid):
 
1198
        if revid is None or _mod_revision.is_null(revid):
934
1199
            fmt_revid = ''
935
1200
        else:
936
1201
            fmt_revid = revid
997
1262
        pass
998
1263
 
999
1264
    def lock_read(self):
 
1265
        """Lock the repository for read operations.
 
1266
 
 
1267
        :return: A bzrlib.lock.LogicalLockResult.
 
1268
        """
1000
1269
        # wrong eventually - want a local lock cache context
1001
1270
        if not self._lock_mode:
1002
1271
            self._note_lock('r')
1009
1278
                repo.lock_read()
1010
1279
        else:
1011
1280
            self._lock_count += 1
 
1281
        return lock.LogicalLockResult(self.unlock)
1012
1282
 
1013
1283
    def _remote_lock_write(self, token):
1014
1284
        path = self.bzrdir._path_for_remote_call(self._client)
1054
1324
            raise errors.ReadOnlyError(self)
1055
1325
        else:
1056
1326
            self._lock_count += 1
1057
 
        return self._lock_token or None
 
1327
        return RepositoryWriteLockResult(self.unlock, self._lock_token or None)
1058
1328
 
1059
1329
    def leave_lock_in_place(self):
1060
1330
        if not self._lock_token:
1214
1484
 
1215
1485
    def get_commit_builder(self, branch, parents, config, timestamp=None,
1216
1486
                           timezone=None, committer=None, revprops=None,
1217
 
                           revision_id=None):
 
1487
                           revision_id=None, lossy=False):
1218
1488
        # FIXME: It ought to be possible to call this without immediately
1219
1489
        # triggering _ensure_real.  For now it's the easiest thing to do.
1220
1490
        self._ensure_real()
1221
1491
        real_repo = self._real_repository
1222
1492
        builder = real_repo.get_commit_builder(branch, parents,
1223
1493
                config, timestamp=timestamp, timezone=timezone,
1224
 
                committer=committer, revprops=revprops, revision_id=revision_id)
 
1494
                committer=committer, revprops=revprops,
 
1495
                revision_id=revision_id, lossy=lossy)
1225
1496
        return builder
1226
1497
 
1227
1498
    def add_fallback_repository(self, repository):
1306
1577
        return self._real_repository.make_working_trees()
1307
1578
 
1308
1579
    def refresh_data(self):
1309
 
        """Re-read any data needed to to synchronise with disk.
 
1580
        """Re-read any data needed to synchronise with disk.
1310
1581
 
1311
1582
        This method is intended to be called after another repository instance
1312
1583
        (such as one used by a smart server) has inserted data into the
1313
 
        repository. It may not be called during a write group, but may be
1314
 
        called at any other time.
 
1584
        repository. On all repositories this will work outside of write groups.
 
1585
        Some repository formats (pack and newer for bzrlib native formats)
 
1586
        support refresh_data inside write groups. If called inside a write
 
1587
        group on a repository that does not support refreshing in a write group
 
1588
        IsInWriteGroupError will be raised.
1315
1589
        """
1316
 
        if self.is_in_write_group():
1317
 
            raise errors.InternalBzrError(
1318
 
                "May not refresh_data while in a write group.")
1319
1590
        if self._real_repository is not None:
1320
1591
            self._real_repository.refresh_data()
1321
1592
 
1333
1604
        return result
1334
1605
 
1335
1606
    @needs_read_lock
1336
 
    def search_missing_revision_ids(self, other, revision_id=None, find_ghosts=True):
 
1607
    def search_missing_revision_ids(self, other,
 
1608
            revision_id=symbol_versioning.DEPRECATED_PARAMETER,
 
1609
            find_ghosts=True, revision_ids=None, if_present_ids=None,
 
1610
            limit=None):
1337
1611
        """Return the revision ids that other has that this does not.
1338
1612
 
1339
1613
        These are returned in topological order.
1340
1614
 
1341
1615
        revision_id: only return revision ids included by revision_id.
1342
1616
        """
1343
 
        return repository.InterRepository.get(
1344
 
            other, self).search_missing_revision_ids(revision_id, find_ghosts)
 
1617
        if symbol_versioning.deprecated_passed(revision_id):
 
1618
            symbol_versioning.warn(
 
1619
                'search_missing_revision_ids(revision_id=...) was '
 
1620
                'deprecated in 2.4.  Use revision_ids=[...] instead.',
 
1621
                DeprecationWarning, stacklevel=2)
 
1622
            if revision_ids is not None:
 
1623
                raise AssertionError(
 
1624
                    'revision_ids is mutually exclusive with revision_id')
 
1625
            if revision_id is not None:
 
1626
                revision_ids = [revision_id]
 
1627
        inter_repo = _mod_repository.InterRepository.get(other, self)
 
1628
        return inter_repo.search_missing_revision_ids(
 
1629
            find_ghosts=find_ghosts, revision_ids=revision_ids,
 
1630
            if_present_ids=if_present_ids, limit=limit)
1345
1631
 
1346
 
    def fetch(self, source, revision_id=None, pb=None, find_ghosts=False,
 
1632
    def fetch(self, source, revision_id=None, find_ghosts=False,
1347
1633
            fetch_spec=None):
1348
1634
        # No base implementation to use as RemoteRepository is not a subclass
1349
1635
        # of Repository; so this is a copy of Repository.fetch().
1360
1646
            # check that last_revision is in 'from' and then return a
1361
1647
            # no-operation.
1362
1648
            if (revision_id is not None and
1363
 
                not revision.is_null(revision_id)):
 
1649
                not _mod_revision.is_null(revision_id)):
1364
1650
                self.get_revision(revision_id)
1365
1651
            return 0, []
1366
1652
        # if there is no specific appropriate InterRepository, this will get
1367
1653
        # the InterRepository base class, which raises an
1368
1654
        # IncompatibleRepositories when asked to fetch.
1369
 
        inter = repository.InterRepository.get(source, self)
1370
 
        return inter.fetch(revision_id=revision_id, pb=pb,
 
1655
        inter = _mod_repository.InterRepository.get(source, self)
 
1656
        return inter.fetch(revision_id=revision_id,
1371
1657
            find_ghosts=find_ghosts, fetch_spec=fetch_spec)
1372
1658
 
1373
1659
    def create_bundle(self, target, base, fileobj, format=None):
1375
1661
        self._real_repository.create_bundle(target, base, fileobj, format)
1376
1662
 
1377
1663
    @needs_read_lock
 
1664
    @symbol_versioning.deprecated_method(
 
1665
        symbol_versioning.deprecated_in((2, 4, 0)))
1378
1666
    def get_ancestry(self, revision_id, topo_sorted=True):
1379
1667
        self._ensure_real()
1380
1668
        return self._real_repository.get_ancestry(revision_id, topo_sorted)
1597
1885
            tmpdir = osutils.mkdtemp()
1598
1886
            try:
1599
1887
                _extract_tar(tar, tmpdir)
1600
 
                tmp_bzrdir = BzrDir.open(tmpdir)
 
1888
                tmp_bzrdir = _mod_bzrdir.BzrDir.open(tmpdir)
1601
1889
                tmp_repo = tmp_bzrdir.open_repository()
1602
1890
                tmp_repo.copy_content_into(destination, revision_id)
1603
1891
            finally:
1688
1976
    def supports_rich_root(self):
1689
1977
        return self._format.rich_root_data
1690
1978
 
 
1979
    @symbol_versioning.deprecated_method(symbol_versioning.deprecated_in((2, 4, 0)))
1691
1980
    def iter_reverse_revision_history(self, revision_id):
1692
1981
        self._ensure_real()
1693
1982
        return self._real_repository.iter_reverse_revision_history(revision_id)
1714
2003
        return self._real_repository.item_keys_introduced_by(revision_ids,
1715
2004
            _files_pb=_files_pb)
1716
2005
 
1717
 
    def revision_graph_can_have_wrong_parents(self):
1718
 
        # The answer depends on the remote repo format.
1719
 
        self._ensure_real()
1720
 
        return self._real_repository.revision_graph_can_have_wrong_parents()
1721
 
 
1722
2006
    def _find_inconsistent_revision_parents(self, revisions_iterator=None):
1723
2007
        self._ensure_real()
1724
2008
        return self._real_repository._find_inconsistent_revision_parents(
1732
2016
        providers = [self._unstacked_provider]
1733
2017
        if other is not None:
1734
2018
            providers.insert(0, other)
1735
 
        providers.extend(r._make_parents_provider() for r in
1736
 
                         self._fallback_repositories)
1737
 
        return graph.StackedParentsProvider(providers)
 
2019
        return graph.StackedParentsProvider(_LazyListJoin(
 
2020
            providers, self._fallback_repositories))
1738
2021
 
1739
2022
    def _serialise_search_recipe(self, recipe):
1740
2023
        """Serialise a graph search recipe.
1748
2031
        return '\n'.join((start_keys, stop_keys, count))
1749
2032
 
1750
2033
    def _serialise_search_result(self, search_result):
1751
 
        if isinstance(search_result, graph.PendingAncestryResult):
1752
 
            parts = ['ancestry-of']
1753
 
            parts.extend(search_result.heads)
1754
 
        else:
1755
 
            recipe = search_result.get_recipe()
1756
 
            parts = [recipe[0], self._serialise_search_recipe(recipe)]
 
2034
        parts = search_result.get_network_struct()
1757
2035
        return '\n'.join(parts)
1758
2036
 
1759
2037
    def autopack(self):
1769
2047
            raise errors.UnexpectedSmartServerResponse(response)
1770
2048
 
1771
2049
 
1772
 
class RemoteStreamSink(repository.StreamSink):
 
2050
class RemoteStreamSink(vf_repository.StreamSink):
1773
2051
 
1774
2052
    def _insert_real(self, stream, src_format, resume_tokens):
1775
2053
        self.target_repo._ensure_real()
1876
2154
        self._last_substream and self._last_stream so that the stream can be
1877
2155
        resumed by _resume_stream_with_vfs.
1878
2156
        """
1879
 
                    
 
2157
 
1880
2158
        stream_iter = iter(stream)
1881
2159
        for substream_kind, substream in stream_iter:
1882
2160
            if substream_kind == 'inventory-deltas':
1885
2163
                return
1886
2164
            else:
1887
2165
                yield substream_kind, substream
1888
 
            
1889
 
 
1890
 
class RemoteStreamSource(repository.StreamSource):
 
2166
 
 
2167
 
 
2168
class RemoteStreamSource(vf_repository.StreamSource):
1891
2169
    """Stream data from a remote server."""
1892
2170
 
1893
2171
    def get_stream(self, search):
1953
2231
        candidate_verbs = [
1954
2232
            ('Repository.get_stream_1.19', (1, 19)),
1955
2233
            ('Repository.get_stream', (1, 13))]
 
2234
 
1956
2235
        found_verb = False
1957
2236
        for verb, version in candidate_verbs:
1958
2237
            if medium._is_remote_before(version):
1962
2241
                    verb, args, search_bytes)
1963
2242
            except errors.UnknownSmartMethod:
1964
2243
                medium._remember_remote_is_before(version)
 
2244
            except errors.UnknownErrorFromSmartServer, e:
 
2245
                if isinstance(search, graph.EverythingResult):
 
2246
                    error_verb = e.error_from_smart_server.error_verb
 
2247
                    if error_verb == 'BadSearch':
 
2248
                        # Pre-2.4 servers don't support this sort of search.
 
2249
                        # XXX: perhaps falling back to VFS on BadSearch is a
 
2250
                        # good idea in general?  It might provide a little bit
 
2251
                        # of protection against client-side bugs.
 
2252
                        medium._remember_remote_is_before((2, 4))
 
2253
                        break
 
2254
                raise
1965
2255
            else:
1966
2256
                response_tuple, response_handler = response
1967
2257
                found_verb = True
1971
2261
        if response_tuple[0] != 'ok':
1972
2262
            raise errors.UnexpectedSmartServerResponse(response_tuple)
1973
2263
        byte_stream = response_handler.read_streamed_body()
1974
 
        src_format, stream = smart_repo._byte_stream_to_stream(byte_stream)
 
2264
        src_format, stream = smart_repo._byte_stream_to_stream(byte_stream,
 
2265
            self._record_counter)
1975
2266
        if src_format.network_name() != repo._format.network_name():
1976
2267
            raise AssertionError(
1977
2268
                "Mismatched RemoteRepository and stream src %r, %r" % (
2081
2372
                                  name=name)
2082
2373
        return result
2083
2374
 
2084
 
    def initialize(self, a_bzrdir, name=None):
 
2375
    def initialize(self, a_bzrdir, name=None, repository=None):
2085
2376
        # 1) get the network name to use.
2086
2377
        if self._custom_format:
2087
2378
            network_name = self._custom_format.network_name()
2088
2379
        else:
2089
2380
            # Select the current bzrlib default and ask for that.
2090
 
            reference_bzrdir_format = bzrdir.format_registry.get('default')()
 
2381
            reference_bzrdir_format = _mod_bzrdir.format_registry.get('default')()
2091
2382
            reference_format = reference_bzrdir_format.get_branch_format()
2092
2383
            self._custom_format = reference_format
2093
2384
            network_name = reference_format.network_name()
2115
2406
        # Turn the response into a RemoteRepository object.
2116
2407
        format = RemoteBranchFormat(network_name=response[1])
2117
2408
        repo_format = response_tuple_to_repo_format(response[3:])
2118
 
        if response[2] == '':
2119
 
            repo_bzrdir = a_bzrdir
 
2409
        repo_path = response[2]
 
2410
        if repository is not None:
 
2411
            remote_repo_url = urlutils.join(a_bzrdir.user_url, repo_path)
 
2412
            url_diff = urlutils.relative_url(repository.user_url,
 
2413
                    remote_repo_url)
 
2414
            if url_diff != '.':
 
2415
                raise AssertionError(
 
2416
                    'repository.user_url %r does not match URL from server '
 
2417
                    'response (%r + %r)'
 
2418
                    % (repository.user_url, a_bzrdir.user_url, repo_path))
 
2419
            remote_repo = repository
2120
2420
        else:
2121
 
            repo_bzrdir = RemoteBzrDir(
2122
 
                a_bzrdir.root_transport.clone(response[2]), a_bzrdir._format,
2123
 
                a_bzrdir._client)
2124
 
        remote_repo = RemoteRepository(repo_bzrdir, repo_format)
 
2421
            if repo_path == '':
 
2422
                repo_bzrdir = a_bzrdir
 
2423
            else:
 
2424
                repo_bzrdir = RemoteBzrDir(
 
2425
                    a_bzrdir.root_transport.clone(repo_path), a_bzrdir._format,
 
2426
                    a_bzrdir._client)
 
2427
            remote_repo = RemoteRepository(repo_bzrdir, repo_format)
2125
2428
        remote_branch = RemoteBranch(a_bzrdir, remote_repo,
2126
2429
            format=format, setup_stacking=False, name=name)
2127
2430
        # XXX: We know this is a new branch, so it must have revno 0, revid
2148
2451
        self._ensure_real()
2149
2452
        return self._custom_format.supports_set_append_revisions_only()
2150
2453
 
 
2454
    def _use_default_local_heads_to_fetch(self):
 
2455
        # If the branch format is a metadir format *and* its heads_to_fetch
 
2456
        # implementation is not overridden vs the base class, we can use the
 
2457
        # base class logic rather than use the heads_to_fetch RPC.  This is
 
2458
        # usually cheaper in terms of net round trips, as the last-revision and
 
2459
        # tags info fetched is cached and would be fetched anyway.
 
2460
        self._ensure_real()
 
2461
        if isinstance(self._custom_format, branch.BranchFormatMetadir):
 
2462
            branch_class = self._custom_format._branch_class()
 
2463
            heads_to_fetch_impl = branch_class.heads_to_fetch.im_func
 
2464
            if heads_to_fetch_impl is branch.Branch.heads_to_fetch.im_func:
 
2465
                return True
 
2466
        return False
2151
2467
 
2152
2468
class RemoteBranch(branch.Branch, _RpcHelper, lock._RelockDebugMixin):
2153
2469
    """Branch stored on a server accessed by HPSS RPC.
2352
2668
            self._is_stacked = False
2353
2669
        else:
2354
2670
            self._is_stacked = True
2355
 
        
 
2671
 
2356
2672
    def _vfs_get_tags_bytes(self):
2357
2673
        self._ensure_real()
2358
2674
        return self._real_branch._get_tags_bytes()
2359
2675
 
 
2676
    @needs_read_lock
2360
2677
    def _get_tags_bytes(self):
 
2678
        if self._tags_bytes is None:
 
2679
            self._tags_bytes = self._get_tags_bytes_via_hpss()
 
2680
        return self._tags_bytes
 
2681
 
 
2682
    def _get_tags_bytes_via_hpss(self):
2361
2683
        medium = self._client._medium
2362
2684
        if medium._is_remote_before((1, 13)):
2363
2685
            return self._vfs_get_tags_bytes()
2373
2695
        return self._real_branch._set_tags_bytes(bytes)
2374
2696
 
2375
2697
    def _set_tags_bytes(self, bytes):
 
2698
        if self.is_locked():
 
2699
            self._tags_bytes = bytes
2376
2700
        medium = self._client._medium
2377
2701
        if medium._is_remote_before((1, 18)):
2378
2702
            self._vfs_set_tags_bytes(bytes)
2387
2711
            self._vfs_set_tags_bytes(bytes)
2388
2712
 
2389
2713
    def lock_read(self):
 
2714
        """Lock the branch for read operations.
 
2715
 
 
2716
        :return: A bzrlib.lock.LogicalLockResult.
 
2717
        """
2390
2718
        self.repository.lock_read()
2391
2719
        if not self._lock_mode:
2392
2720
            self._note_lock('r')
2396
2724
                self._real_branch.lock_read()
2397
2725
        else:
2398
2726
            self._lock_count += 1
 
2727
        return lock.LogicalLockResult(self.unlock)
2399
2728
 
2400
2729
    def _remote_lock_write(self, token):
2401
2730
        if token is None:
2402
2731
            branch_token = repo_token = ''
2403
2732
        else:
2404
2733
            branch_token = token
2405
 
            repo_token = self.repository.lock_write()
 
2734
            repo_token = self.repository.lock_write().repository_token
2406
2735
            self.repository.unlock()
2407
2736
        err_context = {'token': token}
2408
 
        response = self._call(
2409
 
            'Branch.lock_write', self._remote_path(), branch_token,
2410
 
            repo_token or '', **err_context)
 
2737
        try:
 
2738
            response = self._call(
 
2739
                'Branch.lock_write', self._remote_path(), branch_token,
 
2740
                repo_token or '', **err_context)
 
2741
        except errors.LockContention, e:
 
2742
            # The LockContention from the server doesn't have any
 
2743
            # information about the lock_url. We re-raise LockContention
 
2744
            # with valid lock_url.
 
2745
            raise errors.LockContention('(remote lock)',
 
2746
                self.repository.base.split('.bzr/')[0])
2411
2747
        if response[0] != 'ok':
2412
2748
            raise errors.UnexpectedSmartServerResponse(response)
2413
2749
        ok, branch_token, repo_token = response
2434
2770
            self._lock_mode = 'w'
2435
2771
            self._lock_count = 1
2436
2772
        elif self._lock_mode == 'r':
2437
 
            raise errors.ReadOnlyTransaction
 
2773
            raise errors.ReadOnlyError(self)
2438
2774
        else:
2439
2775
            if token is not None:
2440
2776
                # A token was given to lock_write, and we're relocking, so
2445
2781
            self._lock_count += 1
2446
2782
            # Re-lock the repository too.
2447
2783
            self.repository.lock_write(self._repo_lock_token)
2448
 
        return self._lock_token or None
 
2784
        return BranchWriteLockResult(self.unlock, self._lock_token or None)
2449
2785
 
2450
2786
    def _unlock(self, branch_token, repo_token):
2451
2787
        err_context = {'token': str((branch_token, repo_token))}
2520
2856
            missing_parent = parent_map[missing_parent]
2521
2857
        raise errors.RevisionNotPresent(missing_parent, self.repository)
2522
2858
 
2523
 
    def _last_revision_info(self):
 
2859
    def _read_last_revision_info(self):
2524
2860
        response = self._call('Branch.last_revision_info', self._remote_path())
2525
2861
        if response[0] != 'ok':
2526
2862
            raise SmartProtocolError('unexpected response code %s' % (response,))
2589
2925
            raise errors.UnexpectedSmartServerResponse(response)
2590
2926
        self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2591
2927
 
 
2928
    @symbol_versioning.deprecated_method(symbol_versioning.deprecated_in((2, 4, 0)))
2592
2929
    @needs_write_lock
2593
2930
    def set_revision_history(self, rev_history):
 
2931
        """See Branch.set_revision_history."""
 
2932
        self._set_revision_history(rev_history)
 
2933
 
 
2934
    @needs_write_lock
 
2935
    def _set_revision_history(self, rev_history):
2594
2936
        # Send just the tip revision of the history; the server will generate
2595
2937
        # the full history from that.  If the revision doesn't exist in this
2596
2938
        # branch, NoSuchRevision will be raised.
2654
2996
            _override_hook_target=self, **kwargs)
2655
2997
 
2656
2998
    @needs_read_lock
2657
 
    def push(self, target, overwrite=False, stop_revision=None):
 
2999
    def push(self, target, overwrite=False, stop_revision=None, lossy=False):
2658
3000
        self._ensure_real()
2659
3001
        return self._real_branch.push(
2660
 
            target, overwrite=overwrite, stop_revision=stop_revision,
 
3002
            target, overwrite=overwrite, stop_revision=stop_revision, lossy=lossy,
2661
3003
            _override_hook_source_branch=self)
2662
3004
 
2663
3005
    def is_locked(self):
2673
3015
        # XXX: These should be returned by the set_last_revision_info verb
2674
3016
        old_revno, old_revid = self.last_revision_info()
2675
3017
        self._run_pre_change_branch_tip_hooks(revno, revision_id)
2676
 
        revision_id = ensure_null(revision_id)
 
3018
        if not revision_id or not isinstance(revision_id, basestring):
 
3019
            raise errors.InvalidRevisionId(revision_id=revision_id, branch=self)
2677
3020
        try:
2678
3021
            response = self._call('Branch.set_last_revision_info',
2679
3022
                self._remote_path(), self._lock_token, self._repo_lock_token,
2708
3051
            except errors.UnknownSmartMethod:
2709
3052
                medium._remember_remote_is_before((1, 6))
2710
3053
        self._clear_cached_state_of_remote_branch_only()
2711
 
        self.set_revision_history(self._lefthand_history(revision_id,
 
3054
        self._set_revision_history(self._lefthand_history(revision_id,
2712
3055
            last_rev=last_rev,other_branch=other_branch))
2713
3056
 
2714
3057
    def set_push_location(self, location):
2715
3058
        self._ensure_real()
2716
3059
        return self._real_branch.set_push_location(location)
2717
3060
 
 
3061
    def heads_to_fetch(self):
 
3062
        if self._format._use_default_local_heads_to_fetch():
 
3063
            # We recognise this format, and its heads-to-fetch implementation
 
3064
            # is the default one (tip + tags).  In this case it's cheaper to
 
3065
            # just use the default implementation rather than a special RPC as
 
3066
            # the tip and tags data is cached.
 
3067
            return branch.Branch.heads_to_fetch(self)
 
3068
        medium = self._client._medium
 
3069
        if medium._is_remote_before((2, 4)):
 
3070
            return self._vfs_heads_to_fetch()
 
3071
        try:
 
3072
            return self._rpc_heads_to_fetch()
 
3073
        except errors.UnknownSmartMethod:
 
3074
            medium._remember_remote_is_before((2, 4))
 
3075
            return self._vfs_heads_to_fetch()
 
3076
 
 
3077
    def _rpc_heads_to_fetch(self):
 
3078
        response = self._call('Branch.heads_to_fetch', self._remote_path())
 
3079
        if len(response) != 2:
 
3080
            raise errors.UnexpectedSmartServerResponse(response)
 
3081
        must_fetch, if_present_fetch = response
 
3082
        return set(must_fetch), set(if_present_fetch)
 
3083
 
 
3084
    def _vfs_heads_to_fetch(self):
 
3085
        self._ensure_real()
 
3086
        return self._real_branch.heads_to_fetch()
 
3087
 
2718
3088
 
2719
3089
class RemoteConfig(object):
2720
3090
    """A Config that reads and writes from smart verbs.
2734
3104
        """
2735
3105
        try:
2736
3106
            configobj = self._get_configobj()
 
3107
            section_obj = None
2737
3108
            if section is None:
2738
3109
                section_obj = configobj
2739
3110
            else:
2740
3111
                try:
2741
3112
                    section_obj = configobj[section]
2742
3113
                except KeyError:
2743
 
                    return default
2744
 
            return section_obj.get(name, default)
 
3114
                    pass
 
3115
            if section_obj is None:
 
3116
                value = default
 
3117
            else:
 
3118
                value = section_obj.get(name, default)
2745
3119
        except errors.UnknownSmartMethod:
2746
 
            return self._vfs_get_option(name, section, default)
 
3120
            value = self._vfs_get_option(name, section, default)
 
3121
        for hook in config.OldConfigHooks['get']:
 
3122
            hook(self, name, value)
 
3123
        return value
2747
3124
 
2748
3125
    def _response_to_configobj(self, response):
2749
3126
        if len(response[0]) and response[0][0] != 'ok':
2750
3127
            raise errors.UnexpectedSmartServerResponse(response)
2751
3128
        lines = response[1].read_body_bytes().splitlines()
2752
 
        return config.ConfigObj(lines, encoding='utf-8')
 
3129
        conf = config.ConfigObj(lines, encoding='utf-8')
 
3130
        for hook in config.OldConfigHooks['load']:
 
3131
            hook(self)
 
3132
        return conf
2753
3133
 
2754
3134
 
2755
3135
class RemoteBranchConfig(RemoteConfig):
2774
3154
        medium = self._branch._client._medium
2775
3155
        if medium._is_remote_before((1, 14)):
2776
3156
            return self._vfs_set_option(value, name, section)
 
3157
        if isinstance(value, dict):
 
3158
            if medium._is_remote_before((2, 2)):
 
3159
                return self._vfs_set_option(value, name, section)
 
3160
            return self._set_config_option_dict(value, name, section)
 
3161
        else:
 
3162
            return self._set_config_option(value, name, section)
 
3163
 
 
3164
    def _set_config_option(self, value, name, section):
2777
3165
        try:
2778
3166
            path = self._branch._remote_path()
2779
3167
            response = self._branch._client.call('Branch.set_config_option',
2780
3168
                path, self._branch._lock_token, self._branch._repo_lock_token,
2781
3169
                value.encode('utf8'), name, section or '')
2782
3170
        except errors.UnknownSmartMethod:
 
3171
            medium = self._branch._client._medium
2783
3172
            medium._remember_remote_is_before((1, 14))
2784
3173
            return self._vfs_set_option(value, name, section)
2785
3174
        if response != ():
2786
3175
            raise errors.UnexpectedSmartServerResponse(response)
2787
3176
 
 
3177
    def _serialize_option_dict(self, option_dict):
 
3178
        utf8_dict = {}
 
3179
        for key, value in option_dict.items():
 
3180
            if isinstance(key, unicode):
 
3181
                key = key.encode('utf8')
 
3182
            if isinstance(value, unicode):
 
3183
                value = value.encode('utf8')
 
3184
            utf8_dict[key] = value
 
3185
        return bencode.bencode(utf8_dict)
 
3186
 
 
3187
    def _set_config_option_dict(self, value, name, section):
 
3188
        try:
 
3189
            path = self._branch._remote_path()
 
3190
            serialised_dict = self._serialize_option_dict(value)
 
3191
            response = self._branch._client.call(
 
3192
                'Branch.set_config_option_dict',
 
3193
                path, self._branch._lock_token, self._branch._repo_lock_token,
 
3194
                serialised_dict, name, section or '')
 
3195
        except errors.UnknownSmartMethod:
 
3196
            medium = self._branch._client._medium
 
3197
            medium._remember_remote_is_before((2, 2))
 
3198
            return self._vfs_set_option(value, name, section)
 
3199
        if response != ():
 
3200
            raise errors.UnexpectedSmartServerResponse(response)
 
3201
 
2788
3202
    def _real_object(self):
2789
3203
        self._branch._ensure_real()
2790
3204
        return self._branch._real_branch
2873
3287
                    'Missing key %r in context %r', key_err.args[0], context)
2874
3288
                raise err
2875
3289
 
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':
 
3290
    if err.error_verb == 'NoSuchRevision':
2880
3291
        raise NoSuchRevision(find('branch'), err.error_args[0])
2881
3292
    elif err.error_verb == 'nosuchrevision':
2882
3293
        raise NoSuchRevision(find('repository'), err.error_args[0])
2889
3300
            detail=extra)
2890
3301
    elif err.error_verb == 'norepository':
2891
3302
        raise errors.NoRepositoryPresent(find('bzrdir'))
2892
 
    elif err.error_verb == 'LockContention':
2893
 
        raise errors.LockContention('(remote lock)')
2894
3303
    elif err.error_verb == 'UnlockableTransport':
2895
3304
        raise errors.UnlockableTransport(find('bzrdir').root_transport)
2896
 
    elif err.error_verb == 'LockFailed':
2897
 
        raise errors.LockFailed(err.error_args[0], err.error_args[1])
2898
3305
    elif err.error_verb == 'TokenMismatch':
2899
3306
        raise errors.TokenMismatch(find('token'), '(remote token)')
2900
3307
    elif err.error_verb == 'Diverged':
2901
3308
        raise errors.DivergedBranches(find('branch'), find('other_branch'))
2902
 
    elif err.error_verb == 'TipChangeRejected':
2903
 
        raise errors.TipChangeRejected(err.error_args[0].decode('utf8'))
2904
 
    elif err.error_verb == 'UnstackableBranchFormat':
2905
 
        raise errors.UnstackableBranchFormat(*err.error_args)
2906
 
    elif err.error_verb == 'UnstackableRepositoryFormat':
2907
 
        raise errors.UnstackableRepositoryFormat(*err.error_args)
2908
3309
    elif err.error_verb == 'NotStacked':
2909
3310
        raise errors.NotStacked(branch=find('branch'))
2910
3311
    elif err.error_verb == 'PermissionDenied':
2920
3321
    elif err.error_verb == 'NoSuchFile':
2921
3322
        path = get_path()
2922
3323
        raise errors.NoSuchFile(path)
 
3324
    _translate_error_without_context(err)
 
3325
 
 
3326
 
 
3327
def _translate_error_without_context(err):
 
3328
    """Translate any ErrorFromSmartServer values that don't require context"""
 
3329
    if err.error_verb == 'IncompatibleRepositories':
 
3330
        raise errors.IncompatibleRepositories(err.error_args[0],
 
3331
            err.error_args[1], err.error_args[2])
 
3332
    elif err.error_verb == 'LockContention':
 
3333
        raise errors.LockContention('(remote lock)')
 
3334
    elif err.error_verb == 'LockFailed':
 
3335
        raise errors.LockFailed(err.error_args[0], err.error_args[1])
 
3336
    elif err.error_verb == 'TipChangeRejected':
 
3337
        raise errors.TipChangeRejected(err.error_args[0].decode('utf8'))
 
3338
    elif err.error_verb == 'UnstackableBranchFormat':
 
3339
        raise errors.UnstackableBranchFormat(*err.error_args)
 
3340
    elif err.error_verb == 'UnstackableRepositoryFormat':
 
3341
        raise errors.UnstackableRepositoryFormat(*err.error_args)
2923
3342
    elif err.error_verb == 'FileExists':
2924
3343
        raise errors.FileExists(err.error_args[0])
2925
3344
    elif err.error_verb == 'DirectoryNotEmpty':
2944
3363
            raise UnicodeEncodeError(encoding, val, start, end, reason)
2945
3364
    elif err.error_verb == 'ReadOnlyError':
2946
3365
        raise errors.TransportNotPossible('readonly transport')
 
3366
    elif err.error_verb == 'MemoryError':
 
3367
        raise errors.BzrError("remote server out of memory\n"
 
3368
            "Retry non-remotely, or contact the server admin for details.")
2947
3369
    raise errors.UnknownErrorFromSmartServer(err)