/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: Vincent Ladeuil
  • Date: 2011-11-24 15:48:29 UTC
  • mfrom: (6289 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6337.
  • Revision ID: v.ladeuil+lp@free.fr-20111124154829-avowjpsxdl8yp2vz
merge trunk resolving conflicts

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 RemoteControlStore(config.IniFileStore):
 
337
    """Control store which attempts to use HPSS calls to retrieve control store.
 
338
 
 
339
    Note that this is specific to bzr-based formats.
 
340
    """
 
341
 
 
342
    def __init__(self, bzrdir):
 
343
        super(RemoteControlStore, self).__init__()
 
344
        self.bzrdir = bzrdir
 
345
        self._real_store = None
 
346
 
 
347
    def lock_write(self, token=None):
 
348
        self._ensure_real()
 
349
        return self._real_store.lock_write(token)
 
350
 
 
351
    def unlock(self):
 
352
        self._ensure_real()
 
353
        return self._real_store.unlock()
 
354
 
 
355
    @needs_write_lock
 
356
    def save(self):
 
357
        # We need to be able to override the undecorated implementation
 
358
        self.save_without_locking()
 
359
 
 
360
    def save_without_locking(self):
 
361
        super(RemoteControlStore, self).save()
 
362
 
 
363
    def _ensure_real(self):
 
364
        self.bzrdir._ensure_real()
 
365
        if self._real_store is None:
 
366
            self._real_store = config.ControlStore(self.bzrdir)
 
367
 
 
368
    def external_url(self):
 
369
        return self.bzrdir.user_url
 
370
 
 
371
    def _load_content(self):
 
372
        medium = self.bzrdir._client._medium
 
373
        path = self.bzrdir._path_for_remote_call(self.bzrdir._client)
 
374
        try:
 
375
            response, handler = self.bzrdir._call_expecting_body(
 
376
                'BzrDir.get_config_file', path)
 
377
        except errors.UnknownSmartMethod:
 
378
            self._ensure_real()
 
379
            return self._real_store._load_content()
 
380
        if len(response) and response[0] != 'ok':
 
381
            raise errors.UnexpectedSmartServerResponse(response)
 
382
        return handler.read_body_bytes()
 
383
 
 
384
    def _save_content(self, content):
 
385
        # FIXME JRV 2011-11-22: Ideally this should use a
 
386
        # HPSS call too, but at the moment it is not possible
 
387
        # to write lock control directories.
 
388
        self._ensure_real()
 
389
        return self._real_store._save_content(content)
 
390
 
 
391
 
 
392
class RemoteBzrDir(_mod_bzrdir.BzrDir, _RpcHelper):
92
393
    """Control directory on a remote server, accessed via bzr:// or similar."""
93
394
 
94
395
    def __init__(self, transport, format, _client=None, _force_probe=False):
97
398
        :param _client: Private parameter for testing. Disables probing and the
98
399
            use of a real bzrdir.
99
400
        """
100
 
        BzrDir.__init__(self, transport, format)
 
401
        _mod_bzrdir.BzrDir.__init__(self, transport, format)
101
402
        # this object holds a delegated bzrdir that uses file-level operations
102
403
        # to talk to the other side
103
404
        self._real_bzrdir = None
163
464
                import traceback
164
465
                warning('VFS BzrDir access triggered\n%s',
165
466
                    ''.join(traceback.format_stack()))
166
 
            self._real_bzrdir = BzrDir.open_from_transport(
 
467
            self._real_bzrdir = _mod_bzrdir.BzrDir.open_from_transport(
167
468
                self.root_transport, _server_formats=False)
168
469
            self._format._network_name = \
169
470
                self._real_bzrdir._format.network_name()
175
476
        # Prevent aliasing problems in the next_open_branch_result cache.
176
477
        # See create_branch for rationale.
177
478
        self._next_open_branch_result = None
178
 
        return BzrDir.break_lock(self)
 
479
        return _mod_bzrdir.BzrDir.break_lock(self)
179
480
 
180
481
    def _vfs_cloning_metadir(self, require_stacking=False):
181
482
        self._ensure_real()
212
513
        if len(branch_info) != 2:
213
514
            raise errors.UnexpectedSmartServerResponse(response)
214
515
        branch_ref, branch_name = branch_info
215
 
        format = bzrdir.network_format_registry.get(control_name)
 
516
        format = controldir.network_format_registry.get(control_name)
216
517
        if repo_name:
217
 
            format.repository_format = repository.network_format_registry.get(
 
518
            format.repository_format = _mod_repository.network_format_registry.get(
218
519
                repo_name)
219
520
        if branch_ref == 'ref':
220
521
            # XXX: we need possible_transports here to avoid reopening the
221
522
            # connection to the referenced location
222
 
            ref_bzrdir = BzrDir.open(branch_name)
 
523
            ref_bzrdir = _mod_bzrdir.BzrDir.open(branch_name)
223
524
            branch_format = ref_bzrdir.cloning_metadir().get_branch_format()
224
525
            format.set_branch_format(branch_format)
225
526
        elif branch_ref == 'branch':
241
542
 
242
543
    def destroy_repository(self):
243
544
        """See BzrDir.destroy_repository"""
244
 
        self._ensure_real()
245
 
        self._real_bzrdir.destroy_repository()
 
545
        path = self._path_for_remote_call(self._client)
 
546
        try:
 
547
            response = self._call('BzrDir.destroy_repository', path)
 
548
        except errors.UnknownSmartMethod:
 
549
            self._ensure_real()
 
550
            self._real_bzrdir.destroy_repository()
 
551
            return
 
552
        if response[0] != 'ok':
 
553
            raise SmartProtocolError('unexpected response code %s' % (response,))
246
554
 
247
 
    def create_branch(self, name=None):
 
555
    def create_branch(self, name=None, repository=None,
 
556
                      append_revisions_only=None):
248
557
        # as per meta1 formats - just delegate to the format object which may
249
558
        # be parameterised.
250
559
        real_branch = self._format.get_branch_format().initialize(self,
251
 
            name=name)
 
560
            name=name, repository=repository,
 
561
            append_revisions_only=append_revisions_only)
252
562
        if not isinstance(real_branch, RemoteBranch):
253
 
            result = RemoteBranch(self, self.find_repository(), real_branch,
254
 
                                  name=name)
 
563
            if not isinstance(repository, RemoteRepository):
 
564
                raise AssertionError(
 
565
                    'need a RemoteRepository to use with RemoteBranch, got %r'
 
566
                    % (repository,))
 
567
            result = RemoteBranch(self, repository, real_branch, name=name)
255
568
        else:
256
569
            result = real_branch
257
570
        # BzrDir.clone_on_transport() uses the result of create_branch but does
269
582
        self._real_bzrdir.destroy_branch(name=name)
270
583
        self._next_open_branch_result = None
271
584
 
272
 
    def create_workingtree(self, revision_id=None, from_branch=None):
 
585
    def create_workingtree(self, revision_id=None, from_branch=None,
 
586
        accelerator_tree=None, hardlink=False):
273
587
        raise errors.NotLocalUrl(self.transport.base)
274
588
 
275
 
    def find_branch_format(self):
 
589
    def find_branch_format(self, name=None):
276
590
        """Find the branch 'format' for this bzrdir.
277
591
 
278
592
        This might be a synthetic object for e.g. RemoteBranch and SVN.
279
593
        """
280
 
        b = self.open_branch()
 
594
        b = self.open_branch(name=name)
281
595
        return b._format
282
596
 
283
 
    def get_branch_reference(self):
 
597
    def get_branch_reference(self, name=None):
284
598
        """See BzrDir.get_branch_reference()."""
 
599
        if name is not None:
 
600
            # XXX JRV20100304: Support opening colocated branches
 
601
            raise errors.NoColocatedBranchSupport(self)
285
602
        response = self._get_branch_reference()
286
603
        if response[0] == 'ref':
287
604
            return response[1]
318
635
            raise errors.UnexpectedSmartServerResponse(response)
319
636
        return response
320
637
 
321
 
    def _get_tree_branch(self):
 
638
    def _get_tree_branch(self, name=None):
322
639
        """See BzrDir._get_tree_branch()."""
323
 
        return None, self.open_branch()
 
640
        return None, self.open_branch(name=name)
324
641
 
325
642
    def open_branch(self, name=None, unsupported=False,
326
643
                    ignore_fallbacks=False):
411
728
 
412
729
    def has_workingtree(self):
413
730
        if self._has_working_tree is None:
414
 
            self._ensure_real()
415
 
            self._has_working_tree = self._real_bzrdir.has_workingtree()
 
731
            path = self._path_for_remote_call(self._client)
 
732
            try:
 
733
                response = self._call('BzrDir.has_workingtree', path)
 
734
            except errors.UnknownSmartMethod:
 
735
                self._ensure_real()
 
736
                self._has_working_tree = self._real_bzrdir.has_workingtree()
 
737
            else:
 
738
                if response[0] not in ('yes', 'no'):
 
739
                    raise SmartProtocolError('unexpected response code %s' % (response,))
 
740
                self._has_working_tree = (response[0] == 'yes')
416
741
        return self._has_working_tree
417
742
 
418
743
    def open_workingtree(self, recommend_upgrade=True):
423
748
 
424
749
    def _path_for_remote_call(self, client):
425
750
        """Return the path to be used for this bzrdir in a remote call."""
426
 
        return client.remote_path_from_transport(self.root_transport)
 
751
        return urlutils.split_segment_parameters_raw(
 
752
            client.remote_path_from_transport(self.root_transport))[0]
427
753
 
428
754
    def get_branch_transport(self, branch_format, name=None):
429
755
        self._ensure_real()
441
767
        """Upgrading of remote bzrdirs is not supported yet."""
442
768
        return False
443
769
 
444
 
    def needs_format_conversion(self, format=None):
 
770
    def needs_format_conversion(self, format):
445
771
        """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
772
        return False
450
773
 
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
774
    def _get_config(self):
458
775
        return RemoteBzrDirConfig(self)
459
776
 
460
 
 
461
 
class RemoteRepositoryFormat(repository.RepositoryFormat):
 
777
    def _get_config_store(self):
 
778
        return RemoteControlStore(self)
 
779
 
 
780
 
 
781
class RemoteRepositoryFormat(vf_repository.VersionedFileRepositoryFormat):
462
782
    """Format for repositories accessed over a _SmartClient.
463
783
 
464
784
    Instances of this repository are represented by RemoteRepository
479
799
    """
480
800
 
481
801
    _matchingbzrdir = RemoteBzrDirFormat()
 
802
    supports_full_versioned_files = True
 
803
    supports_leaving_lock = True
482
804
 
483
805
    def __init__(self):
484
 
        repository.RepositoryFormat.__init__(self)
 
806
        _mod_repository.RepositoryFormat.__init__(self)
485
807
        self._custom_format = None
486
808
        self._network_name = None
487
809
        self._creating_bzrdir = None
 
810
        self._revision_graph_can_have_wrong_parents = None
488
811
        self._supports_chks = None
489
812
        self._supports_external_lookups = None
490
813
        self._supports_tree_reference = None
 
814
        self._supports_funky_characters = None
 
815
        self._supports_nesting_repositories = None
491
816
        self._rich_root_data = None
492
817
 
493
818
    def __repr__(self):
522
847
        return self._supports_external_lookups
523
848
 
524
849
    @property
 
850
    def supports_funky_characters(self):
 
851
        if self._supports_funky_characters is None:
 
852
            self._ensure_real()
 
853
            self._supports_funky_characters = \
 
854
                self._custom_format.supports_funky_characters
 
855
        return self._supports_funky_characters
 
856
 
 
857
    @property
 
858
    def supports_nesting_repositories(self):
 
859
        if self._supports_nesting_repositories is None:
 
860
            self._ensure_real()
 
861
            self._supports_nesting_repositories = \
 
862
                self._custom_format.supports_nesting_repositories
 
863
        return self._supports_nesting_repositories
 
864
 
 
865
    @property
525
866
    def supports_tree_reference(self):
526
867
        if self._supports_tree_reference is None:
527
868
            self._ensure_real()
529
870
                self._custom_format.supports_tree_reference
530
871
        return self._supports_tree_reference
531
872
 
 
873
    @property
 
874
    def revision_graph_can_have_wrong_parents(self):
 
875
        if self._revision_graph_can_have_wrong_parents is None:
 
876
            self._ensure_real()
 
877
            self._revision_graph_can_have_wrong_parents = \
 
878
                self._custom_format.revision_graph_can_have_wrong_parents
 
879
        return self._revision_graph_can_have_wrong_parents
 
880
 
532
881
    def _vfs_initialize(self, a_bzrdir, shared):
533
882
        """Helper for common code in initialize."""
534
883
        if self._custom_format:
569
918
            network_name = self._network_name
570
919
        else:
571
920
            # Select the current bzrlib default and ask for that.
572
 
            reference_bzrdir_format = bzrdir.format_registry.get('default')()
 
921
            reference_bzrdir_format = _mod_bzrdir.format_registry.get('default')()
573
922
            reference_format = reference_bzrdir_format.repository_format
574
923
            network_name = reference_format.network_name()
575
924
        # 2) try direct creation via RPC
601
950
 
602
951
    def _ensure_real(self):
603
952
        if self._custom_format is None:
604
 
            self._custom_format = repository.network_format_registry.get(
 
953
            self._custom_format = _mod_repository.network_format_registry.get(
605
954
                self._network_name)
606
955
 
607
956
    @property
644
993
 
645
994
 
646
995
class RemoteRepository(_RpcHelper, lock._RelockDebugMixin,
647
 
    bzrdir.ControlComponent):
 
996
    controldir.ControlComponent):
648
997
    """Repository accessed over rpc.
649
998
 
650
999
    For the moment most operations are performed using local transport-backed
703
1052
        # transport, but I'm not sure it's worth making this method
704
1053
        # optional -- mbp 2010-04-21
705
1054
        return self.bzrdir.get_repository_transport(None)
706
 
        
 
1055
 
707
1056
    def __str__(self):
708
1057
        return "%s(%s)" % (self.__class__.__name__, self.base)
709
1058
 
817
1166
    def find_text_key_references(self):
818
1167
        """Find the text key references within the repository.
819
1168
 
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
1169
        :return: A dictionary mapping text keys ((fileid, revision_id) tuples)
824
1170
            to whether they were referred to by the inventory of the
825
1171
            revision_id that they contain. The inventory texts from all present
843
1189
        """Private method for using with old (< 1.2) servers to fallback."""
844
1190
        if revision_id is None:
845
1191
            revision_id = ''
846
 
        elif revision.is_null(revision_id):
 
1192
        elif _mod_revision.is_null(revision_id):
847
1193
            return {}
848
1194
 
849
1195
        path = self.bzrdir._path_for_remote_call(self._client)
873
1219
        return RemoteStreamSource(self, to_format)
874
1220
 
875
1221
    @needs_read_lock
 
1222
    def get_file_graph(self):
 
1223
        return graph.Graph(self.texts)
 
1224
 
 
1225
    @needs_read_lock
876
1226
    def has_revision(self, revision_id):
877
1227
        """True if this repository has a copy of the revision."""
878
1228
        # Copy of bzrlib.repository.Repository.has_revision
895
1245
    def _has_same_fallbacks(self, other_repo):
896
1246
        """Returns true if the repositories have the same fallbacks."""
897
1247
        # XXX: copied from Repository; it should be unified into a base class
898
 
        # <https://bugs.edge.launchpad.net/bzr/+bug/401622>
 
1248
        # <https://bugs.launchpad.net/bzr/+bug/401622>
899
1249
        my_fb = self._fallback_repositories
900
1250
        other_fb = other_repo._fallback_repositories
901
1251
        if len(my_fb) != len(other_fb):
930
1280
        """See Repository.gather_stats()."""
931
1281
        path = self.bzrdir._path_for_remote_call(self._client)
932
1282
        # revid can be None to indicate no revisions, not just NULL_REVISION
933
 
        if revid is None or revision.is_null(revid):
 
1283
        if revid is None or _mod_revision.is_null(revid):
934
1284
            fmt_revid = ''
935
1285
        else:
936
1286
            fmt_revid = revid
997
1347
        pass
998
1348
 
999
1349
    def lock_read(self):
 
1350
        """Lock the repository for read operations.
 
1351
 
 
1352
        :return: A bzrlib.lock.LogicalLockResult.
 
1353
        """
1000
1354
        # wrong eventually - want a local lock cache context
1001
1355
        if not self._lock_mode:
1002
1356
            self._note_lock('r')
1009
1363
                repo.lock_read()
1010
1364
        else:
1011
1365
            self._lock_count += 1
 
1366
        return lock.LogicalLockResult(self.unlock)
1012
1367
 
1013
1368
    def _remote_lock_write(self, token):
1014
1369
        path = self.bzrdir._path_for_remote_call(self._client)
1054
1409
            raise errors.ReadOnlyError(self)
1055
1410
        else:
1056
1411
            self._lock_count += 1
1057
 
        return self._lock_token or None
 
1412
        return RepositoryWriteLockResult(self.unlock, self._lock_token or None)
1058
1413
 
1059
1414
    def leave_lock_in_place(self):
1060
1415
        if not self._lock_token:
1194
1549
            return t
1195
1550
        raise errors.UnexpectedSmartServerResponse(response)
1196
1551
 
 
1552
    @needs_read_lock
1197
1553
    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)
 
