/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

merge bzr.dev.

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,
41
41
    SmartProtocolError,
42
42
    )
 
43
from bzrlib.i18n import gettext
 
44
from bzrlib.inventory import Inventory
43
45
from bzrlib.lockable_files import LockableFiles
44
46
from bzrlib.smart import client, vfs, repository as smart_repo
45
 
from bzrlib.revision import ensure_null, NULL_REVISION
 
47
from bzrlib.smart.client import _SmartClient
 
48
from bzrlib.revision import NULL_REVISION
 
49
from bzrlib.revisiontree import InventoryRevisionTree
 
50
from bzrlib.repository import RepositoryWriteLockResult, _LazyListJoin
46
51
from bzrlib.trace import mutter, note, warning
47
52
 
48
53
 
 
54
_DEFAULT_SEARCH_DEPTH = 100
 
55
 
 
56
 
49
57
class _RpcHelper(object):
50
58
    """Mixin class that helps with issuing RPCs."""
51
59
 
86
94
    return format
87
95
 
88
96
 
89
 
# Note: RemoteBzrDirFormat is in bzrdir.py
90
 
 
91
 
class RemoteBzrDir(BzrDir, _RpcHelper):
 
97
# Note that RemoteBzrDirProber lives in bzrlib.bzrdir so bzrlib.remote
 
98
# does not have to be imported unless a remote format is involved.
 
99
 
 
100
class RemoteBzrDirFormat(_mod_bzrdir.BzrDirMetaFormat1):
 
101
    """Format representing bzrdirs accessed via a smart server"""
 
102
 
 
103
    supports_workingtrees = False
 
104
 
 
105
    def __init__(self):
 
106
        _mod_bzrdir.BzrDirMetaFormat1.__init__(self)
 
107
        # XXX: It's a bit ugly that the network name is here, because we'd
 
108
        # like to believe that format objects are stateless or at least
 
109
        # immutable,  However, we do at least avoid mutating the name after
 
110
        # it's returned.  See <https://bugs.launchpad.net/bzr/+bug/504102>
 
111
        self._network_name = None
 
112
 
 
113
    def __repr__(self):
 
114
        return "%s(_network_name=%r)" % (self.__class__.__name__,
 
115
            self._network_name)
 
116
 
 
117
    def get_format_description(self):
 
118
        if self._network_name:
 
119
            real_format = controldir.network_format_registry.get(self._network_name)
 
120
            return 'Remote: ' + real_format.get_format_description()
 
121
        return 'bzr remote bzrdir'
 
122
 
 
123
    def get_format_string(self):
 
124
        raise NotImplementedError(self.get_format_string)
 
125
 
 
126
    def network_name(self):
 
127
        if self._network_name:
 
128
            return self._network_name
 
129
        else:
 
130
            raise AssertionError("No network name set.")
 
131
 
 
132
    def initialize_on_transport(self, transport):
 
133
        try:
 
134
            # hand off the request to the smart server
 
135
            client_medium = transport.get_smart_medium()
 
136
        except errors.NoSmartMedium:
 
137
            # TODO: lookup the local format from a server hint.
 
138
            local_dir_format = _mod_bzrdir.BzrDirMetaFormat1()
 
139
            return local_dir_format.initialize_on_transport(transport)
 
140
        client = _SmartClient(client_medium)
 
141
        path = client.remote_path_from_transport(transport)
 
142
        try:
 
143
            response = client.call('BzrDirFormat.initialize', path)
 
144
        except errors.ErrorFromSmartServer, err:
 
145
            _translate_error(err, path=path)
 
146
        if response[0] != 'ok':
 
147
            raise errors.SmartProtocolError('unexpected response code %s' % (response,))
 
148
        format = RemoteBzrDirFormat()
 
149
        self._supply_sub_formats_to(format)
 
150
        return RemoteBzrDir(transport, format)
 
151
 
 
152
    def parse_NoneTrueFalse(self, arg):
 
153
        if not arg:
 
154
            return None
 
155
        if arg == 'False':
 
156
            return False
 
157
        if arg == 'True':
 
158
            return True
 
159
        raise AssertionError("invalid arg %r" % arg)
 
160
 
 
161
    def _serialize_NoneTrueFalse(self, arg):
 
162
        if arg is False:
 
163
            return 'False'
 
164
        if arg:
 
165
            return 'True'
 
166
        return ''
 
167
 
 
168
    def _serialize_NoneString(self, arg):
 
169
        return arg or ''
 
170
 
 
171
    def initialize_on_transport_ex(self, transport, use_existing_dir=False,
 
172
        create_prefix=False, force_new_repo=False, stacked_on=None,
 
173
        stack_on_pwd=None, repo_format_name=None, make_working_trees=None,
 
174
        shared_repo=False):
 
175
        try:
 
176
            # hand off the request to the smart server
 
177
            client_medium = transport.get_smart_medium()
 
178
        except errors.NoSmartMedium:
 
179
            do_vfs = True
 
180
        else:
 
181
            # Decline to open it if the server doesn't support our required
 
182
            # version (3) so that the VFS-based transport will do it.
 
183
            if client_medium.should_probe():
 
184
                try:
 
185
                    server_version = client_medium.protocol_version()
 
186
                    if server_version != '2':
 
187
                        do_vfs = True
 
188
                    else:
 
189
                        do_vfs = False
 
190
                except errors.SmartProtocolError:
 
191
                    # Apparently there's no usable smart server there, even though
 
192
                    # the medium supports the smart protocol.
 
193
                    do_vfs = True
 
194
            else:
 
195
                do_vfs = False
 
196
        if not do_vfs:
 
197
            client = _SmartClient(client_medium)
 
198
            path = client.remote_path_from_transport(transport)
 
199
            if client_medium._is_remote_before((1, 16)):
 
200
                do_vfs = True
 
201
        if do_vfs:
 
202
            # TODO: lookup the local format from a server hint.
 
203
            local_dir_format = _mod_bzrdir.BzrDirMetaFormat1()
 
204
            self._supply_sub_formats_to(local_dir_format)
 
205
            return local_dir_format.initialize_on_transport_ex(transport,
 
206
                use_existing_dir=use_existing_dir, create_prefix=create_prefix,
 
207
                force_new_repo=force_new_repo, stacked_on=stacked_on,
 
208
                stack_on_pwd=stack_on_pwd, repo_format_name=repo_format_name,
 
209
                make_working_trees=make_working_trees, shared_repo=shared_repo,
 
210
                vfs_only=True)
 
211
        return self._initialize_on_transport_ex_rpc(client, path, transport,
 
212
            use_existing_dir, create_prefix, force_new_repo, stacked_on,
 
213
            stack_on_pwd, repo_format_name, make_working_trees, shared_repo)
 
214
 
 
215
    def _initialize_on_transport_ex_rpc(self, client, path, transport,
 
216
        use_existing_dir, create_prefix, force_new_repo, stacked_on,
 
217
        stack_on_pwd, repo_format_name, make_working_trees, shared_repo):
 
218
        args = []
 
219
        args.append(self._serialize_NoneTrueFalse(use_existing_dir))
 
220
        args.append(self._serialize_NoneTrueFalse(create_prefix))
 
221
        args.append(self._serialize_NoneTrueFalse(force_new_repo))
 
222
        args.append(self._serialize_NoneString(stacked_on))
 
223
        # stack_on_pwd is often/usually our transport
 
224
        if stack_on_pwd:
 
225
            try:
 
226
                stack_on_pwd = transport.relpath(stack_on_pwd)
 
227
                if not stack_on_pwd:
 
228
                    stack_on_pwd = '.'
 
229
            except errors.PathNotChild:
 
230
                pass
 
231
        args.append(self._serialize_NoneString(stack_on_pwd))
 
232
        args.append(self._serialize_NoneString(repo_format_name))
 
233
        args.append(self._serialize_NoneTrueFalse(make_working_trees))
 
234
        args.append(self._serialize_NoneTrueFalse(shared_repo))
 
235
        request_network_name = self._network_name or \
 
236
            _mod_bzrdir.BzrDirFormat.get_default_format().network_name()
 
237
        try:
 
238
            response = client.call('BzrDirFormat.initialize_ex_1.16',
 
239
                request_network_name, path, *args)
 
240
        except errors.UnknownSmartMethod:
 
241
            client._medium._remember_remote_is_before((1,16))
 
242
            local_dir_format = _mod_bzrdir.BzrDirMetaFormat1()
 
243
            self._supply_sub_formats_to(local_dir_format)
 
244
            return local_dir_format.initialize_on_transport_ex(transport,
 
245
                use_existing_dir=use_existing_dir, create_prefix=create_prefix,
 
246
                force_new_repo=force_new_repo, stacked_on=stacked_on,
 
247
                stack_on_pwd=stack_on_pwd, repo_format_name=repo_format_name,
 
248
                make_working_trees=make_working_trees, shared_repo=shared_repo,
 
249
                vfs_only=True)
 
250
        except errors.ErrorFromSmartServer, err:
 
251
            _translate_error(err, path=path)
 
