/brz/remove-bazaar

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

« back to all changes in this revision

Viewing changes to bzrlib/remote.py

  • Committer: Jelmer Vernooij
  • Date: 2011-11-20 02:16:25 UTC
  • mto: This revision was merged to the branch mainline in revision 6318.
  • Revision ID: jelmer@samba.org-20111120021625-ckv3ro8u6v8yswme
Convert to iter_files_bytes_bz2.

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
269
526
        self._real_bzrdir.destroy_branch(name=name)
270
527
        self._next_open_branch_result = None
271
528
 
272
 
    def create_workingtree(self, revision_id=None, from_branch=None):
 
529
    def create_workingtree(self, revision_id=None, from_branch=None,
 
530
        accelerator_tree=None, hardlink=False):
273
531
        raise errors.NotLocalUrl(self.transport.base)
274
532
 
275
 
    def find_branch_format(self):
 
533
    def find_branch_format(self, name=None):
276
534
        """Find the branch 'format' for this bzrdir.
277
535
 
278
536
        This might be a synthetic object for e.g. RemoteBranch and SVN.
279
537
        """
280
 
        b = self.open_branch()
 
538
        b = self.open_branch(name=name)
281
539
        return b._format
282
540
 
283
 
    def get_branch_reference(self):
 
541
    def get_branch_reference(self, name=None):
284
542
        """See BzrDir.get_branch_reference()."""
 
543
        if name is not None:
 
544
            # XXX JRV20100304: Support opening colocated branches
 
545
            raise errors.NoColocatedBranchSupport(self)
285
546
        response = self._get_branch_reference()
286
547
        if response[0] == 'ref':
287
548
            return response[1]
318
579
            raise errors.UnexpectedSmartServerResponse(response)
319
580
        return response
320
581
 
321
 
    def _get_tree_branch(self):
 
582
    def _get_tree_branch(self, name=None):
322
583
        """See BzrDir._get_tree_branch()."""
323
 
        return None, self.open_branch()
 
584
        return None, self.open_branch(name=name)
324
585
 
325
586
    def open_branch(self, name=None, unsupported=False,
326
587
                    ignore_fallbacks=False):
411
672
 
412
673
    def has_workingtree(self):
413
674
        if self._has_working_tree is None:
414
 
            self._ensure_real()
415
 
            self._has_working_tree = self._real_bzrdir.has_workingtree()
 
675
            path = self._path_for_remote_call(self._client)
 
676
            try:
 
677
                response = self._call('BzrDir.has_workingtree', path)
 
678
            except errors.UnknownSmartMethod:
 
679
                self._ensure_real()
 
680
                self._has_working_tree = self._real_bzrdir.has_workingtree()
 
681
            else:
 
682
                if response[0] not in ('yes', 'no'):
 
683
                    raise SmartProtocolError('unexpected response code %s' % (response,))
 
684
                self._has_working_tree = (response[0] == 'yes')
416
685
        return self._has_working_tree
417
686
 
418
687
    def open_workingtree(self, recommend_upgrade=True):
423
692
 
424
693
    def _path_for_remote_call(self, client):
425
694
        """Return the path to be used for this bzrdir in a remote call."""
426
 
        return client.remote_path_from_transport(self.root_transport)
 
695
        return urlutils.split_segment_parameters_raw(
 
696
            client.remote_path_from_transport(self.root_transport))[0]
427
697
 
428
698
    def get_branch_transport(self, branch_format, name=None):
429
699
        self._ensure_real()
441
711
        """Upgrading of remote bzrdirs is not supported yet."""
442
712
        return False
443
713
 
444
 
    def needs_format_conversion(self, format=None):
 
714
    def needs_format_conversion(self, format):
445
715
        """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
716
        return False
450
717
 
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
718
    def _get_config(self):
458
719
        return RemoteBzrDirConfig(self)
459
720
 
460
721
 
461
 
class RemoteRepositoryFormat(repository.RepositoryFormat):
 
722
class RemoteRepositoryFormat(vf_repository.VersionedFileRepositoryFormat):
462
723
    """Format for repositories accessed over a _SmartClient.
463
724
 
464
725
    Instances of this repository are represented by RemoteRepository
479
740
    """
480
741
 
481
742
    _matchingbzrdir = RemoteBzrDirFormat()
 
743
    supports_full_versioned_files = True
 
744
    supports_leaving_lock = True
482
745
 
483
746
    def __init__(self):
484
 
        repository.RepositoryFormat.__init__(self)
 
747
        _mod_repository.RepositoryFormat.__init__(self)
485
748
        self._custom_format = None
486
749
        self._network_name = None
487
750
        self._creating_bzrdir = None
 
751
        self._revision_graph_can_have_wrong_parents = None
488
752
        self._supports_chks = None
489
753
        self._supports_external_lookups = None
490
754
        self._supports_tree_reference = None
 
755
        self._supports_funky_characters = None
 
756
        self._supports_nesting_repositories = None
491
757
        self._rich_root_data = None
492
758
 
493
759
    def __repr__(self):
522
788
        return self._supports_external_lookups
523
789
 
524
790
    @property
 
791
    def supports_funky_characters(self):
 
792
        if self._supports_funky_characters is None:
 
793
            self._ensure_real()
 
794
            self._supports_funky_characters = \
 
795
                self._custom_format.supports_funky_characters
 
796
        return self._supports_funky_characters
 
797
 
 
798
    @property
 
799
    def supports_nesting_repositories(self):
 
800
        if self._supports_nesting_repositories is None:
 
801
            self._ensure_real()
 
802
            self._supports_nesting_repositories = \
 
803
                self._custom_format.supports_nesting_repositories
 
804
        return self._supports_nesting_repositories
 
805
 
 
806
    @property
525
807
    def supports_tree_reference(self):
526
808
        if self._supports_tree_reference is None:
527
809
            self._ensure_real()
529
811
                self._custom_format.supports_tree_reference
530
812
        return self._supports_tree_reference
531
813
 
 
814
    @property
 
815
    def revision_graph_can_have_wrong_parents(self):
 
816
        if self._revision_graph_can_have_wrong_parents is None:
 
817
            self._ensure_real()
 
818
            self._revision_graph_can_have_wrong_parents = \
 
819
                self._custom_format.revision_graph_can_have_wrong_parents
 
820
        return self._revision_graph_can_have_wrong_parents
 
821
 
532
822
    def _vfs_initialize(self, a_bzrdir, shared):
533
823
        """Helper for common code in initialize."""
534
824
        if self._custom_format:
569
859
            network_name = self._network_name
570
860
        else:
571
861
            # Select the current bzrlib default and ask for that.
572
 
            reference_bzrdir_format = bzrdir.format_registry.get('default')()
 
862
            reference_bzrdir_format = _mod_bzrdir.format_registry.get('default')()
573
863
            reference_format = reference_bzrdir_format.repository_format
574
864
            network_name = reference_format.network_name()
575
865
        # 2) try direct creation via RPC
601
891
 
602
892
    def _ensure_real(self):
603
893
        if self._custom_format is None:
604
 
            self._custom_format = repository.network_format_registry.get(
 
894
            self._custom_format = _mod_repository.network_format_registry.get(
605
895
                self._network_name)
606
896
 
607
897
    @property
644
934
 
645
935
 
646
936
class RemoteRepository(_RpcHelper, lock._RelockDebugMixin,
647
 
    bzrdir.ControlComponent):
 
937
    controldir.ControlComponent):
648
938
    """Repository accessed over rpc.