1554
        """Create a descendent repository for new development.
 
1555
 
 
1556
        Unlike clone, this does not copy the settings of the repository.
 
1557
        """
 
1558
        dest_repo = self._create_sprouting_repo(to_bzrdir, shared=False)
1202
1559
        dest_repo.fetch(self, revision_id=revision_id)
1203
1560
        return dest_repo
1204
1561
 
 
1562
    def _create_sprouting_repo(self, a_bzrdir, shared):
 
1563
        if not isinstance(a_bzrdir._format, self.bzrdir._format.__class__):
 
1564
            # use target default format.
 
1565
            dest_repo = a_bzrdir.create_repository()
 
1566
        else:
 
1567
            # Most control formats need the repository to be specifically
 
1568
            # created, but on some old all-in-one formats it's not needed
 
1569
            try:
 
1570
                dest_repo = self._format.initialize(a_bzrdir, shared=shared)
 
1571
            except errors.UninitializableFormat:
 
1572
                dest_repo = a_bzrdir.open_repository()
 
1573
        return dest_repo
 
1574
 
1205
1575
    ### These methods are just thin shims to the VFS object for now.
1206
1576
 
 
1577
    @needs_read_lock
1207
1578
    def revision_tree(self, revision_id):
1208
 
        self._ensure_real()