252
        repo_path = response[0]
 
253
        bzrdir_name = response[6]
 
254
        require_stacking = response[7]
 
255
        require_stacking = self.parse_NoneTrueFalse(require_stacking)
 
256
        format = RemoteBzrDirFormat()
 
257
        format._network_name = bzrdir_name
 
258
        self._supply_sub_formats_to(format)
 
259
        bzrdir = RemoteBzrDir(transport, format, _client=client)
 
260
        if repo_path:
 
261
            repo_format = response_tuple_to_repo_format(response[1:])
 
262
            if repo_path == '.':
 
263
                repo_path = ''
 
264
            if repo_path:
 
265
                repo_bzrdir_format = RemoteBzrDirFormat()
 
266
                repo_bzrdir_format._network_name = response[5]
 
267
                repo_bzr = RemoteBzrDir(transport.clone(repo_path),
 
268
                    repo_bzrdir_format)
 
269
            else:
 
270
                repo_bzr = bzrdir
 
271
            final_stack = response[8] or None
 
272
            final_stack_pwd = response[9] or None
 
273
            if final_stack_pwd:
 
274
                final_stack_pwd = urlutils.join(
 
275
                    transport.base, final_stack_pwd)
 
276
            remote_repo = RemoteRepository(repo_bzr, repo_format)
 
277
            if len(response) > 10:
 
278
                # Updated server verb that locks remotely.
 
279
                repo_lock_token = response[10] or None
 
280
                remote_repo.lock_write(repo_lock_token, _skip_rpc=True)
 
281
                if repo_lock_token:
 
282
                    remote_repo.dont_leave_lock_in_place()
 
283
            else:
 
284
                remote_repo.lock_write()
 
285
            policy = _mod_bzrdir.UseExistingRepository(remote_repo, final_stack,
 
286
                final_stack_pwd, require_stacking)
 
287
            policy.acquire_repository()
 
288
        else:
 
289
            remote_repo = None
 
290
            policy = None
 
291
        bzrdir._format.set_branch_format(self.get_branch_format())
 
292
        if require_stacking:
 
293
            # The repo has already been created, but we need to make sure that
 
294
            # we'll make a stackable branch.
 
295
            bzrdir._format.require_stacking(_skip_repo=True)
 
296
        return remote_repo, bzrdir, require_stacking, policy
 
297
 
 
298
    def _open(self, transport):
 
299
        return RemoteBzrDir(transport, self)
 
300
 
 
301
    def __eq__(self, other):
 
302
        if not isinstance(other, RemoteBzrDirFormat):
 
303
            return False
 
304
        return self.get_format_description() == other.get_format_description()
 
305
 
 
306
    def __return_repository_format(self):
 
307
        # Always return a RemoteRepositoryFormat object, but if a specific bzr
 
308
        # repository format has been asked for, tell the RemoteRepositoryFormat
 
309
        # that it should use that for init() etc.
 
310
        result = RemoteRepositoryFormat()
 
311
        custom_format = getattr(self, '_repository_format', None)
 
312
        if custom_format:
 
313
            if isinstance(custom_format, RemoteRepositoryFormat):
 
314
                return custom_format
 
315
            else:
 
316
                # We will use the custom format to create repositories over the
 
317
                # wire; expose its details like rich_root_data for code to
 
318
                # query
 
319
                result._custom_format = custom_format
 
320
        return result
 
321
 
 
322
    def get_branch_format(self):
 
323
        result = _mod_bzrdir.BzrDirMetaFormat1.get_branch_format(self)
 
324
        if not isinstance(result, RemoteBranchFormat):
 
325
            new_result = RemoteBranchFormat()
 
326
            new_result._custom_format = result
 
327
            # cache the result
 
328
            self.set_branch_format(new_result)
 
329
            result = new_result
 
330
        return result
 
331
 
 
332
    repository_format = property(__return_repository_format,
 
333
        _mod_bzrdir.BzrDirMetaFormat1._set_repository_format) #.im_func)
 
334
 
 
335
 
 
336
class RemoteBzrDir(_mod_bzrdir.BzrDir, _RpcHelper):
92
337
    """Control directory on a remote server, accessed via bzr:// or similar."""
93
338
 
94
339
    def __init__(self, transport, format, _client=None, _force_probe=False):
97
342
        :param _client: Private parameter for testing. Disables probing and the
98
343
            use of a real bzrdir.
99
344
        """
100
 
        BzrDir.__init__(self, transport, format)
 
345
        _mod_bzrdir.BzrDir.__init__(self, transport, format)
101
346
        # this object holds a delegated bzrdir that uses file-level operations
102
347
        # to talk to the other side
103
348
        self._real_bzrdir = None
163
408
                import traceback
164
409
                warning('VFS BzrDir access triggered\n%s',
165
410
                    ''.join(traceback.format_stack()))
166
 
            self._real_bzrdir = BzrDir.open_from_transport(
 
411
            self._real_bzrdir = _mod_bzrdir.BzrDir.open_from_transport(
167
412
                self.root_transport, _server_formats=False)
168
413
            self._format._network_name = \
169
414
                self._real_bzrdir._format.network_name()
175
420
        # Prevent aliasing problems in the next_open_branch_result cache.
176
421
        # See create_branch for rationale.
177
422
        self._next_open_branch_result = None
178
 
        return BzrDir.break_lock(self)
 
423
        return _mod_bzrdir.BzrDir.break_lock(self)
179
424
 
180
425
    def _vfs_cloning_metadir(self, require_stacking=False):
181
426
        self._ensure_real()
212
457
        if len(branch_info) != 2:
213
458
            raise errors.UnexpectedSmartServerResponse(response)
214
459
        branch_ref, branch_name = branch_info
215
 
        format = bzrdir.network_format_registry.get(control_name)
 
460
        format = controldir.network_format_registry.get(control_name)
216
461
        if repo_name:
217
 
            format.repository_format = repository.network_format_registry.get(
 
462
            format.repository_format = _mod_repository.network_format_registry.get(
218
463
                repo_name)
219
464
        if branch_ref == 'ref':
220
465
            # XXX: we need possible_transports here to avoid reopening the
221
466
            # connection to the referenced location
222
 
            ref_bzrdir = BzrDir.open(branch_name)
 
467
            ref_bzrdir = _mod_bzrdir.BzrDir.open(branch_name)
223
468
            branch_format = ref_bzrdir.cloning_metadir().get_branch_format()
224
469
            format.set_branch_format(branch_format)
225
470
        elif branch_ref == 'branch':
241
486
 
242
487
    def destroy_repository(self):
243
488
        """See BzrDir.destroy_repository"""
244
 
        self._ensure_real()
245
 
        self._real_bzrdir.destroy_repository()
 
489
        path = self._path_for_remote_call(self._client)
 
490
        try:
 
491
            response = self._call('BzrDir.destroy_repository', path)
 
492
        except errors.UnknownSmartMethod:
 
493
            self._ensure_real()
 
494
            self._real_bzrdir.destroy_repository()
 
495
            return
 
496
        if response[0] != 'ok':
 
497
            raise SmartProtocolError('unexpected response code %s' % (response,))
246
498
 
247
 
    def create_branch(self, name=None):
 
499
    def create_branch(self, name=None, repository=None,
 
500
                      append_revisions_only=None):
248
501
        # as per meta1 formats - just delegate to the format object which may
249
502
        # be parameterised.
250
503
        real_branch = self._format.get_branch_format().initialize(self,
251
 
            name=name)
 
504
            name=name, repository=repository,
 
505
            append_revisions_only=append_revisions_only)
252
506
        if not isinstance(real_branch, RemoteBranch):
253
 
            result = RemoteBranch(self, self.find_repository(), real_branch,
254
 
                                  name=name)
 
507
            if not isinstance(repository, RemoteRepository):
 
508
                raise AssertionError(
 
509
                    'need a RemoteRepository to use with RemoteBranch, got %r'
 
510
                    % (repository,))
 
511
            result = RemoteBranch(self, repository, real_branch, name=name)
255
512
        else:
256
513
            result = real_branch
257
514
        # BzrDir.clone_on_transport() uses the result of create_branch but does
265
522
 
266
523
    def destroy_branch(self, name=None):
267
524
        """See BzrDir.destroy_branch"""
268
 
        self._ensure_real()
269
 
        self._real_bzrdir.destroy_branch(name=name)
 
525
        path = self._path_for_remote_call(self._client)
 
526
        try:
 
527
            if name is not None:
 
528
                args = (name, )
 
529
            else:
 
530
                args = ()
 
531
            response = self._call('BzrDir.destroy_branch', path, *args)
 
532
        except errors.UnknownSmartMethod:
 
533
            self._ensure_real()
 
534
            self._real_bzrdir.destroy_branch(name=name)
 
535
            self._next_open_branch_result = None
 
536
            return
270
537
        self._next_open_branch_result = None
 
538
        if response[0] != 'ok':
 
539
            raise SmartProtocolError('unexpected response code %s' % (response,))
271
540
 
272
 
    def create_workingtree(self, revision_id=None, from_branch=None):
 
541
    def create_workingtree(self, revision_id=None, from_branch=None,
 
542
        accelerator_tree=None, hardlink=False):
273
543
        raise errors.NotLocalUrl(self.transport.base)
274
544
 
275
 
    def find_branch_format(self):
 
545
    def find_branch_format(self, name=None):
276
546
        """Find the branch 'format' for this bzrdir.