649
939
 
650
940
    For the moment most operations are performed using local transport-backed
703
993
        # transport, but I'm not sure it's worth making this method
704
994
        # optional -- mbp 2010-04-21
705
995
        return self.bzrdir.get_repository_transport(None)
706
 
        
 
996
 
707
997
    def __str__(self):
708
998
        return "%s(%s)" % (self.__class__.__name__, self.base)
709
999
 
817
1107
    def find_text_key_references(self):
818
1108
        """Find the text key references within the repository.
819
1109
 
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
1110
        :return: A dictionary mapping text keys ((fileid, revision_id) tuples)
824
1111
            to whether they were referred to by the inventory of the
825
1112
            revision_id that they contain. The inventory texts from all present
843
1130
        """Private method for using with old (< 1.2) servers to fallback."""
844
1131
        if revision_id is None:
845
1132
            revision_id = ''
846
 
        elif revision.is_null(revision_id):
 
1133
        elif _mod_revision.is_null(revision_id):
847
1134
            return {}
848
1135
 
849
1136
        path = self.bzrdir._path_for_remote_call(self._client)
873
1160
        return RemoteStreamSource(self, to_format)
874
1161
 
875
1162
    @needs_read_lock
 
1163
    def get_file_graph(self):
 
1164
        return graph.Graph(self.texts)
 
1165
 
 
1166
    @needs_read_lock
876
1167
    def has_revision(self, revision_id):
877
1168
        """True if this repository has a copy of the revision."""
878
1169
        # Copy of bzrlib.repository.Repository.has_revision
895
1186
    def _has_same_fallbacks(self, other_repo):
896
1187
        """Returns true if the repositories have the same fallbacks."""
897
1188
        # XXX: copied from Repository; it should be unified into a base class
898
 
        # <https://bugs.edge.launchpad.net/bzr/+bug/401622>
 
1189
        # <https://bugs.launchpad.net/bzr/+bug/401622>
899
1190
        my_fb = self._fallback_repositories
900
1191
        other_fb = other_repo._fallback_repositories
901
1192
        if len(my_fb) != len(other_fb):
930
1221
        """See Repository.gather_stats()."""
931
1222
        path = self.bzrdir._path_for_remote_call(self._client)
932
1223
        # revid can be None to indicate no revisions, not just NULL_REVISION
933
 
        if revid is None or revision.is_null(revid):
 
1224
        if revid is None or _mod_revision.is_null(revid):
934
1225
            fmt_revid = ''
935
1226
        else:
936
1227
            fmt_revid = revid
997
1288
        pass
998
1289
 
999
1290
    def lock_read(self):
 
1291
        """Lock the repository for read operations.
 
1292
 
 
1293
        :return: A bzrlib.lock.LogicalLockResult.
 
1294
        """
1000
1295
        # wrong eventually - want a local lock cache context
1001
1296
        if not self._lock_mode:
1002
1297
            self._note_lock('r')
1009
1304
                repo.lock_read()
1010
1305
        else:
1011
1306
            self._lock_count += 1
 
1307
        return lock.LogicalLockResult(self.unlock)
1012
1308
 
1013
1309
    def _remote_lock_write(self, token):
1014
1310
        path = self.bzrdir._path_for_remote_call(self._client)
1054
1350
            raise errors.ReadOnlyError(self)
1055
1351
        else:
1056
1352
            self._lock_count += 1
1057
 
        return self._lock_token or None
 
1353
        return RepositoryWriteLockResult(self.unlock, self._lock_token or None)
1058
1354
 
1059
1355
    def leave_lock_in_place(self):
1060
1356
        if not self._lock_token:
1194
1490
            return t
1195
1491
        raise errors.UnexpectedSmartServerResponse(response)
1196
1492
 
 
1493
    @needs_read_lock
1197
1494
    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)
 
1495
        """Create a descendent repository for new development.
 
1496
 
 
1497
        Unlike clone, this does not copy the settings of the repository.
 
1498
        """
 
1499
        dest_repo = self._create_sprouting_repo(to_bzrdir, shared=False)
1202
1500
        dest_repo.fetch(self, revision_id=revision_id)
1203
1501
        return dest_repo
1204
1502
 
 
1503
    def _create_sprouting_repo(self, a_bzrdir, shared):
 
1504
        if not isinstance(a_bzrdir._format, self.bzrdir._format.__class__):
 
1505
            # use target default format.
 
1506
            dest_repo = a_bzrdir.create_repository()
 
1507
        else:
 
1508
            # Most control formats need the repository to be specifically
 
1509
            # created, but on some old all-in-one formats it's not needed
 
1510
            try:
 
1511
                dest_repo = self._format.initialize(a_bzrdir, shared=shared)
 
1512
            except errors.UninitializableFormat:
 
1513
                dest_repo = a_bzrdir.open_repository()
 
1514
        return dest_repo
 
1515
 
1205
1516
    ### These methods are just thin shims to the VFS object for now.
1206
1517
 
 
1518
    @needs_read_lock
1207
1519
    def revision_tree(self, revision_id):
1208
 
        self._ensure_real()
1209
 
        return self._real_repository.revision_tree(revision_id)
 
1520
        revision_id = _mod_revision.ensure_null(revision_id)
 
1521
        if revision_id == _mod_revision.NULL_REVISION:
 
1522
            return InventoryRevisionTree(self,
 
1523
                Inventory(root_id=None), _mod_revision.NULL_REVISION)
 
1524
        else:
 
1525
            return list(self.revision_trees([revision_id]))[0]
1210
1526
 
1211
1527
    def get_serializer_format(self):
1212
1528
        self._ensure_real()
1214
1530
 
1215
1531
    def get_commit_builder(self, branch, parents, config, timestamp=None,
1216
1532
                           timezone=None, committer=None, revprops=None,
1217
 
                           revision_id=None):
 
1533
                           revision_id=None, lossy=False):
1218
1534
        # FIXME: It ought to be possible to call this without immediately
1219
1535
        # triggering _ensure_real.  For now it's the easiest thing to do.
1220
1536
        self._ensure_real()
1221
1537
        real_repo = self._real_repository
1222
1538
        builder = real_repo.get_commit_builder(branch, parents,
1223
1539
                config, timestamp=timestamp, timezone=timezone,
1224
 
                committer=committer, revprops=revprops, revision_id=revision_id)
 
1540
                committer=committer, revprops=revprops,
 
1541
                revision_id=revision_id, lossy=lossy)
1225
1542
        return builder
1226
1543
 
1227
1544
    def add_fallback_repository(self, repository):
1235
1552
        # We need to accumulate additional repositories here, to pass them in
1236
1553
        # on various RPC's.
1237
1554
        #
 
1555
        # Make the check before we lock: this raises an exception.
 
1556
        self._check_fallback_repository(repository)
1238
1557
        if self.is_locked():
1239
1558
            # We will call fallback.unlock() when we transition to the unlocked
1240
1559
            # state, so always add a lock here. If a caller passes us a locked
1241
1560
            # repository, they are responsible for unlocking it later.
1242
1561
            repository.lock_read()
1243
 
        self._check_fallback_repository(repository)
1244
1562
        self._fallback_repositories.append(repository)
1245
1563
        # If self._real_repository was parameterised already (e.g. because a
1246
1564
        # _real_branch had its get_stacked_on_url method called), then the
1288
1606
 
1289
1607
    @needs_read_lock
1290
1608
    def get_revision(self, revision_id):
1291
 
        self._ensure_real()
1292
 
        return self._real_repository.get_revision(revision_id)
 
1609
        return self.get_revisions([revision_id])[0]
1293
1610
 
1294
1611
    def get_transaction(self):
1295
1612
        self._ensure_real()
1297
1614
 
1298
1615
    @needs_read_lock
1299
1616
    def clone(self, a_bzrdir, revision_id=None):
1300
 
        self._ensure_real()
1301
 
        return self._real_repository.clone(a_bzrdir, revision_id=revision_id)
 
1617
        dest_repo = self._create_sprouting_repo(
 
1618
            a_bzrdir, shared=self.is_shared())
 
1619
        self.copy_content_into(dest_repo, revision_id)
 
1620
        return dest_repo
1302
1621
 
1303
1622
    def make_working_trees(self):
1304
1623
        """See Repository.make_working_trees"""
1305
 
        self._ensure_real()
1306
 
        return self._real_repository.make_working_trees()
 
1624
        path = self.bzrdir._path_for_remote_call(self._client)
 
1625
        try:
 
1626
            response = self._call('Repository.make_working_trees', path)
 
1627
        except errors.UnknownSmartMethod:
 
1628
            self._ensure_real()
 
1629
            return self._real_repository.make_working_trees()
 
1630
        if response[0] not in ('yes', 'no'):
 
1631
            raise SmartProtocolError('unexpected response code %s' % (response,))
 
1632
        return response[0] == 'yes'
1307
1633
 
1308
1634
    def refresh_data(self):
1309
 
        """Re-read any data needed to to synchronise with disk.
 