1209
 
        return self._real_repository.revision_tree(revision_id)
 
1579
        revision_id = _mod_revision.ensure_null(revision_id)
 
1580
        if revision_id == _mod_revision.NULL_REVISION:
 
1581
            return InventoryRevisionTree(self,
 
1582
                Inventory(root_id=None), _mod_revision.NULL_REVISION)
 
1583
        else:
 
1584
            return list(self.revision_trees([revision_id]))[0]
1210
1585
 
1211
1586
    def get_serializer_format(self):
1212
1587
        self._ensure_real()
1214
1589
 
1215
1590
    def get_commit_builder(self, branch, parents, config, timestamp=None,
1216
1591
                           timezone=None, committer=None, revprops=None,
1217
 
                           revision_id=None):
 
1592
                           revision_id=None, lossy=False):
1218
1593
        # FIXME: It ought to be possible to call this without immediately
1219
1594
        # triggering _ensure_real.  For now it's the easiest thing to do.
1220
1595
        self._ensure_real()
1221
1596
        real_repo = self._real_repository
1222
1597
        builder = real_repo.get_commit_builder(branch, parents,
1223
1598
                config, timestamp=timestamp, timezone=timezone,
1224
 
                committer=committer, revprops=revprops, revision_id=revision_id)
 
1599
                committer=committer, revprops=revprops,
 
1600
                revision_id=revision_id, lossy=lossy)
1225
1601
        return builder
1226
1602
 
1227
1603
    def add_fallback_repository(self, repository):
1235
1611
        # We need to accumulate additional repositories here, to pass them in
1236
1612
        # on various RPC's.
1237
1613
        #
 
1614
        # Make the check before we lock: this raises an exception.
 
1615
        self._check_fallback_repository(repository)
1238
1616
        if self.is_locked():
1239
1617
            # We will call fallback.unlock() when we transition to the unlocked
1240
1618
            # state, so always add a lock here. If a caller passes us a locked
1241
1619
            # repository, they are responsible for unlocking it later.
1242
1620
            repository.lock_read()
1243
 
        self._check_fallback_repository(repository)
1244
1621
        self._fallback_repositories.append(repository)
1245
1622
        # If self._real_repository was parameterised already (e.g. because a
1246
1623
        # _real_branch had its get_stacked_on_url method called), then the
1288
1665
 
1289
1666
    @needs_read_lock
1290
1667
    def get_revision(self, revision_id):
1291
 
        self._ensure_real()
1292
 
        return self._real_repository.get_revision(revision_id)
 
1668
        return self.get_revisions([revision_id])[0]
1293
1669
 
1294
1670
    def get_transaction(self):
1295
1671
        self._ensure_real()
1297
1673
 
1298
1674
    @needs_read_lock
1299
1675
    def clone(self, a_bzrdir, revision_id=None):
1300
 
        self._ensure_real()
1301
 
        return self._real_repository.clone(a_bzrdir, revision_id=revision_id)
 
1676
        dest_repo = self._create_sprouting_repo(
 
1677
            a_bzrdir, shared=self.is_shared())
 
1678
        self.copy_content_into(dest_repo, revision_id)
 
1679
        return dest_repo
1302
1680
 
1303
1681
    def make_working_trees(self):
1304
1682
        """See Repository.make_working_trees"""
1305
 
        self._ensure_real()
1306
 
        return self._real_repository.make_working_trees()
 
1683
        path = self.bzrdir._path_for_remote_call(self._client)
 
1684
        try:
 
1685
            response = self._call('Repository.make_working_trees', path)
 
1686
        except errors.UnknownSmartMethod:
 
1687
            self._ensure_real()
 
1688
            return self._real_repository.make_working_trees()
 
1689
        if response[0] not in ('yes', 'no'):
 
1690
            raise SmartProtocolError('unexpected response code %s' % (response,))
 
1691
        return response[0] == 'yes'
1307
1692
 
1308
1693
    def refresh_data(self):
1309
 
        """Re-read any data needed to to synchronise with disk.
 
1694
        """Re-read any data needed to synchronise with disk.
1310
1695
 
1311
1696
        This method is intended to be called after another repository instance
