/brz/remove-bazaar

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

« back to all changes in this revision

Viewing changes to bzrlib/remote.py

https://launchpad.net/bugs/388269
Merge fix for bug #388269 into trunk, resolve conflicts and add release notes.

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