277
547
 
278
548
        This might be a synthetic object for e.g. RemoteBranch and SVN.
279
549
        """
280
 
        b = self.open_branch()
 
550
        b = self.open_branch(name=name)
281
551
        return b._format
282
552
 
283
 
    def get_branch_reference(self):
 
553
    def get_branch_reference(self, name=None):
284
554
        """See BzrDir.get_branch_reference()."""
 
555
        if name is not None:
 
556
            # XXX JRV20100304: Support opening colocated branches
 
557
            raise errors.NoColocatedBranchSupport(self)
285
558
        response = self._get_branch_reference()
286
559
        if response[0] == 'ref':
287
560
            return response[1]
318
591
            raise errors.UnexpectedSmartServerResponse(response)
319
592
        return response
320
593
 
321
 
    def _get_tree_branch(self):
 
594
    def _get_tree_branch(self, name=None):
322
595
        """See BzrDir._get_tree_branch()."""
323
 
        return None, self.open_branch()
 
596
        return None, self.open_branch(name=name)
324
597
 
325
598
    def open_branch(self, name=None, unsupported=False,
326
599
                    ignore_fallbacks=False):
411
684
 
412
685
    def has_workingtree(self):
413
686
        if self._has_working_tree is None:
414
 
            self._ensure_real()
415
 
            self._has_working_tree = self._real_bzrdir.has_workingtree()
 
687
            path = self._path_for_remote_call(self._client)
 
688
            try:
 
689
                response = self._call('BzrDir.has_workingtree', path)
 
690
            except errors.UnknownSmartMethod:
 
691
                self._ensure_real()
 
692
                self._has_working_tree = self._real_bzrdir.has_workingtree()
 
693
            else:
 
694
                if response[0] not in ('yes', 'no'):
 
695
                    raise SmartProtocolError('unexpected response code %s' % (response,))
 
696
                self._has_working_tree = (response[0] == 'yes')
416
697
        return self._has_working_tree
417
698
 
418
699
    def open_workingtree(self, recommend_upgrade=True):
423
704
 
424
705
    def _path_for_remote_call(self, client):
425
706
        """Return the path to be used for this bzrdir in a remote call."""
426
 
        return client.remote_path_from_transport(self.root_transport)
 
707
        return urlutils.split_segment_parameters_raw(
 
708
            client.remote_path_from_transport(self.root_transport))[0]
427
709
 
428
710
    def get_branch_transport(self, branch_format, name=None):
429
711
        self._ensure_real()
441
723
        """Upgrading of remote bzrdirs is not supported yet."""
442
724
        return False
443
725
 
444
 
    def needs_format_conversion(self, format=None):
 
726
    def needs_format_conversion(self, format):
445
727
        """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
728
        return False
450
729
 
451
 
    def clone(self, url, revision_id=None, force_new_repo=False,
452
 
              preserve_stacking=False):
453
 
        self._ensure_real()
454
 
        return self._real_bzrdir.clone(url, revision_id=revision_id,
455
 
            force_new_repo=force_new_repo, preserve_stacking=preserve_stacking)
456
 
 
457
730
    def _get_config(self):
458
731
        return RemoteBzrDirConfig(self)
459
732
 
460
733
 
461
 
class RemoteRepositoryFormat(repository.RepositoryFormat):
 
734
class RemoteRepositoryFormat(vf_repository.VersionedFileRepositoryFormat):
462
735
    """Format for repositories accessed over a _SmartClient.
463
736
 
464
737
    Instances of this repository are represented by RemoteRepository
479
752
    """
480
753
 
481
754
    _matchingbzrdir = RemoteBzrDirFormat()
 
755
    supports_full_versioned_files = True
 
756
    supports_leaving_lock = True
482
757
 
483
758
    def __init__(self):
484
 
        repository.RepositoryFormat.__init__(self)
 
759
        _mod_repository.RepositoryFormat.__init__(self)
485
760
        self._custom_format = None
486
761
        self._network_name = None
487
762
        self._creating_bzrdir = None
 
763
        self._revision_graph_can_have_wrong_parents = None
488
764
        self._supports_chks = None
489
765
        self._supports_external_lookups = None
490
766
        self._supports_tree_reference = None
 
767
        self._supports_funky_characters = None
 
768
        self._supports_nesting_repositories = None
491
769
        self._rich_root_data = None
492
770
 
493
771
    def __repr__(self):
522
800
        return self._supports_external_lookups
523
801
 
524
802
    @property
 
803
    def supports_funky_characters(self):
 
804
        if self._supports_funky_characters is None:
 
805
            self._ensure_real()
 
806
            self._supports_funky_characters = \
 
807
                self._custom_format.supports_funky_characters
 
808
        return self._supports_funky_characters
 
809
 
 
810
    @property
 
811
    def supports_nesting_repositories(self):
 
812
        if self._supports_nesting_repositories is None:
 
813
            self._ensure_real()
 
814
            self._supports_nesting_repositories = \
 
815
                self._custom_format.supports_nesting_repositories
 
816
        return self._supports_nesting_repositories
 
817
 
 
818
    @property
525
819
    def supports_tree_reference(self):
526
820
        if self._supports_tree_reference is None:
527
821
            self._ensure_real()
529
823
                self._custom_format.supports_tree_reference
530
824
        return self._supports_tree_reference
531
825
 
 
826
    @property
 
827
    def revision_graph_can_have_wrong_parents(self):
 
828
        if self._revision_graph_can_have_wrong_parents is None:
 
829
            self._ensure_real()
 
830
            self._revision_graph_can_have_wrong_parents = \
 
831
                self._custom_format.revision_graph_can_have_wrong_parents
 
832
        return self._revision_graph_can_have_wrong_parents
 
833
 
532
834
    def _vfs_initialize(self, a_bzrdir, shared):
533
835
        """Helper for common code in initialize."""
534
836
        if self._custom_format:
569
871
            network_name = self._network_name
570
872
        else:
571
873
            # Select the current bzrlib default and ask for that.
572
 
            reference_bzrdir_format = bzrdir.format_registry.get('default')()
 
874
            reference_bzrdir_format = _mod_bzrdir.format_registry.get('default')()
573
875
            reference_format = reference_bzrdir_format.repository_format
574
876
            network_name = reference_format.network_name()
575
877
        # 2) try direct creation via RPC
601
903
 
602
904
    def _ensure_real(self):
603
905
        if self._custom_format is None:
604
 
            self._custom_format = repository.network_format_registry.get(
 
906
            self._custom_format = _mod_repository.network_format_registry.get(
605
907
                self._network_name)
606
908
 
607
909
    @property
644
946
 
645
947
 
646
948
class RemoteRepository(_RpcHelper, lock._RelockDebugMixin,
647
 
    bzrdir.ControlComponent):
 
949
    controldir.ControlComponent):
648
950
    """Repository accessed over rpc.
649
951
 
650
952
    For the moment most operations are performed using local transport-backed
703
1005
        # transport, but I'm not sure it's worth making this method
704
1006
        # optional -- mbp 2010-04-21
705
1007
        return self.bzrdir.get_repository_transport(None)
706
 
        
 
1008
 
707
1009
    def __str__(self):
708
1010
        return "%s(%s)" % (self.__class__.__name__, self.base)
709
1011
 
817
1119
    def find_text_key_references(self):
818
1120
        """Find the text key references within the repository.
819
1121
 
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
1122
        :return: A dictionary mapping text keys ((fileid, revision_id) tuples)
824
1123
            to whether they were referred to by the inventory of the
825
1124
            revision_id that they contain. The inventory texts from all present
843
1142
        """Private method for using with old (< 1.2) servers to fallback."""
844
1143
        if revision_id is None:
845
1144
            revision_id = ''
846
 
        elif revision.is_null(revision_id):
 
1145
        elif _mod_revision.is_null(revision_id):
847
1146
            return {}
848
1147
 
849
1148
        path = self.bzrdir._path_for_remote_call(self._client)
873
1172
        return RemoteStreamSource(self, to_format)
874
1173
 
875
1174
    @needs_read_lock
 
1175
    def get_file_graph(self):
 
1176
        return graph.Graph(self.texts)
 
1177
 
 
1178
    @needs_read_lock
876
1179
    def has_revision(self, revision_id):
877
1180
        """True if this repository has a copy of the revision."""
878
1181
        # Copy of bzrlib.repository.Repository.has_revision
895
1198
    def _has_same_fallbacks(self, other_repo):
896
1199
        """Returns true if the repositories have the same fallbacks."""
897
1200
        # XXX: copied from Repository; it should be unified into a base class
898
 
        # <https://bugs.edge.launchpad.net/bzr/+bug/401622>
 