1635
        """Re-read any data needed to synchronise with disk.
1310
1636
 
1311
1637
        This method is intended to be called after another repository instance
1312
1638
        (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.
 
1639
        repository. On all repositories this will work outside of write groups.
 
1640
        Some repository formats (pack and newer for bzrlib native formats)
 
1641
        support refresh_data inside write groups. If called inside a write
 
1642
        group on a repository that does not support refreshing in a write group
 
1643
        IsInWriteGroupError will be raised.
1315
1644
        """
1316
 
        if self.is_in_write_group():
1317
 
            raise errors.InternalBzrError(
1318
 
                "May not refresh_data while in a write group.")
1319
1645
        if self._real_repository is not None:
1320
1646
            self._real_repository.refresh_data()
1321
1647
 
1333
1659
        return result
1334
1660
 
1335
1661
    @needs_read_lock
1336
 
    def search_missing_revision_ids(self, other, revision_id=None, find_ghosts=True):
 
1662
    def search_missing_revision_ids(self, other,
 
1663
            revision_id=symbol_versioning.DEPRECATED_PARAMETER,
 
1664
            find_ghosts=True, revision_ids=None, if_present_ids=None,
 
1665
            limit=None):
1337
1666
        """Return the revision ids that other has that this does not.
1338
1667
 
1339
1668
        These are returned in topological order.
1340
1669
 
1341
1670
        revision_id: only return revision ids included by revision_id.
1342
1671
        """
1343
 
        return repository.InterRepository.get(
1344
 
            other, self).search_missing_revision_ids(revision_id, find_ghosts)
 
1672
        if symbol_versioning.deprecated_passed(revision_id):
 
1673
            symbol_versioning.warn(
 
1674
                'search_missing_revision_ids(revision_id=...) was '
 
1675
                'deprecated in 2.4.  Use revision_ids=[...] instead.',
 
1676
                DeprecationWarning, stacklevel=2)
 
1677
            if revision_ids is not None:
 
1678
                raise AssertionError(
 
1679
                    'revision_ids is mutually exclusive with revision_id')
 
1680
            if revision_id is not None:
 
1681
                revision_ids = [revision_id]
 
1682
        inter_repo = _mod_repository.InterRepository.get(other, self)
 
1683
        return inter_repo.search_missing_revision_ids(
 
1684
            find_ghosts=find_ghosts, revision_ids=revision_ids,
 
1685
            if_present_ids=if_present_ids, limit=limit)
1345
1686
 
1346
 
    def fetch(self, source, revision_id=None, pb=None, find_ghosts=False,
 
1687
    def fetch(self, source, revision_id=None, find_ghosts=False,
1347
1688
            fetch_spec=None):
1348
1689
        # No base implementation to use as RemoteRepository is not a subclass
1349
1690
        # of Repository; so this is a copy of Repository.fetch().
1360
1701
            # check that last_revision is in 'from' and then return a
1361
1702
            # no-operation.
1362
1703
            if (revision_id is not None and
1363
 
                not revision.is_null(revision_id)):
 
1704
                not _mod_revision.is_null(revision_id)):
1364
1705
                self.get_revision(revision_id)
1365
1706
            return 0, []
1366
1707
        # if there is no specific appropriate InterRepository, this will get
1367
1708
        # the InterRepository base class, which raises an
1368
1709
        # IncompatibleRepositories when asked to fetch.
1369
 
        inter = repository.InterRepository.get(source, self)