1312
1697
        (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.
 
1698
        repository. On all repositories this will work outside of write groups.
 
1699
        Some repository formats (pack and newer for bzrlib native formats)
 
1700
        support refresh_data inside write groups. If called inside a write
 
1701
        group on a repository that does not support refreshing in a write group
 
1702
        IsInWriteGroupError will be raised.
1315
1703
        """
1316
 
        if self.is_in_write_group():
1317
 
            raise errors.InternalBzrError(
1318
 
                "May not refresh_data while in a write group.")
1319
1704
        if self._real_repository is not None:
1320
1705
            self._real_repository.refresh_data()
1321
1706
 
1333
1718
        return result
1334
1719
 
1335
1720
    @needs_read_lock
1336
 
    def search_missing_revision_ids(self, other, revision_id=None, find_ghosts=True):
 
1721
    def search_missing_revision_ids(self, other,
 
1722
            revision_id=symbol_versioning.DEPRECATED_PARAMETER,
 
1723
            find_ghosts=True, revision_ids=None, if_present_ids=None,
 
1724
            limit=None):
1337
1725
        """Return the revision ids that other has that this does not.
1338
1726
 
1339
1727
        These are returned in topological order.
1340
1728
 
1341
1729
        revision_id: only return revision ids included by revision_id.
1342
1730
        """
1343
 
        return repository.InterRepository.get(
1344
 
            other, self).search_missing_revision_ids(revision_id, find_ghosts)
 
1731
        if symbol_versioning.deprecated_passed(revision_id):
 
1732
            symbol_versioning.warn(
 
1733
                'search_missing_revision_ids(revision_id=...) was '
 
1734
                'deprecated in 2.4.  Use revision_ids=[...] instead.',
 
1735
                DeprecationWarning, stacklevel=2)
 
1736
            if revision_ids is not None:
 
1737
                raise AssertionError(
 
1738
                    'revision_ids is mutually exclusive with revision_id')
 
1739
            if revision_id is not None:
 
1740
                revision_ids = [revision_id]
 
1741
        inter_repo = _mod_repository.InterRepository.get(other, self)
 
1742
        return inter_repo.search_missing_revision_ids(
 
1743
            find_ghosts=find_ghosts, revision_ids=revision_ids,
 
1744
            if_present_ids=if_present_ids, limit=limit)
1345
1745
 
1346
 
    def fetch(self, source, revision_id=None, pb=None, find_ghosts=False,
 
1746
    def fetch(self, source, revision_id=None, find_ghosts=False,
1347
1747
            fetch_spec=None):
1348
1748
        # No base implementation to use as RemoteRepository is not a subclass
1349
1749
        # of Repository; so this is a copy of Repository.fetch().
1360
1760
            # check that last_revision is in 'from' and then return a
1361
1761
            # no-operation.
1362
1762
            if (revision_id is not None and
1363
 
                not revision.is_null(revision_id)):
 
1763
                not _mod_revision.is_null(revision_id)):
1364
1764
                self.get_revision(revision_id)
1365
1765
            return 0, []
1366
1766
        # if there is no specific appropriate InterRepository, this will get
1367
1767
        # the InterRepository base class, which raises an
1368
1768
        # IncompatibleRepositories when asked to fetch.
1369
 
        inter = repository.InterRepository.get(source, self)
1370
 
        return inter.fetch(revision_id=revision_id, pb=pb,
 
1769
        inter = _mod_repository.InterRepository.get(source, self)
 
1770
        return inter.fetch(revision_id=revision_id,
1371
1771
            find_ghosts=find_ghosts, fetch_spec=fetch_spec)
1372
1772
 
1373
1773
    def create_bundle(self, target, base, fileobj, format=None):
1375
1775
        self._real_repository.create_bundle(target, base, fileobj, format)
1376
1776
 
1377
1777
    @needs_read_lock
 
1778
    @symbol_versioning.deprecated_method(
 
1779
        symbol_versioning.deprecated_in((2, 4, 0)))
1378
1780
    def get_ancestry(self, revision_id, topo_sorted=True):
1379
1781
        self._ensure_real()
1380
1782
        return self._real_repository.get_ancestry(revision_id, topo_sorted)
1394
1796
        self._ensure_real()
1395
1797
        return self._real_repository.iter_files_bytes(desired_files)
1396
1798
 
 
1799
    def get_cached_parent_map(self, revision_ids):
 
1800
        """See bzrlib.CachingParentsProvider.get_cached_parent_map"""
 
1801
        return self._unstacked_provider.get_cached_parent_map(revision_ids)
 
1802
 
1397
1803
    def get_parent_map(self, revision_ids):
1398
1804
        """See bzrlib.Graph.get_parent_map()."""
1399
1805
        return self._make_parents_provider().get_parent_map(revision_ids)
1457
1863
        if parents_map is None:
1458
1864
            # Repository is not locked, so there's no cache.
1459
1865
            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)
 
1866
        if _DEFAULT_SEARCH_DEPTH <= 0:
 
1867
            (start_set, stop_keys,
 
1868
             key_count) = graph.search_result_from_parent_map(
 
1869
                parents_map, self._unstacked_provider.missing_keys)
 
1870
        else:
 
1871
            (start_set, stop_keys,
 
1872
             key_count) = graph.limited_search_result_from_parent_map(
 
1873
                parents_map, self._unstacked_provider.missing_keys,
 
1874
                keys, depth=_DEFAULT_SEARCH_DEPTH)
1480
1875
        recipe = ('manual', start_set, stop_keys, key_count)
1481
1876
        body = self._serialise_search_recipe(recipe)
1482
1877
        path = self.bzrdir._path_for_remote_call(self._client)
1555
1950
 
1556
1951
    @needs_read_lock
1557
1952
    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)
 
1953
        r = self.get_revision(revision_id)
 
1954
        return list(self.get_deltas_for_revisions([r],
 
1955
            specific_fileids=specific_fileids))[0]
1561
1956
 
1562
1957
    @needs_read_lock
1563
1958
    def revision_trees(self, revision_ids):
1576
1971
            callback_refs=callback_refs, check_repo=check_repo)
1577
1972
 
1578
1973
    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)
 
1974
        """Make a complete copy of the content in self into destination.
 
1975
 
 
1976
        This is a destructive operation! Do not use it on existing
 
1977
        repositories.
 
1978
        """
 
1979
        interrepo = _mod_repository.InterRepository.get(self, destination)
 
1980
        return interrepo.copy_content(revision_id)
1582
1981
 
1583
1982
    def _copy_repository_tarball(self, to_bzrdir, revision_id=None):
1584
1983
        # get a tarball of the remote repository, and copy from that into the
1586
1985
        from bzrlib import osutils
1587
1986
        import tarfile
1588
1987
        # TODO: Maybe a progress bar while streaming the tarball?
1589
 
        note("Copying repository content as tarball...")
 
1988
        note(gettext("Copying repository content as tarball..."))
1590
1989
        tar_file = self._get_tarball('bz2')
1591
1990
        if tar_file is None:
1592
1991
            return None
1597
1996
            tmpdir = osutils.mkdtemp()
1598
1997
            try:
1599
1998
                _extract_tar(tar, tmpdir)
1600
 
                tmp_bzrdir = BzrDir.open(tmpdir)
 
1999
                tmp_bzrdir = _mod_bzrdir.BzrDir.open(tmpdir)
1601
2000
                tmp_repo = tmp_bzrdir.open_repository()
1602
2001
                tmp_repo.copy_content_into(destination, revision_id)
1603
2002
            finally:
1688
2087
    def supports_rich_root(self):
1689
2088
        return self._format.rich_root_data
1690
2089
 
 
2090
    @symbol_versioning.deprecated_method(symbol_versioning.deprecated_in((2, 4, 0)))
1691
2091
    def iter_reverse_revision_history(self, revision_id):
1692
2092
        self._ensure_real()
1693
2093
        return self._real_repository.iter_reverse_revision_history(revision_id)
1696
2096
    def _serializer(self):
1697
2097
        return self._format._serializer
1698
2098
 
 
2099
    @needs_write_lock
1699
2100
    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)
 
2101
        signature = gpg_strategy.sign(plaintext)
 
2102
        self.add_signature_text(revision_id, signature)
1703
2103
 
1704
2104
    def add_signature_text(self, revision_id, signature):
1705
2105
        self._ensure_real()
1706
2106
        return self._real_repository.add_signature_text(revision_id, signature)
1707
2107
 
1708
2108
    def has_signature_for_revision_id(self, revision_id):
 
2109
        path = self.bzrdir._path_for_remote_call(self._client)
 
2110
        try:
 
2111
            response = self._call('Repository.has_signature_for_revision_id',
 
2112
                path, revision_id)
 
2113
        except errors.UnknownSmartMethod:
 
2114
            self._ensure_real()
 
2115
            return self._real_repository.has_signature_for_revision_id(
 
2116
                revision_id)
 
2117
        if response[0] not in ('yes', 'no'):
 
2118
            raise SmartProtocolError('unexpected response code %s' % (response,))
 
2119
        return (response[0] == 'yes')
 
2120
 
 
2121
    def verify_revision_signature(self, revision_id, gpg_strategy):
1709
2122
        self._ensure_real()
1710
 
        return self._real_repository.has_signature_for_revision_id(revision_id)
 
2123
        return self._real_repository.verify_revision_signature(
 
2124
            revision_id, gpg_strategy)
1711
2125
 
1712
2126
    def item_keys_introduced_by(self, revision_ids, _files_pb=None):
1713
2127
        self._ensure_real()
1714
2128
        return self._real_repository.item_keys_introduced_by(revision_ids,
1715
2129
            _files_pb=_files_pb)
1716
2130
 
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
2131
    def _find_inconsistent_revision_parents(self, revisions_iterator=None):
1723
2132
        self._ensure_real()
1724
2133
        return self._real_repository._find_inconsistent_revision_parents(
1732
2141
        providers = [self._unstacked_provider]
1733
2142
        if other is not None:
1734
2143
            providers.insert(0, other)
1735
 
        providers.extend(r._make_parents_provider() for r in
1736
 
                         self._fallback_repositories)
1737
 
        return graph.StackedParentsProvider(providers)
 
2144
        return graph.StackedParentsProvider(_LazyListJoin(
 
2145
            providers, self._fallback_repositories))
1738
2146
 
1739
2147
    def _serialise_search_recipe(self, recipe):
1740
2148
        """Serialise a graph search recipe.
1748
2156
        return '\n'.join((start_keys, stop_keys, count))
1749
2157
 
1750
2158
    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)]
 