1201
        # <https://bugs.launchpad.net/bzr/+bug/401622>
899
1202
        my_fb = self._fallback_repositories
900
1203
        other_fb = other_repo._fallback_repositories
901
1204
        if len(my_fb) != len(other_fb):
930
1233
        """See Repository.gather_stats()."""
931
1234
        path = self.bzrdir._path_for_remote_call(self._client)
932
1235
        # revid can be None to indicate no revisions, not just NULL_REVISION
933
 
        if revid is None or revision.is_null(revid):
 
1236
        if revid is None or _mod_revision.is_null(revid):
934
1237
            fmt_revid = ''
935
1238
        else:
936
1239
            fmt_revid = revid
997
1300
        pass
998
1301
 
999
1302
    def lock_read(self):
 
1303
        """Lock the repository for read operations.
 
1304
 
 
1305
        :return: A bzrlib.lock.LogicalLockResult.
 
1306
        """
1000
1307
        # wrong eventually - want a local lock cache context
1001
1308
        if not self._lock_mode:
1002
1309
            self._note_lock('r')
1009
1316
                repo.lock_read()
1010
1317
        else:
1011
1318
            self._lock_count += 1
 
1319
        return lock.LogicalLockResult(self.unlock)
1012
1320
 
1013
1321
    def _remote_lock_write(self, token):
1014
1322
        path = self.bzrdir._path_for_remote_call(self._client)
1054
1362
            raise errors.ReadOnlyError(self)
1055
1363
        else:
1056
1364
            self._lock_count += 1
1057
 
        return self._lock_token or None
 
1365
        return RepositoryWriteLockResult(self.unlock, self._lock_token or None)
1058
1366
 
1059
1367
    def leave_lock_in_place(self):
1060
1368
        if not self._lock_token:
1194
1502
            return t
1195
1503
        raise errors.UnexpectedSmartServerResponse(response)
1196
1504
 
 
1505
    @needs_read_lock
1197
1506
    def sprout(self, to_bzrdir, revision_id=None):
1198
 
        # TODO: Option to control what format is created?
1199
 
        self._ensure_real()
1200
 
        dest_repo = self._real_repository._format.initialize(to_bzrdir,
1201
 
                                                             shared=False)
 
1507
        """Create a descendent repository for new development.
 
1508
 
 
1509
        Unlike clone, this does not copy the settings of the repository.
 
1510
        """
 
1511
        dest_repo = self._create_sprouting_repo(to_bzrdir, shared=False)
1202
1512
        dest_repo.fetch(self, revision_id=revision_id)
1203
1513
        return dest_repo
1204
1514
 
 
1515
    def _create_sprouting_repo(self, a_bzrdir, shared):
 
1516
        if not isinstance(a_bzrdir._format, self.bzrdir._format.__class__):
 
1517
            # use target default format.
 
1518
            dest_repo = a_bzrdir.create_repository()
 
1519
        else:
 
1520
            # Most control formats need the repository to be specifically
 
1521
            # created, but on some old all-in-one formats it's not needed
 
1522
            try:
 
1523
                dest_repo = self._format.initialize(a_bzrdir, shared=shared)
 
1524
            except errors.UninitializableFormat:
 
1525
                dest_repo = a_bzrdir.open_repository()
 
1526
        return dest_repo
 
1527
 
1205
1528
    ### These methods are just thin shims to the VFS object for now.
1206
1529
 
 
1530
    @needs_read_lock
1207
1531
    def revision_tree(self, revision_id):
1208
 
        self._ensure_real()
1209
 
        return self._real_repository.revision_tree(revision_id)
 
1532
        revision_id = _mod_revision.ensure_null(revision_id)
 
1533
        if revision_id == _mod_revision.NULL_REVISION:
 
1534
            return InventoryRevisionTree(self,
 
1535
                Inventory(root_id=None), _mod_revision.NULL_REVISION)
 
1536
        else:
 
1537
            return list(self.revision_trees([revision_id]))[0]
1210
1538
 
1211
1539
    def get_serializer_format(self):
1212
1540
        self._ensure_real()
1214
1542
 
1215
1543
    def get_commit_builder(self, branch, parents, config, timestamp=None,
1216
1544
                           timezone=None, committer=None, revprops=None,
1217
 
                           revision_id=None):
 
1545
                           revision_id=None, lossy=False):
1218
1546
        # FIXME: It ought to be possible to call this without immediately
1219
1547
        # triggering _ensure_real.  For now it's the easiest thing to do.
1220
1548
        self._ensure_real()
1221
1549
        real_repo = self._real_repository
1222
1550
        builder = real_repo.get_commit_builder(branch, parents,
1223
1551
                config, timestamp=timestamp, timezone=timezone,
1224
 
                committer=committer, revprops=revprops, revision_id=revision_id)
 
1552
                committer=committer, revprops=revprops,
 
1553
                revision_id=revision_id, lossy=lossy)
1225
1554
        return builder
1226
1555
 
1227
1556
    def add_fallback_repository(self, repository):
1235
1564
        # We need to accumulate additional repositories here, to pass them in
1236
1565
        # on various RPC's.
1237
1566
        #
 
1567
        # Make the check before we lock: this raises an exception.
 
1568
        self._check_fallback_repository(repository)
1238
1569
        if self.is_locked():
1239
1570
            # We will call fallback.unlock() when we transition to the unlocked
1240
1571
            # state, so always add a lock here. If a caller passes us a locked
1241
1572
            # repository, they are responsible for unlocking it later.
1242
1573
            repository.lock_read()
1243
 
        self._check_fallback_repository(repository)
1244
1574
        self._fallback_repositories.append(repository)
1245
1575
        # If self._real_repository was parameterised already (e.g. because a
1246
1576
        # _real_branch had its get_stacked_on_url method called), then the
1288
1618
 
1289
1619
    @needs_read_lock
1290
1620
    def get_revision(self, revision_id):
1291
 
        self._ensure_real()
1292
 
        return self._real_repository.get_revision(revision_id)
 
1621
        return self.get_revisions([revision_id])[0]
1293
1622
 
1294
1623
    def get_transaction(self):
1295
1624
        self._ensure_real()
1297
1626
 
1298
1627
    @needs_read_lock
1299
1628
    def clone(self, a_bzrdir, revision_id=None):
1300
 
        self._ensure_real()
1301
 
        return self._real_repository.clone(a_bzrdir, revision_id=revision_id)
 
1629
        dest_repo = self._create_sprouting_repo(
 
1630
            a_bzrdir, shared=self.is_shared())
 
1631
        self.copy_content_into(dest_repo, revision_id)
 
1632
        return dest_repo
1302
1633
 
1303
1634
    def make_working_trees(self):
1304
1635
        """See Repository.make_working_trees"""
1305
 
        self._ensure_real()
1306
 
        return self._real_repository.make_working_trees()
 
1636
        path = self.bzrdir._path_for_remote_call(self._client)
 
1637
        try:
 
1638
            response = self._call('Repository.make_working_trees', path)
 
1639
        except errors.UnknownSmartMethod:
 
1640
            self._ensure_real()
 
1641
            return self._real_repository.make_working_trees()
 
1642
        if response[0] not in ('yes', 'no'):
 
1643
            raise SmartProtocolError('unexpected response code %s' % (response,))
 
1644
        return response[0] == 'yes'
1307
1645
 
1308
1646
    def refresh_data(self):
1309
 
        """Re-read any data needed to to synchronise with disk.
 
1647
        """Re-read any data needed to synchronise with disk.
1310
1648
 
1311
1649
        This method is intended to be called after another repository instance