1370
 
        return inter.fetch(revision_id=revision_id, pb=pb,
 
1710
        inter = _mod_repository.InterRepository.get(source, self)
 
1711
        return inter.fetch(revision_id=revision_id,
1371
1712
            find_ghosts=find_ghosts, fetch_spec=fetch_spec)
1372
1713
 
1373
1714
    def create_bundle(self, target, base, fileobj, format=None):
1375
1716
        self._real_repository.create_bundle(target, base, fileobj, format)
1376
1717
 
1377
1718
    @needs_read_lock
 
1719
    @symbol_versioning.deprecated_method(
 
1720
        symbol_versioning.deprecated_in((2, 4, 0)))
1378
1721
    def get_ancestry(self, revision_id, topo_sorted=True):
1379
1722
        self._ensure_real()
1380
1723
        return self._real_repository.get_ancestry(revision_id, topo_sorted)
1388
1731
        return self._real_repository._get_versioned_file_checker(
1389
1732
            revisions, revision_versions_cache)
1390
1733
 
 
1734
    def _iter_files_bytes_rpc(self, desired_files):
 
1735
        def decompress_bz2_stream(byte_stream):
 
1736
            decompressor = bz2.BZ2Decompressor()
 
1737
            for bytes in byte_stream:
 
1738
                yield decompressor.decompress(bytes)
 
1739
        path = self.bzrdir._path_for_remote_call(self._client)
 
1740
        for (file_id, revision, identifier) in desired_files:
 
1741
            response_tuple, response_handler = self._call_expecting_body(
 
1742
                "Repository.iter_file_bytes", path, file_id, revision,
 
1743
                "bz2")
 
1744
            if response_tuple != ('ok', ):
 
1745
                raise errors.UnexpectedSmartServerResponse(response_tuple)
 
1746
            byte_stream = response_handler.read_streamed_body()
 
1747
            yield (identifier, decompress_bz2_stream(byte_stream))
 
1748
 
1391
1749
    def iter_files_bytes(self, desired_files):
1392
1750
        """See Repository.iter_file_bytes.
1393
1751
        """
1394
 
        self._ensure_real()
1395
 
        return self._real_repository.iter_files_bytes(desired_files)
 
1752
        try:
 
1753
            for (identifier, bytes_iterator) in self._iter_files_bytes_rpc(
 
1754
                    desired_files):
 
1755
                yield identifier, bytes_iterator
 
1756
        except errors.UnknownSmartMethod:
 
1757
            self._ensure_real()
 
1758
            for (identifier, bytes_iterator) in (
 
1759
                self._real_repository.iter_files_bytes(desired_files)):
 
1760
                yield identifier, bytes_iterator
 
1761
 
 
1762
    def get_cached_parent_map(self, revision_ids):
 
1763
        """See bzrlib.CachingParentsProvider.get_cached_parent_map"""
 
1764
        return self._unstacked_provider.get_cached_parent_map(revision_ids)
1396
1765
 
1397
1766
    def get_parent_map(self, revision_ids):
1398
1767
        """See bzrlib.Graph.get_parent_map()."""
1457
1826
        if parents_map is None:
1458
1827
            # Repository is not locked, so there's no cache.
1459
1828
            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)
 
1829
        if _DEFAULT_SEARCH_DEPTH <= 0:
 
1830
            (start_set, stop_keys,
 
1831
             key_count) = graph.search_result_from_parent_map(
 
1832
                parents_map, self._unstacked_provider.missing_keys)
 
1833
        else:
 
1834
            (start_set, stop_keys,
 
1835
             key_count) = graph.limited_search_result_from_parent_map(
 
1836
                parents_map, self._unstacked_provider.missing_keys,
 
1837
                keys, depth=_DEFAULT_SEARCH_DEPTH)
1480
1838
        recipe = ('manual', start_set, stop_keys, key_count)
1481
1839
        body = self._serialise_search_recipe(recipe)
1482
1840
        path = self.bzrdir._path_for_remote_call(self._client)
1555
1913
 
1556
1914
    @needs_read_lock
1557
1915
    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)
 
1916
        r = self.get_revision(revision_id)
 
1917
        return list(self.get_deltas_for_revisions([r],
 
1918
            specific_fileids=specific_fileids))[0]
1561
1919
 
1562
1920
    @needs_read_lock
1563
1921
    def revision_trees(self, revision_ids):
1576
1934
            callback_refs=callback_refs, check_repo=check_repo)
1577
1935
 
1578
1936
    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)
 
1937
        """Make a complete copy of the content in self into destination.
 
1938
 
 
1939
        This is a destructive operation! Do not use it on existing
 
1940
        repositories.
 
1941
        """
 
1942
        interrepo = _mod_repository.InterRepository.get(self, destination)
 
1943
        return interrepo.copy_content(revision_id)
1582
1944
 
1583
1945
    def _copy_repository_tarball(self, to_bzrdir, revision_id=None):
1584
1946
        # get a tarball of the remote repository, and copy from that into the
1586
1948
        from bzrlib import osutils
1587
1949
        import tarfile
1588
1950
        # TODO: Maybe a progress bar while streaming the tarball?
1589
 
        note("Copying repository content as tarball...")
 
1951
        note(gettext("Copying repository content as tarball..."))
1590
1952
        tar_file = self._get_tarball('bz2')
1591
1953
        if tar_file is None:
1592
1954
            return None
1597
1959
            tmpdir = osutils.mkdtemp()
1598
1960
            try:
1599
1961
                _extract_tar(tar, tmpdir)
1600
 
                tmp_bzrdir = BzrDir.open(tmpdir)
 
1962
                tmp_bzrdir = _mod_bzrdir.BzrDir.open(tmpdir)
1601
1963
                tmp_repo = tmp_bzrdir.open_repository()
1602
1964
                tmp_repo.copy_content_into(destination, revision_id)
1603
1965
            finally:
1688
2050
    def supports_rich_root(self):
1689
2051
        return self._format.rich_root_data
1690
2052
 
 
2053
    @symbol_versioning.deprecated_method(symbol_versioning.deprecated_in((2, 4, 0)))
1691
2054
    def iter_reverse_revision_history(self, revision_id):
1692
2055
        self._ensure_real()
1693
2056
        return self._real_repository.iter_reverse_revision_history(revision_id)
1696
2059
    def _serializer(self):
1697
2060
        return self._format._serializer
1698
2061
 
 
2062
    @needs_write_lock
1699
2063
    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)
 
2064
        signature = gpg_strategy.sign(plaintext)
 
2065
        self.add_signature_text(revision_id, signature)
1703
2066
 
1704
2067
    def add_signature_text(self, revision_id, signature):
1705
2068
        self._ensure_real()
1706
2069
        return self._real_repository.add_signature_text(revision_id, signature)
1707
2070
 
1708
2071
    def has_signature_for_revision_id(self, revision_id):
 
2072
        path = self.bzrdir._path_for_remote_call(self._client)
 
2073
        try:
 
2074
            response = self._call('Repository.has_signature_for_revision_id',
 
2075
                path, revision_id)
 
2076
        except errors.UnknownSmartMethod:
 
2077
            self._ensure_real()
 
2078
            return self._real_repository.has_signature_for_revision_id(
 
2079
                revision_id)
 
2080
        if response[0] not in ('yes', 'no'):
 
2081
            raise SmartProtocolError('unexpected response code %s' % (response,))
 
2082
        return (response[0] == 'yes')
 
2083
 
 
2084
    def verify_revision_signature(self, revision_id, gpg_strategy):
1709
2085
        self._ensure_real()
1710
 
        return self._real_repository.has_signature_for_revision_id(revision_id)
 
2086
        return self._real_repository.verify_revision_signature(
 
2087
            revision_id, gpg_strategy)
1711
2088
 
1712
2089
    def item_keys_introduced_by(self, revision_ids, _files_pb=None):
1713
2090
        self._ensure_real()
1714
2091
        return self._real_repository.item_keys_introduced_by(revision_ids,
1715
2092
            _files_pb=_files_pb)