2159
        parts = search_result.get_network_struct()
1757
2160
        return '\n'.join(parts)
1758
2161
 
1759
2162
    def autopack(self):
1769
2172
            raise errors.UnexpectedSmartServerResponse(response)
1770
2173
 
1771
2174
 
1772
 
class RemoteStreamSink(repository.StreamSink):
 
2175
class RemoteStreamSink(vf_repository.StreamSink):
1773
2176
 
1774
2177
    def _insert_real(self, stream, src_format, resume_tokens):
1775
2178
        self.target_repo._ensure_real()
1876
2279
        self._last_substream and self._last_stream so that the stream can be
1877
2280
        resumed by _resume_stream_with_vfs.
1878
2281
        """
1879
 
                    
 
2282
 
1880
2283
        stream_iter = iter(stream)
1881
2284
        for substream_kind, substream in stream_iter:
1882
2285
            if substream_kind == 'inventory-deltas':
1885
2288
                return
1886
2289
            else:
1887
2290
                yield substream_kind, substream
1888
 
            
1889
 
 
1890
 
class RemoteStreamSource(repository.StreamSource):
 
2291
 
 
2292
 
 
2293
class RemoteStreamSource(vf_repository.StreamSource):
1891
2294
    """Stream data from a remote server."""
1892
2295
 
1893
2296
    def get_stream(self, search):
1953
2356
        candidate_verbs = [
1954
2357
            ('Repository.get_stream_1.19', (1, 19)),
1955
2358
            ('Repository.get_stream', (1, 13))]
 
2359
 
1956
2360
        found_verb = False
1957
2361
        for verb, version in candidate_verbs:
1958
2362
            if medium._is_remote_before(version):
1962
2366
                    verb, args, search_bytes)
1963
2367
            except errors.UnknownSmartMethod:
1964
2368
                medium._remember_remote_is_before(version)
 
2369
            except errors.UnknownErrorFromSmartServer, e:
 
2370
                if isinstance(search, graph.EverythingResult):
 
2371
                    error_verb = e.error_from_smart_server.error_verb
 
2372
                    if error_verb == 'BadSearch':
 
2373
                        # Pre-2.4 servers don't support this sort of search.
 
2374
                        # XXX: perhaps falling back to VFS on BadSearch is a
 
2375
                        # good idea in general?  It might provide a little bit
 
2376
                        # of protection against client-side bugs.
 
2377
                        medium._remember_remote_is_before((2, 4))
 
2378
                        break
 
2379
                raise
1965
2380
            else:
1966
2381
                response_tuple, response_handler = response
1967
2382
                found_verb = True
1971
2386
        if response_tuple[0] != 'ok':
1972
2387
            raise errors.UnexpectedSmartServerResponse(response_tuple)
1973
2388
        byte_stream = response_handler.read_streamed_body()
1974
 
        src_format, stream = smart_repo._byte_stream_to_stream(byte_stream)
 
2389
        src_format, stream = smart_repo._byte_stream_to_stream(byte_stream,
 
2390
            self._record_counter)
1975
2391
        if src_format.network_name() != repo._format.network_name():
1976
2392
            raise AssertionError(
1977
2393
                "Mismatched RemoteRepository and stream src %r, %r" % (
2063
2479
        return a_bzrdir.open_branch(name=name, 
2064
2480
            ignore_fallbacks=ignore_fallbacks)
2065
2481
 
2066
 
    def _vfs_initialize(self, a_bzrdir, name):
 
2482
    def _vfs_initialize(self, a_bzrdir, name, append_revisions_only):
2067
2483
        # Initialisation when using a local bzrdir object, or a non-vfs init
2068
2484
        # method is not available on the server.
2069
2485
        # self._custom_format is always set - the start of initialize ensures
2071
2487
        if isinstance(a_bzrdir, RemoteBzrDir):
2072
2488
            a_bzrdir._ensure_real()
2073
2489
            result = self._custom_format.initialize(a_bzrdir._real_bzrdir,
2074
 
                name)
 
2490
                name, append_revisions_only=append_revisions_only)
2075
2491
        else:
2076
2492
            # We assume the bzrdir is parameterised; it may not be.
2077
 
            result = self._custom_format.initialize(a_bzrdir, name)
 
2493
            result = self._custom_format.initialize(a_bzrdir, name,
 
2494
                append_revisions_only=append_revisions_only)
2078
2495
        if (isinstance(a_bzrdir, RemoteBzrDir) and
2079
2496
            not isinstance(result, RemoteBranch)):
2080
2497
            result = RemoteBranch(a_bzrdir, a_bzrdir.find_repository(), result,
2081
2498
                                  name=name)
2082
2499
        return result
2083
2500
 
2084
 
    def initialize(self, a_bzrdir, name=None):
 
2501
    def initialize(self, a_bzrdir, name=None, repository=None,
 
2502
                   append_revisions_only=None):
2085
2503
        # 1) get the network name to use.
2086
2504
        if self._custom_format:
2087
2505
            network_name = self._custom_format.network_name()
2088
2506
        else:
2089
2507
            # Select the current bzrlib default and ask for that.
2090
 
            reference_bzrdir_format = bzrdir.format_registry.get('default')()
 
2508
            reference_bzrdir_format = _mod_bzrdir.format_registry.get('default')()
2091
2509
            reference_format = reference_bzrdir_format.get_branch_format()
2092
2510
            self._custom_format = reference_format
2093
2511
            network_name = reference_format.network_name()
2094
2512
        # Being asked to create on a non RemoteBzrDir:
2095
2513
        if not isinstance(a_bzrdir, RemoteBzrDir):
2096
 
            return self._vfs_initialize(a_bzrdir, name=name)
 
2514
            return self._vfs_initialize(a_bzrdir, name=name,
 
2515
                append_revisions_only=append_revisions_only)
2097
2516
        medium = a_bzrdir._client._medium
2098
2517
        if medium._is_remote_before((1, 13)):
2099
 
            return self._vfs_initialize(a_bzrdir, name=name)
 
2518
            return self._vfs_initialize(a_bzrdir, name=name,
 
2519
                append_revisions_only=append_revisions_only)
2100
2520
        # Creating on a remote bzr dir.
2101
2521
        # 2) try direct creation via RPC
2102
2522
        path = a_bzrdir._path_for_remote_call(a_bzrdir._client)
2109
2529
        except errors.UnknownSmartMethod:
2110
2530
            # Fallback - use vfs methods
2111
2531
            medium._remember_remote_is_before((1, 13))
2112
 
            return self._vfs_initialize(a_bzrdir, name=name)
 
2532
            return self._vfs_initialize(a_bzrdir, name=name,
 
2533
                    append_revisions_only=append_revisions_only)
2113
2534
        if response[0] != 'ok':
2114
2535
            raise errors.UnexpectedSmartServerResponse(response)
2115
2536
        # Turn the response into a RemoteRepository object.
2116
2537
        format = RemoteBranchFormat(network_name=response[1])
2117
2538
        repo_format = response_tuple_to_repo_format(response[3:])
2118
 
        if response[2] == '':
2119
 
            repo_bzrdir = a_bzrdir
 
2539
        repo_path = response[2]
 
2540
        if repository is not None:
 
2541
            remote_repo_url = urlutils.join(a_bzrdir.user_url, repo_path)
 
2542
            url_diff = urlutils.relative_url(repository.user_url,
 
2543
                    remote_repo_url)
 
2544
            if url_diff != '.':
 
2545
                raise AssertionError(
 
2546
                    'repository.user_url %r does not match URL from server '
 
2547
                    'response (%r + %r)'
 
2548
                    % (repository.user_url, a_bzrdir.user_url, repo_path))
 
2549
            remote_repo = repository
2120
2550
        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)
 
2551
            if repo_path == '':
 
2552
                repo_bzrdir = a_bzrdir
 
2553
            else:
 
2554
                repo_bzrdir = RemoteBzrDir(
 
2555
                    a_bzrdir.root_transport.clone(repo_path), a_bzrdir._format,
 
2556
                    a_bzrdir._client)
 
2557
            remote_repo = RemoteRepository(repo_bzrdir, repo_format)
2125
2558
        remote_branch = RemoteBranch(a_bzrdir, remote_repo,
2126
2559
            format=format, setup_stacking=False, name=name)
 
2560
        if append_revisions_only:
 
2561
            remote_branch.set_append_revisions_only(append_revisions_only)
2127
2562
        # XXX: We know this is a new branch, so it must have revno 0, revid
2128
2563
        # NULL_REVISION. Creating the branch locked would make this be unable
2129
2564
        # to be wrong; here its simply very unlikely to be wrong. RBC 20090225
2148
2583
        self._ensure_real()
2149
2584
        return self._custom_format.supports_set_append_revisions_only()
2150
2585
 
 
2586
    def _use_default_local_heads_to_fetch(self):
 
2587
        # If the branch format is a metadir format *and* its heads_to_fetch
 
2588
        # implementation is not overridden vs the base class, we can use the
 
2589
        # base class logic rather than use the heads_to_fetch RPC.  This is
 
2590
        # usually cheaper in terms of net round trips, as the last-revision and
 
2591
        # tags info fetched is cached and would be fetched anyway.
 
2592
        self._ensure_real()
 
2593
        if isinstance(self._custom_format, branch.BranchFormatMetadir):
 
2594
            branch_class = self._custom_format._branch_class()
 
2595
            heads_to_fetch_impl = branch_class.heads_to_fetch.im_func
 
2596
            if heads_to_fetch_impl is branch.Branch.heads_to_fetch.im_func:
 
2597
                return True
 
2598
        return False
 
2599
 
 
2600
 
 
2601
class RemoteBranchStore(config.IniFileStore):
 
2602
    """Branch store which attempts to use HPSS calls to retrieve branch store.
 