1312
1650
        (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.
 
1651
        repository. On all repositories this will work outside of write groups.
 
1652
        Some repository formats (pack and newer for bzrlib native formats)
 
1653
        support refresh_data inside write groups. If called inside a write
 
1654
        group on a repository that does not support refreshing in a write group
 
1655
        IsInWriteGroupError will be raised.
1315
1656
        """
1316
 
        if self.is_in_write_group():
1317
 
            raise errors.InternalBzrError(
1318
 
                "May not refresh_data while in a write group.")
1319
1657
        if self._real_repository is not None:
1320
1658
            self._real_repository.refresh_data()
1321
1659
 
1333
1671
        return result
1334
1672
 
1335
1673
    @needs_read_lock
1336
 
    def search_missing_revision_ids(self, other, revision_id=None, find_ghosts=True):
 
1674
    def search_missing_revision_ids(self, other,
 
1675
            revision_id=symbol_versioning.DEPRECATED_PARAMETER,
 
1676
            find_ghosts=True, revision_ids=None, if_present_ids=None,
 
1677
            limit=None):
1337
1678
        """Return the revision ids that other has that this does not.
1338
1679
 
1339
1680
        These are returned in topological order.
1340
1681
 
1341
1682
        revision_id: only return revision ids included by revision_id.
1342
1683
        """
1343
 
        return repository.InterRepository.get(
1344
 
            other, self).search_missing_revision_ids(revision_id, find_ghosts)
 
1684
        if symbol_versioning.deprecated_passed(revision_id):
 
1685
            symbol_versioning.warn(
 
1686
                'search_missing_revision_ids(revision_id=...) was '
 
1687
                'deprecated in 2.4.  Use revision_ids=[...] instead.',
 
1688
                DeprecationWarning, stacklevel=2)
 
1689
            if revision_ids is not None:
 
1690
                raise AssertionError(
 
1691
                    'revision_ids is mutually exclusive with revision_id')
 
1692
            if revision_id is not None:
 
1693
                revision_ids = [revision_id]
 
1694
        inter_repo = _mod_repository.InterRepository.get(other, self)
 
1695
        return inter_repo.search_missing_revision_ids(
 
1696
            find_ghosts=find_ghosts, revision_ids=revision_ids,
 
1697
            if_present_ids=if_present_ids, limit=limit)
1345
1698
 
1346
 
    def fetch(self, source, revision_id=None, pb=None, find_ghosts=False,
 
1699
    def fetch(self, source, revision_id=None, find_ghosts=False,
1347
1700
            fetch_spec=None):
1348
1701
        # No base implementation to use as RemoteRepository is not a subclass
1349
1702
        # of Repository; so this is a copy of Repository.fetch().
1360
1713
            # check that last_revision is in 'from' and then return a
1361
1714
            # no-operation.
1362
1715
            if (revision_id is not None and
1363
 
                not revision.is_null(revision_id)):
 
1716
                not _mod_revision.is_null(revision_id)):
1364
1717
                self.get_revision(revision_id)
1365
1718
            return 0, []
1366
1719
        # if there is no specific appropriate InterRepository, this will get
1367
1720
        # the InterRepository base class, which raises an
1368
1721
        # IncompatibleRepositories when asked to fetch.
1369
 
        inter = repository.InterRepository.get(source, self)
1370
 
        return inter.fetch(revision_id=revision_id, pb=pb,
 
1722
        inter = _mod_repository.InterRepository.get(source, self)
 
1723
        return inter.fetch(revision_id=revision_id,
1371
1724
            find_ghosts=find_ghosts, fetch_spec=fetch_spec)
1372
1725
 
1373
1726
    def create_bundle(self, target, base, fileobj, format=None):
1375
1728
        self._real_repository.create_bundle(target, base, fileobj, format)
1376
1729
 
1377
1730
    @needs_read_lock
 
1731
    @symbol_versioning.deprecated_method(
 
1732
        symbol_versioning.deprecated_in((2, 4, 0)))
1378
1733
    def get_ancestry(self, revision_id, topo_sorted=True):
1379
1734
        self._ensure_real()
1380
1735
        return self._real_repository.get_ancestry(revision_id, topo_sorted)
1394
1749
        self._ensure_real()
1395
1750
        return self._real_repository.iter_files_bytes(desired_files)
1396
1751
 
 
1752
    def get_cached_parent_map(self, revision_ids):
 
1753
        """See bzrlib.CachingParentsProvider.get_cached_parent_map"""
 
1754
        return self._unstacked_provider.get_cached_parent_map(revision_ids)
 
1755
 
1397
1756
    def get_parent_map(self, revision_ids):
1398
1757
        """See bzrlib.Graph.get_parent_map()."""
1399
1758
        return self._make_parents_provider().get_parent_map(revision_ids)
1457
1816
        if parents_map is None:
1458
1817
            # Repository is not locked, so there's no cache.
1459
1818
            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)
 
1819
        if _DEFAULT_SEARCH_DEPTH <= 0:
 
1820
            (start_set, stop_keys,
 
1821
             key_count) = graph.search_result_from_parent_map(
 
1822
                parents_map, self._unstacked_provider.missing_keys)
 
1823
        else:
 
1824
            (start_set, stop_keys,
 
1825
             key_count) = graph.limited_search_result_from_parent_map(
 
1826
                parents_map, self._unstacked_provider.missing_keys,
 
1827
                keys, depth=_DEFAULT_SEARCH_DEPTH)
1480
1828
        recipe = ('manual', start_set, stop_keys, key_count)
1481
1829
        body = self._serialise_search_recipe(recipe)
1482
1830
        path = self.bzrdir._path_for_remote_call(self._client)
1555
1903
 
1556
1904
    @needs_read_lock
1557
1905
    def get_revision_delta(self, revision_id, specific_fileids=None):
1558
 
        self._ensure_real()
1559
 
        return self._real_repository.get_revision_delta(revision_id,
1560
 
            specific_fileids=specific_fileids)
 
1906
        r = self.get_revision(revision_id)
 
1907
        return list(self.get_deltas_for_revisions([r],
 
1908
            specific_fileids=specific_fileids))[0]
1561
1909
 
1562
1910
    @needs_read_lock
1563
1911
    def revision_trees(self, revision_ids):
1576
1924
            callback_refs=callback_refs, check_repo=check_repo)
1577
1925
 
1578
1926
    def copy_content_into(self, destination, revision_id=None):
1579
 
        self._ensure_real()
1580
 
        return self._real_repository.copy_content_into(
1581
 
            destination, revision_id=revision_id)
 
1927
        """Make a complete copy of the content in self into destination.
 
1928
 
 
1929
        This is a destructive operation! Do not use it on existing
 
1930
        repositories.
 
1931
        """
 
1932
        interrepo = _mod_repository.InterRepository.get(self, destination)
 
1933
        return interrepo.copy_content(revision_id)
1582
1934
 
1583
1935
    def _copy_repository_tarball(self, to_bzrdir, revision_id=None):
1584
1936
        # get a tarball of the remote repository, and copy from that into the
1586
1938
        from bzrlib import osutils
1587
1939
        import tarfile
1588
1940
        # TODO: Maybe a progress bar while streaming the tarball?
1589
 
        note("Copying repository content as tarball...")
 
1941
        note(gettext("Copying repository content as tarball..."))
1590
1942
        tar_file = self._get_tarball('bz2')
1591
1943
        if tar_file is None:
1592
1944
            return None
1597
1949
            tmpdir = osutils.mkdtemp()
1598
1950
            try:
1599
1951
                _extract_tar(tar, tmpdir)
1600
 
                tmp_bzrdir = BzrDir.open(tmpdir)
 
1952
                tmp_bzrdir = _mod_bzrdir.BzrDir.open(tmpdir)
1601
1953
                tmp_repo = tmp_bzrdir.open_repository()
1602
1954
                tmp_repo.copy_content_into(destination, revision_id)
1603
1955
            finally:
1688
2040
    def supports_rich_root(self):
1689
2041
        return self._format.rich_root_data
1690
2042
 
 
2043
    @symbol_versioning.deprecated_method(symbol_versioning.deprecated_in((2, 4, 0)))
1691
2044
    def iter_reverse_revision_history(self, revision_id):
1692
2045
        self._ensure_real()
1693
2046
        return self._real_repository.iter_reverse_revision_history(revision_id)
1696
2049
    def _serializer(self):
1697
2050
        return self._format._serializer
1698
2051
 
 
2052
    @needs_write_lock
1699
2053
    def store_revision_signature(self, gpg_strategy, plaintext, revision_id):
1700
 
        self._ensure_real()
1701
 
        return self._real_repository.store_revision_signature(
1702
 
            gpg_strategy, plaintext, revision_id)
 
2054
        signature = gpg_strategy.sign(plaintext)
 
2055
        self.add_signature_text(revision_id, signature)
1703
2056
 
1704
2057
    def add_signature_text(self, revision_id, signature):
1705
2058
        self._ensure_real()
1706
2059
        return self._real_repository.add_signature_text(revision_id, signature)
1707
2060
 
1708
2061
    def has_signature_for_revision_id(self, revision_id):
 
2062
        path = self.bzrdir._path_for_remote_call(self._client)
 
2063
        try:
 
2064
            response = self._call('Repository.has_signature_for_revision_id',
 
2065
                path, revision_id)
 
2066
        except errors.UnknownSmartMethod:
 
2067
            self._ensure_real()
 
2068
            return self._real_repository.has_signature_for_revision_id(
 
2069
                revision_id)
 
2070
        if response[0] not in ('yes', 'no'):
 
2071
            raise SmartProtocolError('unexpected response code %s' % (response,))
 
2072
        return (response[0] == 'yes')
 
2073
 
 
2074
    def verify_revision_signature(self, revision_id, gpg_strategy):
1709
2075
        self._ensure_real()
1710
 
        return self._real_repository.has_signature_for_revision_id(revision_id)
 
2076
        return self._real_repository.verify_revision_signature(
 
2077
            revision_id, gpg_strategy)
1711
2078
 
1712
2079
    def item_keys_introduced_by(self, revision_ids, _files_pb=None):
1713
2080
        self._ensure_real()
1714
2081
        return self._real_repository.item_keys_introduced_by(revision_ids,
1715
2082
            _files_pb=_files_pb)
1716
2083
 
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
2084
    def _find_inconsistent_revision_parents(self, revisions_iterator=None):
1723
2085
        self._ensure_real()
1724
2086
        return self._real_repository._find_inconsistent_revision_parents(
1732
2094
        providers = [self._unstacked_provider]
1733
2095
        if other is not None:
1734
2096
            providers.insert(0, other)
1735
 
        providers.extend(r._make_parents_provider() for r in
1736
 
                         self._fallback_repositories)
1737
 
        return graph.StackedParentsProvider(providers)
 
2097
        return graph.StackedParentsProvider(_LazyListJoin(
 
2098
            providers, self._fallback_repositories))
1738
2099
 
1739
2100
    def _serialise_search_recipe(self, recipe):
1740
2101
        """Serialise a graph search recipe.
1748
2109
        return '\n'.join((start_keys, stop_keys, count))
1749
2110
 
1750
2111
    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)]
 