1716
2093
 
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
2094
    def _find_inconsistent_revision_parents(self, revisions_iterator=None):
1723
2095
        self._ensure_real()
1724
2096
        return self._real_repository._find_inconsistent_revision_parents(
1732
2104
        providers = [self._unstacked_provider]
1733
2105
        if other is not None:
1734
2106
            providers.insert(0, other)
1735
 
        providers.extend(r._make_parents_provider() for r in
1736
 
                         self._fallback_repositories)
1737
 
        return graph.StackedParentsProvider(providers)
 
2107
        return graph.StackedParentsProvider(_LazyListJoin(
 
2108
            providers, self._fallback_repositories))
1738
2109
 
1739
2110
    def _serialise_search_recipe(self, recipe):
1740
2111
        """Serialise a graph search recipe.
1748
2119
        return '\n'.join((start_keys, stop_keys, count))
1749
2120
 
1750
2121
    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)]
 
2122
        parts = search_result.get_network_struct()
1757
2123
        return '\n'.join(parts)
1758
2124
 
1759
2125
    def autopack(self):
1769
2135
            raise errors.UnexpectedSmartServerResponse(response)
1770
2136
 
1771
2137
 
1772
 
class RemoteStreamSink(repository.StreamSink):
 
2138
class RemoteStreamSink(vf_repository.StreamSink):
1773
2139
 
1774
2140
    def _insert_real(self, stream, src_format, resume_tokens):
1775
2141
        self.target_repo._ensure_real()
1876
2242
        self._last_substream and self._last_stream so that the stream can be
1877
2243
        resumed by _resume_stream_with_vfs.
1878
2244
        """
1879
 
                    
 
2245
 
1880
2246
        stream_iter = iter(stream)
1881
2247
        for substream_kind, substream in stream_iter:
1882
2248
            if substream_kind == 'inventory-deltas':
1885
2251
                return
1886
2252
            else:
1887
2253
                yield substream_kind, substream
1888
 
            
1889
 
 
1890
 
class RemoteStreamSource(repository.StreamSource):
 
2254
 
 
2255
 
 
2256
class RemoteStreamSource(vf_repository.StreamSource):
1891
2257
    """Stream data from a remote server."""
1892
2258
 
1893
2259
    def get_stream(self, search):
1953
2319
        candidate_verbs = [
1954
2320
            ('Repository.get_stream_1.19', (1, 19)),
1955
2321
            ('Repository.get_stream', (1, 13))]
 
2322
 
1956
2323
        found_verb = False
1957
2324
        for verb, version in candidate_verbs:
1958
2325
            if medium._is_remote_before(version):
1962
2329
                    verb, args, search_bytes)
1963
2330
            except errors.UnknownSmartMethod:
1964
2331
                medium._remember_remote_is_before(version)
 
2332
            except errors.UnknownErrorFromSmartServer, e:
 
2333
                if isinstance(search, graph.EverythingResult):
 
2334
                    error_verb = e.error_from_smart_server.error_verb
 
2335
                    if error_verb == 'BadSearch':
 
2336
                        # Pre-2.4 servers don't support this sort of search.
 
2337
                        # XXX: perhaps falling back to VFS on BadSearch is a
 
2338
                        # good idea in general?  It might provide a little bit
 
2339
                        # of protection against client-side bugs.
 
2340
                        medium._remember_remote_is_before((2, 4))
 
2341
                        break
 
2342
                raise
1965
2343
            else:
1966
2344
                response_tuple, response_handler = response
1967
2345
                found_verb = True
1971
2349
        if response_tuple[0] != 'ok':
1972
2350
            raise errors.UnexpectedSmartServerResponse(response_tuple)
1973
2351
        byte_stream = response_handler.read_streamed_body()
1974
 
        src_format, stream = smart_repo._byte_stream_to_stream(byte_stream)
 
2352
        src_format, stream = smart_repo._byte_stream_to_stream(byte_stream,
 
2353
            self._record_counter)
1975
2354
        if src_format.network_name() != repo._format.network_name():
1976
2355
            raise AssertionError(
1977
2356
                "Mismatched RemoteRepository and stream src %r, %r" % (
2063
2442
        return a_bzrdir.open_branch(name=name, 
2064
2443
            ignore_fallbacks=ignore_fallbacks)
2065
2444
 
2066
 
    def _vfs_initialize(self, a_bzrdir, name):
 
2445
    def _vfs_initialize(self, a_bzrdir, name, append_revisions_only):
2067
2446
        # Initialisation when using a local bzrdir object, or a non-vfs init
2068
2447
        # method is not available on the server.
2069
2448
        # self._custom_format is always set - the start of initialize ensures
2071
2450
        if isinstance(a_bzrdir, RemoteBzrDir):
2072
2451
            a_bzrdir._ensure_real()
2073
2452
            result = self._custom_format.initialize(a_bzrdir._real_bzrdir,
2074
 
                name)
 
2453
                name, append_revisions_only=append_revisions_only)
2075
2454
        else:
2076
2455
            # We assume the bzrdir is parameterised; it may not be.
2077
 
            result = self._custom_format.initialize(a_bzrdir, name)
 
2456
            result = self._custom_format.initialize(a_bzrdir, name,
 
2457
                append_revisions_only=append_revisions_only)
2078
2458
        if (isinstance(a_bzrdir, RemoteBzrDir) and
2079
2459
            not isinstance(result, RemoteBranch)):
2080
2460
            result = RemoteBranch(a_bzrdir, a_bzrdir.find_repository(), result,
2081
2461
                                  name=name)
2082
2462
        return result
2083
2463
 
2084
 
    def initialize(self, a_bzrdir, name=None):
 
2464
    def initialize(self, a_bzrdir, name=None, repository=None,
 
2465
                   append_revisions_only=None):
2085
2466
        # 1) get the network name to use.
2086
2467
        if self._custom_format:
2087
2468
            network_name = self._custom_format.network_name()
2088
2469
        else:
2089
2470
            # Select the current bzrlib default and ask for that.
2090
 
            reference_bzrdir_format = bzrdir.format_registry.get('default')()
 
2471
            reference_bzrdir_format = _mod_bzrdir.format_registry.get('default')()
2091
2472
            reference_format = reference_bzrdir_format.get_branch_format()
2092
2473
            self._custom_format = reference_format
2093
2474
            network_name = reference_format.network_name()
2094
2475
        # Being asked to create on a non RemoteBzrDir:
2095
2476
        if not isinstance(a_bzrdir, RemoteBzrDir):
2096
 
            return self._vfs_initialize(a_bzrdir, name=name)
 
2477
            return self._vfs_initialize(a_bzrdir, name=name,
 
2478
                append_revisions_only=append_revisions_only)
2097
2479
        medium = a_bzrdir._client._medium
2098
2480
        if medium._is_remote_before((1, 13)):
2099
 
            return self._vfs_initialize(a_bzrdir, name=name)
 
2481
            return self._vfs_initialize(a_bzrdir, name=name,
 
2482
                append_revisions_only=append_revisions_only)
2100
2483
        # Creating on a remote bzr dir.
2101
2484
        # 2) try direct creation via RPC
2102
2485
        path = a_bzrdir._path_for_remote_call(a_bzrdir._client)
2109
2492
        except errors.UnknownSmartMethod:
2110
2493
            # Fallback - use vfs methods
2111
2494
            medium._remember_remote_is_before((1, 13))
2112
 
            return self._vfs_initialize(a_bzrdir, name=name)
 
2495
            return self._vfs_initialize(a_bzrdir, name=name,
 
2496
                    append_revisions_only=append_revisions_only)
2113
2497
        if response[0] != 'ok':
2114
2498
            raise errors.UnexpectedSmartServerResponse(response)
2115
2499
        # Turn the response into a RemoteRepository object.
2116
2500
        format = RemoteBranchFormat(network_name=response[1])
2117
2501
        repo_format = response_tuple_to_repo_format(response[3:])
2118
 
        if response[2] == '':
2119
 
            repo_bzrdir = a_bzrdir
 
2502
        repo_path = response[2]
 
2503
        if repository is not None:
 
2504
            remote_repo_url = urlutils.join(a_bzrdir.user_url, repo_path)
 
2505
            url_diff = urlutils.relative_url(repository.user_url,
 
2506
                    remote_repo_url)
 
2507
            if url_diff != '.':
 
2508
                raise AssertionError(
 
2509
                    'repository.user_url %r does not match URL from server '
 
2510
                    'response (%r + %r)'
 
2511
                    % (repository.user_url, a_bzrdir.user_url, repo_path))
 
2512
            remote_repo = repository
2120
2513
        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)
 