2603
 
 
2604
    Note that this is specific to bzr-based formats.
 
2605
    """
 
2606
 
 
2607
    def __init__(self, branch):
 
2608
        super(RemoteBranchStore, self).__init__()
 
2609
        self.branch = branch
 
2610
        self.id = "branch"
 
2611
        self._real_store = None
 
2612
 
 
2613
    def lock_write(self, token=None):
 
2614
        return self.branch.lock_write(token)
 
2615
 
 
2616
    def unlock(self):
 
2617
        return self.branch.unlock()
 
2618
 
 
2619
    @needs_write_lock
 
2620
    def save(self):
 
2621
        # We need to be able to override the undecorated implementation
 
2622
        self.save_without_locking()
 
2623
 
 
2624
    def save_without_locking(self):
 
2625
        super(RemoteBranchStore, self).save()
 
2626
 
 
2627
    def external_url(self):
 
2628
        return self.branch.user_url
 
2629
 
 
2630
    def _load_content(self):
 
2631
        path = self.branch._remote_path()
 
2632
        try:
 
2633
            response, handler = self.branch._call_expecting_body(
 
2634
                'Branch.get_config_file', path)
 
2635
        except errors.UnknownSmartMethod:
 
2636
            self._ensure_real()
 
2637
            return self._real_store._load_content()
 
2638
        if len(response) and response[0] != 'ok':
 
2639
            raise errors.UnexpectedSmartServerResponse(response)
 
2640
        return handler.read_body_bytes()
 
2641
 
 
2642
    def _save_content(self, content):
 
2643
        path = self.branch._remote_path()
 
2644
        try:
 
2645
            response, handler = self.branch._call_with_body_bytes_expecting_body(
 
2646
                'Branch.put_config_file', (path,
 
2647
                    self.branch._lock_token, self.branch._repo_lock_token),
 
2648
                content)
 
2649
        except errors.UnknownSmartMethod:
 
2650
            self._ensure_real()
 
2651
            return self._real_store._save_content(content)
 
2652
        handler.cancel_read_body()
 
2653
        if response != ('ok', ):
 
2654
            raise errors.UnexpectedSmartServerResponse(response)
 
2655
 
 
2656
    def _ensure_real(self):
 
2657
        self.branch._ensure_real()
 
2658
        if self._real_store is None:
 
2659
            self._real_store = config.BranchStore(self.branch)
 
2660
 
2151
2661
 
2152
2662
class RemoteBranch(branch.Branch, _RpcHelper, lock._RelockDebugMixin):
2153
2663
    """Branch stored on a server accessed by HPSS RPC.
2243
2753
    def _get_config(self):
2244
2754
        return RemoteBranchConfig(self)
2245
2755
 
 
2756
    def _get_config_store(self):
 
2757
        return RemoteBranchStore(self)
 
2758
 
2246
2759
    def _get_real_transport(self):
2247
2760
        # if we try vfs access, return the real branch's vfs transport
2248
2761
        self._ensure_real()
2311
2824
                self.bzrdir, self._client)
2312
2825
        return self._control_files
2313
2826
 
2314
 
    def _get_checkout_format(self):
 
2827
    def _get_checkout_format(self, lightweight=False):
2315
2828
        self._ensure_real()
2316
 
        return self._real_branch._get_checkout_format()
 
2829
        if lightweight:
 
2830
            format = RemoteBzrDirFormat()
 
2831
            self.bzrdir._format._supply_sub_formats_to(format)
 
2832
            format.workingtree_format = self._real_branch._get_checkout_format(
 
2833
                lightweight=lightweight).workingtree_format
 
2834
            return format
 
2835
        else:
 
2836
            return self._real_branch._get_checkout_format(lightweight=False)
2317
2837
 
2318
2838
    def get_physical_lock_status(self):
2319
2839
        """See Branch.get_physical_lock_status()."""
2352
2872
            self._is_stacked = False
2353
2873
        else:
2354
2874
            self._is_stacked = True
2355
 
        
 
2875
 
2356
2876
    def _vfs_get_tags_bytes(self):
2357
2877
        self._ensure_real()
2358
2878
        return self._real_branch._get_tags_bytes()
2359
2879
 
 
2880
    @needs_read_lock
2360
2881
    def _get_tags_bytes(self):
 
2882
        if self._tags_bytes is None:
 
2883
            self._tags_bytes = self._get_tags_bytes_via_hpss()
 
2884
        return self._tags_bytes
 
2885
 
 
2886
    def _get_tags_bytes_via_hpss(self):
2361
2887
        medium = self._client._medium
2362
2888
        if medium._is_remote_before((1, 13)):
2363
2889
            return self._vfs_get_tags_bytes()
2373
2899
        return self._real_branch._set_tags_bytes(bytes)
2374
2900
 
2375
2901
    def _set_tags_bytes(self, bytes):
 
2902
        if self.is_locked():
 
2903
            self._tags_bytes = bytes
2376
2904
        medium = self._client._medium
2377
2905
        if medium._is_remote_before((1, 18)):
2378
2906
            self._vfs_set_tags_bytes(bytes)
2387
2915
            self._vfs_set_tags_bytes(bytes)
2388
2916
 
2389
2917
    def lock_read(self):
 
2918
        """Lock the branch for read operations.
 
2919
 
 
2920
        :return: A bzrlib.lock.LogicalLockResult.
 
2921
        """
2390
2922
        self.repository.lock_read()
2391
2923
        if not self._lock_mode:
2392
2924
            self._note_lock('r')
2396
2928
                self._real_branch.lock_read()
2397
2929
        else:
2398
2930
            self._lock_count += 1
 
2931
        return lock.LogicalLockResult(self.unlock)
2399
2932
 
2400
2933
    def _remote_lock_write(self, token):
2401
2934
        if token is None:
2402
2935
            branch_token = repo_token = ''
2403
2936
        else:
2404
2937
            branch_token = token
2405
 
            repo_token = self.repository.lock_write()
 
2938
            repo_token = self.repository.lock_write().repository_token
2406
2939
            self.repository.unlock()
2407
2940
        err_context = {'token': token}
2408
 
        response = self._call(
2409
 
            'Branch.lock_write', self._remote_path(), branch_token,
2410
 
            repo_token or '', **err_context)
 
2941
        try:
 
2942
            response = self._call(
 
2943
                'Branch.lock_write', self._remote_path(), branch_token,
 
2944
                repo_token or '', **err_context)
 
2945
        except errors.LockContention, e:
 
2946
            # The LockContention from the server doesn't have any
 
2947
            # information about the lock_url. We re-raise LockContention
 
2948
            # with valid lock_url.
 
2949
            raise errors.LockContention('(remote lock)',
 
2950
                self.repository.base.split('.bzr/')[0])
2411
2951
        if response[0] != 'ok':
2412
2952
            raise errors.UnexpectedSmartServerResponse(response)
2413
2953
        ok, branch_token, repo_token = response
2434
2974
            self._lock_mode = 'w'
2435
2975
            self._lock_count = 1
2436
2976
        elif self._lock_mode == 'r':
2437
 
            raise errors.ReadOnlyTransaction
 
2977
            raise errors.ReadOnlyError(self)
2438
2978
        else:
2439
2979
            if token is not None:
2440
2980
                # A token was given to lock_write, and we're relocking, so
2445
2985
            self._lock_count += 1
2446
2986
            # Re-lock the repository too.
2447
2987
            self.repository.lock_write(self._repo_lock_token)
2448
 
        return self._lock_token or None
 
2988
        return BranchWriteLockResult(self.unlock, self._lock_token or None)
2449
2989
 
2450
2990
    def _unlock(self, branch_token, repo_token):
2451
2991
        err_context = {'token': str((branch_token, repo_token))}
2520
3060
            missing_parent = parent_map[missing_parent]
2521
3061
        raise errors.RevisionNotPresent(missing_parent, self.repository)
2522
3062
 
2523
 
    def _last_revision_info(self):
 
3063
    def _read_last_revision_info(self):
2524
3064
        response = self._call('Branch.last_revision_info', self._remote_path())
2525
3065
        if response[0] != 'ok':
2526
3066
            raise SmartProtocolError('unexpected response code %s' % (response,))
2589
3129
            raise errors.UnexpectedSmartServerResponse(response)
2590
3130
        self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2591
3131
 
 
3132
    @symbol_versioning.deprecated_method(symbol_versioning.deprecated_in((2, 4, 0)))
2592
3133
    @needs_write_lock
2593
3134
    def set_revision_history(self, rev_history):
 
3135
        """See Branch.set_revision_history."""
 
3136
        self._set_revision_history(rev_history)
 
3137
 
 
3138
    @needs_write_lock
 
3139
    def _set_revision_history(self, rev_history):
2594
3140
        # Send just the tip revision of the history; the server will generate
2595
3141
        # the full history from that.  If the revision doesn't exist in this
2596
3142
        # branch, NoSuchRevision will be raised.
2654
3200
            _override_hook_target=self, **kwargs)
2655
3201
 
2656
3202
    @needs_read_lock
2657
 
    def push(self, target, overwrite=False, stop_revision=None):
 
3203
    def push(self, target, overwrite=False, stop_revision=None, lossy=False):
2658
3204
        self._ensure_real()
2659
3205
        return self._real_branch.push(
2660
 
            target, overwrite=overwrite, stop_revision=stop_revision,
 
3206
            target, overwrite=overwrite, stop_revision=stop_revision, lossy=lossy,
2661
3207
            _override_hook_source_branch=self)
2662
3208
 
2663
3209
    def is_locked(self):
2673
3219
        # XXX: These should be returned by the set_last_revision_info verb
2674
3220
        old_revno, old_revid = self.last_revision_info()
2675
3221
        self._run_pre_change_branch_tip_hooks(revno, revision_id)
2676
 
        revision_id = ensure_null(revision_id)
 
3222
        if not revision_id or not isinstance(revision_id, basestring):
 
3223
            raise errors.InvalidRevisionId(revision_id=revision_id, branch=self)
2677
3224
        try:
2678
3225
            response = self._call('Branch.set_last_revision_info',
2679
3226
                self._remote_path(), self._lock_token, self._repo_lock_token,
2708
3255
            except errors.UnknownSmartMethod:
2709
3256
                medium._remember_remote_is_before((1, 6))
2710
3257
        self._clear_cached_state_of_remote_branch_only()
2711
 
        self.set_revision_history(self._lefthand_history(revision_id,
 
3258
        self._set_revision_history(self._lefthand_history(revision_id,
2712
3259
            last_rev=last_rev,other_branch=other_branch))
2713
3260
 
2714
3261
    def set_push_location(self, location):
2715
3262
        self._ensure_real()
2716
3263
        return self._real_branch.set_push_location(location)
2717
3264
 
 
3265
    def heads_to_fetch(self):
 
3266
        if self._format._use_default_local_heads_to_fetch():
 
3267
            # We recognise this format, and its heads-to-fetch implementation
 
3268
            # is the default one (tip + tags).  In this case it's cheaper to
 
3269
            # just use the default implementation rather than a special RPC as
 
3270
            # the tip and tags data is cached.
 
3271
            return branch.Branch.heads_to_fetch(self)
 
3272
        medium = self._client._medium
 
3273
        if medium._is_remote_before((2, 4)):
 
3274
            return self._vfs_heads_to_fetch()
 
3275
        try:
 
3276
            return self._rpc_heads_to_fetch()
 
3277
        except errors.UnknownSmartMethod:
 
3278
            medium._remember_remote_is_before((2, 4))
 
3279
            return self._vfs_heads_to_fetch()
 
3280
 
 
3281
    def _rpc_heads_to_fetch(self):
 
3282
        response = self._call('Branch.heads_to_fetch', self._remote_path())
 
3283
        if len(response) != 2:
 
3284
            raise errors.UnexpectedSmartServerResponse(response)
 
3285
        must_fetch, if_present_fetch = response
 
3286
        return set(must_fetch), set(if_present_fetch)
 
3287
 
 
3288
    def _vfs_heads_to_fetch(self):
 
3289
        self._ensure_real()
 
3290
        return self._real_branch.heads_to_fetch()
 
3291
 
2718
3292
 
2719
3293
class RemoteConfig(object):
2720
3294
    """A Config that reads and writes from smart verbs.
2734
3308
        """
2735
3309
        try:
2736
3310
            configobj = self._get_configobj()
 
3311
            section_obj = None
2737
3312
            if section is None:
2738
3313
                section_obj = configobj
2739
3314
            else:
2740
3315
                try:
2741
3316
                    section_obj = configobj[section]
2742
3317
                except KeyError:
2743
 
                    return default
2744
 
            return section_obj.get(name, default)
 
3318
                    pass
 
3319
            if section_obj is None:
 
3320
                value = default
 
3321
            else:
 
3322
                value = section_obj.get(name, default)
2745
3323
        except errors.UnknownSmartMethod:
2746
 
            return self._vfs_get_option(name, section, default)
 
3324
            value = self._vfs_get_option(name, section, default)
 
3325
        for hook in config.OldConfigHooks['get']:
 
3326
            hook(self, name, value)
 
3327
        return value
2747
3328
 
2748
3329
    def _response_to_configobj(self, response):
2749
3330
        if len(response[0]) and response[0][0] != 'ok':
2750
3331
            raise errors.UnexpectedSmartServerResponse(response)
2751
3332
        lines = response[1].read_body_bytes().splitlines()
2752
 
        return config.ConfigObj(lines, encoding='utf-8')
 
3333
        conf = config.ConfigObj(lines, encoding='utf-8')
 
3334
        for hook in config.OldConfigHooks['load']:
 
3335
            hook(self)
 
3336
        return conf
2753
3337
 
2754
3338
 
2755
3339
class RemoteBranchConfig(RemoteConfig):
2774
3358
        medium = self._branch._client._medium
2775
3359
        if medium._is_remote_before((1, 14)):
2776
3360
            return self._vfs_set_option(value, name, section)
 
3361
        if isinstance(value, dict):
 
3362
            if medium._is_remote_before((2, 2)):
 
3363
                return self._vfs_set_option(value, name, section)
 
3364
            return self._set_config_option_dict(value, name, section)
 
3365
        else:
 
3366
            return self._set_config_option(value, name, section)
 
3367
 
 
3368
    def _set_config_option(self, value, name, section):
2777
3369
        try:
2778
3370
            path = self._branch._remote_path()
2779
3371
            response = self._branch._client.call('Branch.set_config_option',
2780
3372
                path, self._branch._lock_token, self._branch._repo_lock_token,
2781
3373
                value.encode('utf8'), name, section or '')
2782
3374
        except errors.UnknownSmartMethod:
 
3375
            medium = self._branch._client._medium
2783
3376
            medium._remember_remote_is_before((1, 14))
2784
3377
            return self._vfs_set_option(value, name, section)
2785
3378
        if response != ():
2786
3379
            raise errors.UnexpectedSmartServerResponse(response)
2787
3380
 
 
3381
    def _serialize_option_dict(self, option_dict):
 
3382
        utf8_dict = {}
 
3383
        for key, value in option_dict.items():
 
3384
            if isinstance(key, unicode):
 
3385
                key = key.encode('utf8')
 
3386
            if isinstance(value, unicode):
 
3387
                value = value.encode('utf8')
 
3388
            utf8_dict[key] = value
 
3389
        return bencode.bencode(utf8_dict)
 
3390
 
 
3391
    def _set_config_option_dict(self, value, name, section):
 
3392
        try:
 
3393
            path = self._branch._remote_path()
 
3394
            serialised_dict = self._serialize_option_dict(value)
 
3395
            response = self._branch._client.call(
 
3396
                'Branch.set_config_option_dict',
 
3397
                path, self._branch._lock_token, self._branch._repo_lock_token,
 
3398
                serialised_dict, name, section or '')
 
3399
        except errors.UnknownSmartMethod:
 
3400
            medium = self._branch._client._medium
 
3401
            medium._remember_remote_is_before((2, 2))
 
3402
            return self._vfs_set_option(value, name, section)
 
3403
        if response != ():
 
3404
            raise errors.UnexpectedSmartServerResponse(response)
 
3405
 
2788
3406
    def _real_object(self):
2789
3407
        self._branch._ensure_real()
2790
3408
        return self._branch._real_branch
2873
3491
                    'Missing key %r in context %r', key_err.args[0], context)
2874
3492
                raise err
2875
3493
 
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':
 
3494
    if err.error_verb == 'NoSuchRevision':
2880
3495
        raise NoSuchRevision(find('branch'), err.error_args[0])
2881
3496
    elif err.error_verb == 'nosuchrevision':
2882
3497
        raise NoSuchRevision(find('repository'), err.error_args[0])
2889
3504
            detail=extra)
2890
3505
    elif err.error_verb == 'norepository':
2891
3506
        raise errors.NoRepositoryPresent(find('bzrdir'))
2892
 
    elif err.error_verb == 'LockContention':
2893
 
        raise errors.LockContention('(remote lock)')
2894
3507
    elif err.error_verb == 'UnlockableTransport':
2895
3508
        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
3509
    elif err.error_verb == 'TokenMismatch':
2899
3510
        raise errors.TokenMismatch(find('token'), '(remote token)')
2900
3511
    elif err.error_verb == 'Diverged':
2901
3512
        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
3513
    elif err.error_verb == 'NotStacked':
2909
3514
        raise errors.NotStacked(branch=find('branch'))
2910
3515
    elif err.error_verb == 'PermissionDenied':
2920
3525
    elif err.error_verb == 'NoSuchFile':
2921
3526
        path = get_path()
2922
3527
        raise errors.NoSuchFile(path)
 
3528
    _translate_error_without_context(err)
 
3529
 
 
3530
 
 
3531
def _translate_error_without_context(err):
 
3532
    """Translate any ErrorFromSmartServer values that don't require context"""
 
3533
    if err.error_verb == 'IncompatibleRepositories':
 
3534
        raise errors.IncompatibleRepositories(err.error_args[0],
 
3535
            err.error_args[1], err.error_args[2])
 
3536
    elif err.error_verb == 'LockContention':
 
3537
        raise errors.LockContention('(remote lock)')
 
3538
    elif err.error_verb == 'LockFailed':
 
3539
        raise errors.LockFailed(err.error_args[0], err.error_args[1])
 
3540
    elif err.error_verb == 'TipChangeRejected':
 
3541
        raise errors.TipChangeRejected(err.error_args[0].decode('utf8'))
 
3542
    elif err.error_verb == 'UnstackableBranchFormat':
 
3543
        raise errors.UnstackableBranchFormat(*err.error_args)
 
3544
    elif err.error_verb == 'UnstackableRepositoryFormat':
 
3545
        raise errors.UnstackableRepositoryFormat(*err.error_args)
2923
3546
    elif err.error_verb == 'FileExists':
2924
3547
        raise errors.FileExists(err.error_args[0])
2925
3548
    elif err.error_verb == 'DirectoryNotEmpty':
2944
3567
            raise UnicodeEncodeError(encoding, val, start, end, reason)
2945
3568
    elif err.error_verb == 'ReadOnlyError':
2946
3569
        raise errors.TransportNotPossible('readonly transport')
 
3570
    elif err.error_verb == 'MemoryError':
 
3571
        raise errors.BzrError("remote server out of memory\n"
 
3572
            "Retry non-remotely, or contact the server admin for details.")
2947
3573
    raise errors.UnknownErrorFromSmartServer(err)