2112
        parts = search_result.get_network_struct()
1757
2113
        return '\n'.join(parts)
1758
2114
 
1759
2115
    def autopack(self):
1769
2125
            raise errors.UnexpectedSmartServerResponse(response)
1770
2126
 
1771
2127
 
1772
 
class RemoteStreamSink(repository.StreamSink):
 
2128
class RemoteStreamSink(vf_repository.StreamSink):
1773
2129
 
1774
2130
    def _insert_real(self, stream, src_format, resume_tokens):
1775
2131
        self.target_repo._ensure_real()
1876
2232
        self._last_substream and self._last_stream so that the stream can be
1877
2233
        resumed by _resume_stream_with_vfs.
1878
2234
        """
1879
 
                    
 
2235
 
1880
2236
        stream_iter = iter(stream)
1881
2237
        for substream_kind, substream in stream_iter:
1882
2238
            if substream_kind == 'inventory-deltas':
1885
2241
                return
1886
2242
            else:
1887
2243
                yield substream_kind, substream
1888
 
            
1889
 
 
1890
 
class RemoteStreamSource(repository.StreamSource):
 
2244
 
 
2245
 
 
2246
class RemoteStreamSource(vf_repository.StreamSource):
1891
2247
    """Stream data from a remote server."""
1892
2248
 
1893
2249
    def get_stream(self, search):
1953
2309
        candidate_verbs = [
1954
2310
            ('Repository.get_stream_1.19', (1, 19)),
1955
2311
            ('Repository.get_stream', (1, 13))]
 
2312
 
1956
2313
        found_verb = False
1957
2314
        for verb, version in candidate_verbs:
1958
2315
            if medium._is_remote_before(version):
1962
2319
                    verb, args, search_bytes)
1963
2320
            except errors.UnknownSmartMethod:
1964
2321
                medium._remember_remote_is_before(version)
 
2322
            except errors.UnknownErrorFromSmartServer, e:
 
2323
                if isinstance(search, graph.EverythingResult):
 
2324
                    error_verb = e.error_from_smart_server.error_verb
 
2325
                    if error_verb == 'BadSearch':
 
2326
                        # Pre-2.4 servers don't support this sort of search.
 
2327
                        # XXX: perhaps falling back to VFS on BadSearch is a
 
2328
                        # good idea in general?  It might provide a little bit
 
2329
                        # of protection against client-side bugs.
 
2330
                        medium._remember_remote_is_before((2, 4))
 
2331
                        break
 
2332
                raise
1965
2333
            else:
1966
2334
                response_tuple, response_handler = response
1967
2335
                found_verb = True
1971
2339
        if response_tuple[0] != 'ok':
1972
2340
            raise errors.UnexpectedSmartServerResponse(response_tuple)
1973
2341
        byte_stream = response_handler.read_streamed_body()
1974
 
        src_format, stream = smart_repo._byte_stream_to_stream(byte_stream)
 
2342
        src_format, stream = smart_repo._byte_stream_to_stream(byte_stream,
 
2343
            self._record_counter)
1975
2344
        if src_format.network_name() != repo._format.network_name():
1976
2345
            raise AssertionError(
1977
2346
                "Mismatched RemoteRepository and stream src %r, %r" % (
2063
2432
        return a_bzrdir.open_branch(name=name, 
2064
2433
            ignore_fallbacks=ignore_fallbacks)
2065
2434
 
2066
 
    def _vfs_initialize(self, a_bzrdir, name):
 
2435
    def _vfs_initialize(self, a_bzrdir, name, append_revisions_only):
2067
2436
        # Initialisation when using a local bzrdir object, or a non-vfs init
2068
2437
        # method is not available on the server.
2069
2438
        # self._custom_format is always set - the start of initialize ensures
2071
2440
        if isinstance(a_bzrdir, RemoteBzrDir):
2072
2441
            a_bzrdir._ensure_real()
2073
2442
            result = self._custom_format.initialize(a_bzrdir._real_bzrdir,
2074
 
                name)
 
2443
                name, append_revisions_only=append_revisions_only)
2075
2444
        else:
2076
2445
            # We assume the bzrdir is parameterised; it may not be.
2077
 
            result = self._custom_format.initialize(a_bzrdir, name)
 
2446
            result = self._custom_format.initialize(a_bzrdir, name,
 
2447
                append_revisions_only=append_revisions_only)
2078
2448
        if (isinstance(a_bzrdir, RemoteBzrDir) and
2079
2449
            not isinstance(result, RemoteBranch)):
2080
2450
            result = RemoteBranch(a_bzrdir, a_bzrdir.find_repository(), result,
2081
2451
                                  name=name)
2082
2452
        return result
2083
2453
 
2084
 
    def initialize(self, a_bzrdir, name=None):
 
2454
    def initialize(self, a_bzrdir, name=None, repository=None,
 
2455
                   append_revisions_only=None):
2085
2456
        # 1) get the network name to use.
2086
2457
        if self._custom_format:
2087
2458
            network_name = self._custom_format.network_name()
2088
2459
        else:
2089
2460
            # Select the current bzrlib default and ask for that.
2090
 
            reference_bzrdir_format = bzrdir.format_registry.get('default')()
 
2461
            reference_bzrdir_format = _mod_bzrdir.format_registry.get('default')()
2091
2462
            reference_format = reference_bzrdir_format.get_branch_format()
2092
2463
            self._custom_format = reference_format
2093
2464
            network_name = reference_format.network_name()
2094
2465
        # Being asked to create on a non RemoteBzrDir:
2095
2466
        if not isinstance(a_bzrdir, RemoteBzrDir):
2096
 
            return self._vfs_initialize(a_bzrdir, name=name)
 
2467
            return self._vfs_initialize(a_bzrdir, name=name,
 
2468
                append_revisions_only=append_revisions_only)
2097
2469
        medium = a_bzrdir._client._medium
2098
2470
        if medium._is_remote_before((1, 13)):
2099
 
            return self._vfs_initialize(a_bzrdir, name=name)
 
2471
            return self._vfs_initialize(a_bzrdir, name=name,
 
2472
                append_revisions_only=append_revisions_only)
2100
2473
        # Creating on a remote bzr dir.
2101
2474
        # 2) try direct creation via RPC
2102
2475
        path = a_bzrdir._path_for_remote_call(a_bzrdir._client)
2109
2482
        except errors.UnknownSmartMethod:
2110
2483
            # Fallback - use vfs methods
2111
2484
            medium._remember_remote_is_before((1, 13))
2112
 
            return self._vfs_initialize(a_bzrdir, name=name)
 
2485
            return self._vfs_initialize(a_bzrdir, name=name,
 
2486
                    append_revisions_only=append_revisions_only)
2113
2487
        if response[0] != 'ok':
2114
2488
            raise errors.UnexpectedSmartServerResponse(response)
2115
2489
        # Turn the response into a RemoteRepository object.
2116
2490
        format = RemoteBranchFormat(network_name=response[1])
2117
2491
        repo_format = response_tuple_to_repo_format(response[3:])
2118
 
        if response[2] == '':
2119
 
            repo_bzrdir = a_bzrdir
 
2492
        repo_path = response[2]
 
2493
        if repository is not None:
 
2494
            remote_repo_url = urlutils.join(a_bzrdir.user_url, repo_path)
 
2495
            url_diff = urlutils.relative_url(repository.user_url,
 
2496
                    remote_repo_url)
 
2497
            if url_diff != '.':
 
2498
                raise AssertionError(
 
2499
                    'repository.user_url %r does not match URL from server '
 
2500
                    'response (%r + %r)'
 
2501
                    % (repository.user_url, a_bzrdir.user_url, repo_path))
 
2502
            remote_repo = repository
2120
2503
        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)
 
2504
            if repo_path == '':
 
2505
                repo_bzrdir = a_bzrdir
 
2506
            else:
 
2507
                repo_bzrdir = RemoteBzrDir(
 
2508
                    a_bzrdir.root_transport.clone(repo_path), a_bzrdir._format,
 
2509
                    a_bzrdir._client)
 
2510
            remote_repo = RemoteRepository(repo_bzrdir, repo_format)
2125
2511
        remote_branch = RemoteBranch(a_bzrdir, remote_repo,
2126
2512
            format=format, setup_stacking=False, name=name)
 
2513
        if append_revisions_only:
 
2514
            remote_branch.set_append_revisions_only(append_revisions_only)
2127
2515
        # XXX: We know this is a new branch, so it must have revno 0, revid
2128
2516
        # NULL_REVISION. Creating the branch locked would make this be unable
2129
2517
        # to be wrong; here its simply very unlikely to be wrong. RBC 20090225
2148
2536
        self._ensure_real()
2149
2537
        return self._custom_format.supports_set_append_revisions_only()
2150
2538
 
 
2539
    def _use_default_local_heads_to_fetch(self):
 
2540
        # If the branch format is a metadir format *and* its heads_to_fetch
 
2541
        # implementation is not overridden vs the base class, we can use the
 
2542
        # base class logic rather than use the heads_to_fetch RPC.  This is
 
2543
        # usually cheaper in terms of net round trips, as the last-revision and
 
2544
        # tags info fetched is cached and would be fetched anyway.
 
2545
        self._ensure_real()
 
2546
        if isinstance(self._custom_format, branch.BranchFormatMetadir):
 
2547
            branch_class = self._custom_format._branch_class()
 
2548
            heads_to_fetch_impl = branch_class.heads_to_fetch.im_func
 
2549
            if heads_to_fetch_impl is branch.Branch.heads_to_fetch.im_func:
 
2550
                return True
 
2551
        return False
2151
2552
 
2152
2553
class RemoteBranch(branch.Branch, _RpcHelper, lock._RelockDebugMixin):
2153
2554
    """Branch stored on a server accessed by HPSS RPC.