2514
            if repo_path == '':
 
2515
                repo_bzrdir = a_bzrdir
 
2516
            else:
 
2517
                repo_bzrdir = RemoteBzrDir(
 
2518
                    a_bzrdir.root_transport.clone(repo_path), a_bzrdir._format,
 
2519
                    a_bzrdir._client)
 
2520
            remote_repo = RemoteRepository(repo_bzrdir, repo_format)
2125
2521
        remote_branch = RemoteBranch(a_bzrdir, remote_repo,
2126
2522
            format=format, setup_stacking=False, name=name)
 
2523
        if append_revisions_only:
 
2524
            remote_branch.set_append_revisions_only(append_revisions_only)
2127
2525
        # XXX: We know this is a new branch, so it must have revno 0, revid
2128
2526
        # NULL_REVISION. Creating the branch locked would make this be unable
2129
2527
        # to be wrong; here its simply very unlikely to be wrong. RBC 20090225
2148
2546
        self._ensure_real()
2149
2547
        return self._custom_format.supports_set_append_revisions_only()
2150
2548
 
 
2549
    def _use_default_local_heads_to_fetch(self):
 
2550
        # If the branch format is a metadir format *and* its heads_to_fetch
 
2551
        # implementation is not overridden vs the base class, we can use the
 
2552
        # base class logic rather than use the heads_to_fetch RPC.  This is
 
2553
        # usually cheaper in terms of net round trips, as the last-revision and
 
2554
        # tags info fetched is cached and would be fetched anyway.
 
2555
        self._ensure_real()
 
2556
        if isinstance(self._custom_format, branch.BranchFormatMetadir):
 
2557
            branch_class = self._custom_format._branch_class()
 
2558
            heads_to_fetch_impl = branch_class.heads_to_fetch.im_func
 
2559
            if heads_to_fetch_impl is branch.Branch.heads_to_fetch.im_func:
 
2560
                return True
 
2561
        return False
2151
2562
 
2152
2563
class RemoteBranch(branch.Branch, _RpcHelper, lock._RelockDebugMixin):
2153
2564
    """Branch stored on a server accessed by HPSS RPC.
2311
2722
                self.bzrdir, self._client)
2312
2723
        return self._control_files
2313
2724
 
2314
 
    def _get_checkout_format(self):
 
2725
    def _get_checkout_format(self, lightweight=False):
2315
2726
        self._ensure_real()
2316
 
        return self._real_branch._get_checkout_format()
 
2727
        if lightweight:
 
2728
            format = RemoteBzrDirFormat()
 
2729
            self.bzrdir._format._supply_sub_formats_to(format)
 
2730
            format.workingtree_format = self._real_branch._get_checkout_format(
 
2731
                lightweight=lightweight).workingtree_format
 
2732
            return format
 
2733
        else:
 
2734
            return self._real_branch._get_checkout_format(lightweight=False)
2317
2735
 
2318
2736
    def get_physical_lock_status(self):
2319
2737
        """See Branch.get_physical_lock_status()."""
2352
2770
            self._is_stacked = False
2353
2771
        else:
2354
2772
            self._is_stacked = True
2355
 
        
 
2773
 
2356
2774
    def _vfs_get_tags_bytes(self):
2357
2775
        self._ensure_real()
2358
2776
        return self._real_branch._get_tags_bytes()
2359
2777
 
 
2778
    @needs_read_lock
2360
2779
    def _get_tags_bytes(self):
 
2780
        if self._tags_bytes is None:
 
2781
            self._tags_bytes = self._get_tags_bytes_via_hpss()
 
2782
        return self._tags_bytes
 
2783
 
 
2784
    def _get_tags_bytes_via_hpss(self):
2361
2785
        medium = self._client._medium
2362
2786
        if medium._is_remote_before((1, 13)):
2363
2787
            return self._vfs_get_tags_bytes()
2373
2797
        return self._real_branch._set_tags_bytes(bytes)
2374
2798
 
2375
2799
    def _set_tags_bytes(self, bytes):
 
2800
        if self.is_locked():
 
2801
            self._tags_bytes = bytes
2376
2802
        medium = self._client._medium
2377
2803
        if medium._is_remote_before((1, 18)):
2378
2804
            self._vfs_set_tags_bytes(bytes)
2387
2813
            self._vfs_set_tags_bytes(bytes)
2388
2814
 
2389
2815
    def lock_read(self):
 
2816
        """Lock the branch for read operations.
 
2817
 
 
2818
        :return: A bzrlib.lock.LogicalLockResult.
 
2819
        """
2390
2820
        self.repository.lock_read()
2391
2821
        if not self._lock_mode:
2392
2822
            self._note_lock('r')
2396
2826
                self._real_branch.lock_read()
2397
2827
        else:
2398
2828
            self._lock_count += 1
 
2829
        return lock.LogicalLockResult(self.unlock)
2399
2830
 
2400
2831
    def _remote_lock_write(self, token):
2401
2832
        if token is None:
2402
2833
            branch_token = repo_token = ''
2403
2834
        else:
2404
2835
            branch_token = token
2405
 
            repo_token = self.repository.lock_write()
 
2836
            repo_token = self.repository.lock_write().repository_token
2406
2837
            self.repository.unlock()
2407
2838
        err_context = {'token': token}
2408
 
        response = self._call(
2409
 
            'Branch.lock_write', self._remote_path(), branch_token,
2410
 
            repo_token or '', **err_context)
 
2839
        try:
 
2840
            response = self._call(
 
2841
                'Branch.lock_write', self._remote_path(), branch_token,
 
2842
                repo_token or '', **err_context)
 
2843
        except errors.LockContention, e:
 
2844
            # The LockContention from the server doesn't have any
 
2845
            # information about the lock_url. We re-raise LockContention
 
2846
            # with valid lock_url.
 
2847
            raise errors.LockContention('(remote lock)',
 
2848
                self.repository.base.split('.bzr/')[0])
2411
2849
        if response[0] != 'ok':
2412
2850
            raise errors.UnexpectedSmartServerResponse(response)
2413
2851
        ok, branch_token, repo_token = response
2434
2872
            self._lock_mode = 'w'
2435
2873
            self._lock_count = 1
2436
2874
        elif self._lock_mode == 'r':
2437
 
            raise errors.ReadOnlyTransaction
 
2875
            raise errors.ReadOnlyError(self)
2438
2876
        else:
2439
2877
            if token is not None:
2440
2878
                # A token was given to lock_write, and we're relocking, so
2445
2883
            self._lock_count += 1
2446
2884
            # Re-lock the repository too.
2447
2885
            self.repository.lock_write(self._repo_lock_token)
2448
 
        return self._lock_token or None
 
2886
        return BranchWriteLockResult(self.unlock, self._lock_token or None)
2449
2887
 
2450
2888
    def _unlock(self, branch_token, repo_token):
2451
2889
        err_context = {'token': str((branch_token, repo_token))}
2520
2958
            missing_parent = parent_map[missing_parent]
2521
2959
        raise errors.RevisionNotPresent(missing_parent, self.repository)
2522
2960
 
2523
 
    def _last_revision_info(self):
 
2961
    def _read_last_revision_info(self):
2524
2962
        response = self._call('Branch.last_revision_info', self._remote_path())
2525
2963
        if response[0] != 'ok':
2526
2964
            raise SmartProtocolError('unexpected response code %s' % (response,))
2589
3027
            raise errors.UnexpectedSmartServerResponse(response)
2590
3028
        self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2591
3029
 
 
3030
    @symbol_versioning.deprecated_method(symbol_versioning.deprecated_in((2, 4, 0)))
2592
3031
    @needs_write_lock
2593
3032
    def set_revision_history(self, rev_history):
 
3033
        """See Branch.set_revision_history."""
 
3034
        self._set_revision_history(rev_history)
 
3035
 
 
3036
    @needs_write_lock
 
3037
    def _set_revision_history(self, rev_history):
2594
3038
        # Send just the tip revision of the history; the server will generate
2595
3039
        # the full history from that.  If the revision doesn't exist in this
2596
3040
        # branch, NoSuchRevision will be raised.
2654
3098
            _override_hook_target=self, **kwargs)
2655
3099
 
2656
3100
    @needs_read_lock
2657
 
    def push(self, target, overwrite=False, stop_revision=None):
 
3101
    def push(self, target, overwrite=False, stop_revision=None, lossy=False):
2658
3102
        self._ensure_real()
2659
3103
        return self._real_branch.push(
2660
 
            target, overwrite=overwrite, stop_revision=stop_revision,
 
3104
            target, overwrite=overwrite, stop_revision=stop_revision, lossy=lossy,
2661
3105
            _override_hook_source_branch=self)
2662
3106
 
2663
3107
    def is_locked(self):
2673
3117
        # XXX: These should be returned by the set_last_revision_info verb
2674
3118
        old_revno, old_revid = self.last_revision_info()
2675
3119
        self._run_pre_change_branch_tip_hooks(revno, revision_id)
2676
 
        revision_id = ensure_null(revision_id)
 
3120
        if not revision_id or not isinstance(revision_id, basestring):
 
3121
            raise errors.InvalidRevisionId(revision_id=revision_id, branch=self)
2677
3122
        try:
2678
3123
            response = self._call('Branch.set_last_revision_info',
2679
3124
                self._remote_path(), self._lock_token, self._repo_lock_token,
2708
3153
            except errors.UnknownSmartMethod:
2709
3154
                medium._remember_remote_is_before((1, 6))
2710
3155
        self._clear_cached_state_of_remote_branch_only()
2711
 
        self.set_revision_history(self._lefthand_history(revision_id,
 
3156
        self._set_revision_history(self._lefthand_history(revision_id,
2712
3157
            last_rev=last_rev,other_branch=other_branch))
2713
3158
 
2714
3159
    def set_push_location(self, location):
2715
3160
        self._ensure_real()
2716
3161
        return self._real_branch.set_push_location(location)
2717
3162
 
 
3163
    def heads_to_fetch(self):
 
3164
        if self._format._use_default_local_heads_to_fetch():
 
3165
            # We recognise this format, and its heads-to-fetch implementation
 
3166
            # is the default one (tip + tags).  In this case it's cheaper to
 
3167
            # just use the default implementation rather than a special RPC as
 
3168
            # the tip and tags data is cached.
 
3169
            return branch.Branch.heads_to_fetch(self)
 
3170
        medium = self._client._medium
 
3171
        if medium._is_remote_before((2, 4)):
 
3172
            return self._vfs_heads_to_fetch()
 
3173
        try:
 
3174
            return self._rpc_heads_to_fetch()
 
3175
        except errors.UnknownSmartMethod:
 
3176
            medium._remember_remote_is_before((2, 4))
 
3177
            return self._vfs_heads_to_fetch()
 
3178
 
 
3179
    def _rpc_heads_to_fetch(self):
 
3180
        response = self._call('Branch.heads_to_fetch', self._remote_path())
 
3181
        if len(response) != 2:
 
3182
            raise errors.UnexpectedSmartServerResponse(response)
 
3183
        must_fetch, if_present_fetch = response
 
3184
        return set(must_fetch), set(if_present_fetch)
 
3185
 
 
3186
    def _vfs_heads_to_fetch(self):
 
3187
        self._ensure_real()
 
3188
        return self._real_branch.heads_to_fetch()
 
3189
 
2718
3190
 
2719
3191
class RemoteConfig(object):
2720
3192
    """A Config that reads and writes from smart verbs.