2311
2712
                self.bzrdir, self._client)
2312
2713
        return self._control_files
2313
2714
 
2314
 
    def _get_checkout_format(self):
 
2715
    def _get_checkout_format(self, lightweight=False):
2315
2716
        self._ensure_real()
2316
 
        return self._real_branch._get_checkout_format()
 
2717
        if lightweight:
 
2718
            format = RemoteBzrDirFormat()
 
2719
            self.bzrdir._format._supply_sub_formats_to(format)
 
2720
            format.workingtree_format = self._real_branch._get_checkout_format(
 
2721
                lightweight=lightweight).workingtree_format
 
2722
            return format
 
2723
        else:
 
2724
            return self._real_branch._get_checkout_format(lightweight=False)
2317
2725
 
2318
2726
    def get_physical_lock_status(self):
2319
2727
        """See Branch.get_physical_lock_status()."""
2352
2760
            self._is_stacked = False
2353
2761
        else:
2354
2762
            self._is_stacked = True
2355
 
        
 
2763
 
2356
2764
    def _vfs_get_tags_bytes(self):
2357
2765
        self._ensure_real()
2358
2766
        return self._real_branch._get_tags_bytes()
2359
2767
 
 
2768
    @needs_read_lock
2360
2769
    def _get_tags_bytes(self):
 
2770
        if self._tags_bytes is None:
 
2771
            self._tags_bytes = self._get_tags_bytes_via_hpss()
 
2772
        return self._tags_bytes
 
2773
 
 
2774
    def _get_tags_bytes_via_hpss(self):
2361
2775
        medium = self._client._medium
2362
2776
        if medium._is_remote_before((1, 13)):
2363
2777
            return self._vfs_get_tags_bytes()
2373
2787
        return self._real_branch._set_tags_bytes(bytes)
2374
2788
 
2375
2789
    def _set_tags_bytes(self, bytes):
 
2790
        if self.is_locked():
 
2791
            self._tags_bytes = bytes
2376
2792
        medium = self._client._medium
2377
2793
        if medium._is_remote_before((1, 18)):
2378
2794
            self._vfs_set_tags_bytes(bytes)
2387
2803
            self._vfs_set_tags_bytes(bytes)
2388
2804
 
2389
2805
    def lock_read(self):
 
2806
        """Lock the branch for read operations.
 
2807
 
 
2808
        :return: A bzrlib.lock.LogicalLockResult.
 
2809
        """
2390
2810
        self.repository.lock_read()
2391
2811
        if not self._lock_mode:
2392
2812
            self._note_lock('r')
2396
2816
                self._real_branch.lock_read()
2397
2817
        else:
2398
2818
            self._lock_count += 1
 
2819
        return lock.LogicalLockResult(self.unlock)
2399
2820
 
2400
2821
    def _remote_lock_write(self, token):
2401
2822
        if token is None:
2402
2823
            branch_token = repo_token = ''
2403
2824
        else:
2404
2825
            branch_token = token
2405
 
            repo_token = self.repository.lock_write()
 
2826
            repo_token = self.repository.lock_write().repository_token
2406
2827
            self.repository.unlock()
2407
2828
        err_context = {'token': token}
2408
 
        response = self._call(
2409
 
            'Branch.lock_write', self._remote_path(), branch_token,
2410
 
            repo_token or '', **err_context)
 
2829
        try:
 
2830
            response = self._call(
 
2831
                'Branch.lock_write', self._remote_path(), branch_token,
 
2832
                repo_token or '', **err_context)
 
2833
        except errors.LockContention, e:
 
2834
            # The LockContention from the server doesn't have any
 
2835
            # information about the lock_url. We re-raise LockContention
 
2836
            # with valid lock_url.
 
2837
            raise errors.LockContention('(remote lock)',
 
2838
                self.repository.base.split('.bzr/')[0])
2411
2839
        if response[0] != 'ok':
2412
2840
            raise errors.UnexpectedSmartServerResponse(response)
2413
2841
        ok, branch_token, repo_token = response
2434
2862
            self._lock_mode = 'w'
2435
2863
            self._lock_count = 1
2436
2864
        elif self._lock_mode == 'r':
2437
 
            raise errors.ReadOnlyTransaction
 
2865
            raise errors.ReadOnlyError(self)
2438
2866
        else:
2439
2867
            if token is not None:
2440
2868
                # A token was given to lock_write, and we're relocking, so
2445
2873
            self._lock_count += 1
2446
2874
            # Re-lock the repository too.
2447
2875
            self.repository.lock_write(self._repo_lock_token)
2448
 
        return self._lock_token or None
 
2876
        return BranchWriteLockResult(self.unlock, self._lock_token or None)
2449
2877
 
2450
2878
    def _unlock(self, branch_token, repo_token):
2451
2879
        err_context = {'token': str((branch_token, repo_token))}
2520
2948
            missing_parent = parent_map[missing_parent]
2521
2949
        raise errors.RevisionNotPresent(missing_parent, self.repository)
2522
2950
 
2523
 
    def _last_revision_info(self):
 
2951
    def _read_last_revision_info(self):
2524
2952
        response = self._call('Branch.last_revision_info', self._remote_path())
2525
2953
        if response[0] != 'ok':
2526
2954
            raise SmartProtocolError('unexpected response code %s' % (response,))
2589
3017
            raise errors.UnexpectedSmartServerResponse(response)
2590
3018
        self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2591
3019
 
 
3020
    @symbol_versioning.deprecated_method(symbol_versioning.deprecated_in((2, 4, 0)))
2592
3021
    @needs_write_lock
2593
3022
    def set_revision_history(self, rev_history):
 
3023
        """See Branch.set_revision_history."""
 
3024
        self._set_revision_history(rev_history)
 
3025
 
 
3026
    @needs_write_lock
 
3027
    def _set_revision_history(self, rev_history):
2594
3028
        # Send just the tip revision of the history; the server will generate
2595
3029
        # the full history from that.  If the revision doesn't exist in this
2596
3030
        # branch, NoSuchRevision will be raised.
2654
3088
            _override_hook_target=self, **kwargs)
2655
3089
 
2656
3090
    @needs_read_lock
2657
 
    def push(self, target, overwrite=False, stop_revision=None):
 
3091
    def push(self, target, overwrite=False, stop_revision=None, lossy=False):
2658
3092
        self._ensure_real()
2659
3093
        return self._real_branch.push(
2660
 
            target, overwrite=overwrite, stop_revision=stop_revision,
 
3094
            target, overwrite=overwrite, stop_revision=stop_revision, lossy=lossy,
2661
3095
            _override_hook_source_branch=self)
2662
3096
 
2663
3097
    def is_locked(self):
2673
3107
        # XXX: These should be returned by the set_last_revision_info verb
2674
3108
        old_revno, old_revid = self.last_revision_info()
2675
3109
        self._run_pre_change_branch_tip_hooks(revno, revision_id)
2676
 
        revision_id = ensure_null(revision_id)
 
3110
        if not revision_id or not isinstance(revision_id, basestring):
 
3111
            raise errors.InvalidRevisionId(revision_id=revision_id, branch=self)
2677
3112
        try:
2678
3113
            response = self._call('Branch.set_last_revision_info',
2679
3114
                self._remote_path(), self._lock_token, self._repo_lock_token,
2708
3143
            except errors.UnknownSmartMethod:
2709
3144
                medium._remember_remote_is_before((1, 6))
2710
3145
        self._clear_cached_state_of_remote_branch_only()
2711
 
        self.set_revision_history(self._lefthand_history(revision_id,
 
3146
        self._set_revision_history(self._lefthand_history(revision_id,
2712
3147
            last_rev=last_rev,other_branch=other_branch))
2713
3148
 
2714
3149
    def set_push_location(self, location):
2715
3150
        self._ensure_real()
2716
3151
        return self._real_branch.set_push_location(location)
2717
3152
 
 
3153
    def heads_to_fetch(self):
 
3154
        if self._format._use_default_local_heads_to_fetch():
 
3155
            # We recognise this format, and its heads-to-fetch implementation
 
3156
            # is the default one (tip + tags).  In this case it's cheaper to
 
3157
            # just use the default implementation rather than a special RPC as
 
3158
            # the tip and tags data is cached.
 
3159
            return branch.Branch.heads_to_fetch(self)
 
3160
        medium = self._client._medium
 
3161
        if medium._is_remote_before((2, 4)):
 
3162
            return self._vfs_heads_to_fetch()
 
3163
        try:
 
3164
            return self._rpc_heads_to_fetch()
 
3165
        except errors.UnknownSmartMethod:
 
3166
            medium._remember_remote_is_before((2, 4))
 
3167
            return self._vfs_heads_to_fetch()
 
3168
 
 
3169
    def _rpc_heads_to_fetch(self):
 
3170
        response = self._call('Branch.heads_to_fetch', self._remote_path())
 
3171
        if len(response) != 2:
 
3172
            raise errors.UnexpectedSmartServerResponse(response)
 
3173
        must_fetch, if_present_fetch = response
 
3174
        return set(must_fetch), set(if_present_fetch)
 
3175
 
 
3176
    def _vfs_heads_to_fetch(self):
 
3177
        self._ensure_real()
 
3178
        return self._real_branch.heads_to_fetch()
 
3179
 
2718
3180
 
2719
3181
class RemoteConfig(object):
2720
3182
    """A Config that reads and writes from smart verbs.
2734
3196
        """
2735
3197
        try:
2736
3198
            configobj = self._get_configobj()
 
3199
            section_obj = None
2737
3200
            if section is None:
2738
3201
                section_obj = configobj
2739
3202
            else:
2740
3203
                try:
2741
3204
                    section_obj = configobj[section]
2742
3205
                except KeyError:
2743
 
                    return default
2744
 
            return section_obj.get(name, default)
 
3206
                    pass
 
3207
            if section_obj is None:
 
3208
                value = default
 
3209
            else:
 
3210
                value = section_obj.get(name, default)
2745
3211
        except errors.UnknownSmartMethod:
2746
 
            return self._vfs_get_option(name, section, default)
 
3212
            value = self._vfs_get_option(name, section, default)
 
3213
        for hook in config.OldConfigHooks['get']:
 
3214
            hook(self, name, value)
 
3215
        return value
2747
3216
 
2748
3217
    def _response_to_configobj(self, response):
2749
3218
        if len(response[0]) and response[0][0] != 'ok':
2750
3219
            raise errors.UnexpectedSmartServerResponse(response)
2751
3220
        lines = response[1].read_body_bytes().splitlines()
2752
 
        return config.ConfigObj(lines, encoding='utf-8')
 
3221
        conf = config.ConfigObj(lines, encoding='utf-8')
 
3222
        for hook in config.OldConfigHooks['load']:
 
3223
            hook(self)
 
3224
        return conf
2753
3225
 
2754
3226
 
2755
3227
class RemoteBranchConfig(RemoteConfig):
2774
3246
        medium = self._branch._client._medium
2775
3247
        if medium._is_remote_before((1, 14)):
2776
3248
            return self._vfs_set_option(value, name, section)
 
3249
        if isinstance(value, dict):
 
3250
            if medium._is_remote_before((2, 2)):
 
3251
                return self._vfs_set_option(value, name, section)
 
3252
            return self._set_config_option_dict(value, name, section)
 
3253
        else:
 
3254
            return self._set_config_option(value, name, section)
 
3255
 
 
3256
    def _set_config_option(self, value, name, section):
2777
3257
        try:
2778
3258
            path = self._branch._remote_path()
2779
3259
            response = self._branch._client.call('Branch.set_config_option',
2780
3260
                path, self._branch._lock_token, self._branch._repo_lock_token,
2781
3261
                value.encode('utf8'), name, section or '')
2782
3262
        except errors.UnknownSmartMethod:
 
3263
            medium = self._branch._client._medium
2783
3264
            medium._remember_remote_is_before((1, 14))
2784
3265
            return self._vfs_set_option(value, name, section)
2785
3266
        if response != ():
2786
3267
            raise errors.UnexpectedSmartServerResponse(response)
2787
3268
 
 
3269
    def _serialize_option_dict(self, option_dict):
 
3270
        utf8_dict = {}
 
3271
        for key, value in option_dict.items():
 
3272
            if isinstance(key, unicode):
 
3273
                key = key.encode('utf8')
 
3274
            if isinstance(value, unicode):
 
3275
                value = value.encode('utf8')
 
3276
            utf8_dict[key] = value
 
3277
        return bencode.bencode(utf8_dict)
 
3278
 
 
3279
    def _set_config_option_dict(self, value, name, section):
 
3280
        try:
 
3281
            path = self._branch._remote_path()
 
3282
            serialised_dict = self._serialize_option_dict(value)
 
3283
            response = self._branch._client.call(
 
3284
                'Branch.set_config_option_dict',
 
3285
                path, self._branch._lock_token, self._branch._repo_lock_token,
 
3286
                serialised_dict, name, section or '')
 
3287
        except errors.UnknownSmartMethod:
 
3288
            medium = self._branch._client._medium
 
3289
            medium._remember_remote_is_before((2, 2))
 
3290
            return self._vfs_set_option(value, name, section)
 
3291
        if response != ():
 
3292
            raise errors.UnexpectedSmartServerResponse(response)
 
3293
 
2788
3294
    def _real_object(self):
2789
3295
        self._branch._ensure_real()
2790
3296
        return self._branch._real_branch
2873
3379
                    'Missing key %r in context %r', key_err.args[0], context)
2874
3380
                raise err
2875
3381
 
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':
 
3382
    if err.error_verb == 'NoSuchRevision':
2880
3383
        raise NoSuchRevision(find('branch'), err.error_args[0])
2881
3384
    elif err.error_verb == 'nosuchrevision':
2882
3385
        raise NoSuchRevision(find('repository'), err.error_args[0])
2889
3392
            detail=extra)
2890
3393
    elif err.error_verb == 'norepository':
2891
3394
        raise errors.NoRepositoryPresent(find('bzrdir'))
2892
 
    elif err.error_verb == 'LockContention':
2893
 
        raise errors.LockContention('(remote lock)')
2894
3395
    elif err.error_verb == 'UnlockableTransport':
2895
3396
        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
3397
    elif err.error_verb == 'TokenMismatch':
2899
3398
        raise errors.TokenMismatch(find('token'), '(remote token)')
2900
3399
    elif err.error_verb == 'Diverged':
2901
3400
        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
3401
    elif err.error_verb == 'NotStacked':
2909
3402
        raise errors.NotStacked(branch=find('branch'))
2910
3403
    elif err.error_verb == 'PermissionDenied':
2920
3413
    elif err.error_verb == 'NoSuchFile':
2921
3414
        path = get_path()
2922
3415
        raise errors.NoSuchFile(path)
 
3416
    _translate_error_without_context(err)
 
3417
 
 
3418
 
 
3419
def _translate_error_without_context(err):
 
3420
    """Translate any ErrorFromSmartServer values that don't require context"""
 
3421
    if err.error_verb == 'IncompatibleRepositories':
 
3422
        raise errors.IncompatibleRepositories(err.error_args[0],
 
3423
            err.error_args[1], err.error_args[2])
 
3424
    elif err.error_verb == 'LockContention':
 
3425
        raise errors.LockContention('(remote lock)')
 
3426
    elif err.error_verb == 'LockFailed':
 
3427
        raise errors.LockFailed(err.error_args[0], err.error_args[1])
 
3428
    elif err.error_verb == 'TipChangeRejected':
 
3429
        raise errors.TipChangeRejected(err.error_args[0].decode('utf8'))
 
3430
    elif err.error_verb == 'UnstackableBranchFormat':
 
3431
        raise errors.UnstackableBranchFormat(*err.error_args)
 
3432
    elif err.error_verb == 'UnstackableRepositoryFormat':
 
3433
        raise errors.UnstackableRepositoryFormat(*err.error_args)
2923
3434
    elif err.error_verb == 'FileExists':
2924
3435
        raise errors.FileExists(err.error_args[0])
2925
3436
    elif err.error_verb == 'DirectoryNotEmpty':
2944
3455
            raise UnicodeEncodeError(encoding, val, start, end, reason)
2945
3456
    elif err.error_verb == 'ReadOnlyError':
2946
3457
        raise errors.TransportNotPossible('readonly transport')
 
3458
    elif err.error_verb == 'MemoryError':
 
3459
        raise errors.BzrError("remote server out of memory\n"
 
3460
            "Retry non-remotely, or contact the server admin for details.")
2947
3461
    raise errors.UnknownErrorFromSmartServer(err)