2734
3206
        """
2735
3207
        try:
2736
3208
            configobj = self._get_configobj()
 
3209
            section_obj = None
2737
3210
            if section is None:
2738
3211
                section_obj = configobj
2739
3212
            else:
2740
3213
                try:
2741
3214
                    section_obj = configobj[section]
2742
3215
                except KeyError:
2743
 
                    return default
2744
 
            return section_obj.get(name, default)
 
3216
                    pass
 
3217
            if section_obj is None:
 
3218
                value = default
 
3219
            else:
 
3220
                value = section_obj.get(name, default)
2745
3221
        except errors.UnknownSmartMethod:
2746
 
            return self._vfs_get_option(name, section, default)
 
3222
            value = self._vfs_get_option(name, section, default)
 
3223
        for hook in config.OldConfigHooks['get']:
 
3224
            hook(self, name, value)
 
3225
        return value
2747
3226
 
2748
3227
    def _response_to_configobj(self, response):
2749
3228
        if len(response[0]) and response[0][0] != 'ok':
2750
3229
            raise errors.UnexpectedSmartServerResponse(response)
2751
3230
        lines = response[1].read_body_bytes().splitlines()
2752
 
        return config.ConfigObj(lines, encoding='utf-8')
 
3231
        conf = config.ConfigObj(lines, encoding='utf-8')
 
3232
        for hook in config.OldConfigHooks['load']:
 
3233
            hook(self)
 
3234
        return conf
2753
3235
 
2754
3236
 
2755
3237
class RemoteBranchConfig(RemoteConfig):
2774
3256
        medium = self._branch._client._medium
2775
3257
        if medium._is_remote_before((1, 14)):
2776
3258
            return self._vfs_set_option(value, name, section)
 
3259
        if isinstance(value, dict):
 
3260
            if medium._is_remote_before((2, 2)):
 
3261
                return self._vfs_set_option(value, name, section)
 
3262
            return self._set_config_option_dict(value, name, section)
 
3263
        else:
 
3264
            return self._set_config_option(value, name, section)
 
3265
 
 
3266
    def _set_config_option(self, value, name, section):
2777
3267
        try:
2778
3268
            path = self._branch._remote_path()
2779
3269
            response = self._branch._client.call('Branch.set_config_option',
2780
3270
                path, self._branch._lock_token, self._branch._repo_lock_token,
2781
3271
                value.encode('utf8'), name, section or '')
2782
3272
        except errors.UnknownSmartMethod:
 
3273
            medium = self._branch._client._medium
2783
3274
            medium._remember_remote_is_before((1, 14))
2784
3275
            return self._vfs_set_option(value, name, section)
2785
3276
        if response != ():
2786
3277
            raise errors.UnexpectedSmartServerResponse(response)
2787
3278
 
 
3279
    def _serialize_option_dict(self, option_dict):
 
3280
        utf8_dict = {}
 
3281
        for key, value in option_dict.items():
 
3282
            if isinstance(key, unicode):
 
3283
                key = key.encode('utf8')
 
3284
            if isinstance(value, unicode):
 
3285
                value = value.encode('utf8')
 
3286
            utf8_dict[key] = value
 
3287
        return bencode.bencode(utf8_dict)
 
3288
 
 
3289
    def _set_config_option_dict(self, value, name, section):
 
3290
        try:
 
3291
            path = self._branch._remote_path()
 
3292
            serialised_dict = self._serialize_option_dict(value)
 
3293
            response = self._branch._client.call(
 
3294
                'Branch.set_config_option_dict',
 
3295
                path, self._branch._lock_token, self._branch._repo_lock_token,
 
3296
                serialised_dict, name, section or '')
 
3297
        except errors.UnknownSmartMethod:
 
3298
            medium = self._branch._client._medium
 
3299
            medium._remember_remote_is_before((2, 2))
 
3300
            return self._vfs_set_option(value, name, section)
 
3301
        if response != ():
 
3302
            raise errors.UnexpectedSmartServerResponse(response)
 
3303
 
2788
3304
    def _real_object(self):
2789
3305
        self._branch._ensure_real()
2790
3306
        return self._branch._real_branch
2873
3389
                    'Missing key %r in context %r', key_err.args[0], context)
2874
3390
                raise err
2875
3391
 
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':
 
3392
    if err.error_verb == 'NoSuchRevision':
2880
3393
        raise NoSuchRevision(find('branch'), err.error_args[0])
2881
3394
    elif err.error_verb == 'nosuchrevision':
2882
3395
        raise NoSuchRevision(find('repository'), err.error_args[0])
2889
3402
            detail=extra)
2890
3403
    elif err.error_verb == 'norepository':
2891
3404
        raise errors.NoRepositoryPresent(find('bzrdir'))
2892
 
    elif err.error_verb == 'LockContention':
2893
 
        raise errors.LockContention('(remote lock)')
2894
3405
    elif err.error_verb == 'UnlockableTransport':
2895
3406
        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
3407
    elif err.error_verb == 'TokenMismatch':
2899
3408
        raise errors.TokenMismatch(find('token'), '(remote token)')
2900
3409
    elif err.error_verb == 'Diverged':
2901
3410
        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
3411
    elif err.error_verb == 'NotStacked':
2909
3412
        raise errors.NotStacked(branch=find('branch'))
2910
3413
    elif err.error_verb == 'PermissionDenied':
2920
3423
    elif err.error_verb == 'NoSuchFile':
2921
3424
        path = get_path()
2922
3425
        raise errors.NoSuchFile(path)
 
3426
    _translate_error_without_context(err)
 
3427
 
 
3428
 
 
3429
def _translate_error_without_context(err):
 
3430
    """Translate any ErrorFromSmartServer values that don't require context"""
 
3431
    if err.error_verb == 'IncompatibleRepositories':
 
3432
        raise errors.IncompatibleRepositories(err.error_args[0],
 
3433
            err.error_args[1], err.error_args[2])
 
3434
    elif err.error_verb == 'LockContention':
 
3435
        raise errors.LockContention('(remote lock)')
 
3436
    elif err.error_verb == 'LockFailed':
 
3437
        raise errors.LockFailed(err.error_args[0], err.error_args[1])
 
3438
    elif err.error_verb == 'TipChangeRejected':
 
3439
        raise errors.TipChangeRejected(err.error_args[0].decode('utf8'))
 
3440
    elif err.error_verb == 'UnstackableBranchFormat':
 
3441
        raise errors.UnstackableBranchFormat(*err.error_args)
 
3442
    elif err.error_verb == 'UnstackableRepositoryFormat':
 
3443
        raise errors.UnstackableRepositoryFormat(*err.error_args)
2923
3444
    elif err.error_verb == 'FileExists':
2924
3445
        raise errors.FileExists(err.error_args[0])
2925
3446
    elif err.error_verb == 'DirectoryNotEmpty':
2926
3447
        raise errors.DirectoryNotEmpty(err.error_args[0])
 
3448
    elif err.error_verb == 'RevisionNotPresent':
 
3449
        raise errors.RevisionNotPresent(err.error_args[0], err.error_args[1])
2927
3450
    elif err.error_verb == 'ShortReadvError':
2928
3451
        args = err.error_args
2929
3452
        raise errors.ShortReadvError(
2944
3467
            raise UnicodeEncodeError(encoding, val, start, end, reason)
2945
3468
    elif err.error_verb == 'ReadOnlyError':
2946
3469
        raise errors.TransportNotPossible('readonly transport')
 
3470
    elif err.error_verb == 'MemoryError':
 
3471
        raise errors.BzrError("remote server out of memory\n"
 
3472
            "Retry non-remotely, or contact the server admin for details.")
2947
3473
    raise errors.UnknownErrorFromSmartServer(err)