/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-25 17:54:52 UTC
  • mfrom: (6303 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6321.
  • Revision ID: jelmer@samba.org-20111125175452-v0uwwxqcp97tzuzv
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/remote.py
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2006-2011 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
19
19
from bzrlib import (
20
20
    bencode,
21
21
    branch,
22
 
    bzrdir,
 
22
    bzrdir as _mod_bzrdir,
23
23
    config,
 
24
    controldir,
24
25
    debug,
25
26
    errors,
26
27
    graph,
27
28
    lock,
28
29
    lockdir,
29
 
    repository,
 
30
    registry,
30
31
    repository as _mod_repository,
31
 
    revision,
32
32
    revision as _mod_revision,
33
33
    static_tuple,
34
34
    symbol_versioning,
35
 
)
36
 
from bzrlib.branch import BranchReferenceFormat
37
 
from bzrlib.bzrdir import BzrDir, RemoteBzrDirFormat
 
35
    urlutils,
 
36
    vf_repository,
 
37
    )
 
38
from bzrlib.branch import BranchReferenceFormat, BranchWriteLockResult
38
39
from bzrlib.decorators import needs_read_lock, needs_write_lock, only_raises
39
40
from bzrlib.errors import (
40
41
    NoSuchRevision,
41
42
    SmartProtocolError,
42
43
    )
 
44
from bzrlib.i18n import gettext
 
45
from bzrlib.inventory import Inventory
43
46
from bzrlib.lockable_files import LockableFiles
44
47
from bzrlib.smart import client, vfs, repository as smart_repo
45
 
from bzrlib.revision import ensure_null, NULL_REVISION
46
 
from bzrlib.trace import mutter, note, warning
 
48
from bzrlib.smart.client import _SmartClient
 
49
from bzrlib.revision import NULL_REVISION
 
50
from bzrlib.revisiontree import InventoryRevisionTree
 
51
from bzrlib.repository import RepositoryWriteLockResult, _LazyListJoin
 
52
from bzrlib.trace import mutter, note, warning, log_exception_quietly
 
53
 
 
54
 
 
55
_DEFAULT_SEARCH_DEPTH = 100
47
56
 
48
57
 
49
58
class _RpcHelper(object):
86
95
    return format
87
96
 
88
97
 
89
 
# Note: RemoteBzrDirFormat is in bzrdir.py
90
 
 
91
 
class RemoteBzrDir(BzrDir, _RpcHelper):
 
98
# Note that RemoteBzrDirProber lives in bzrlib.bzrdir so bzrlib.remote
 
99
# does not have to be imported unless a remote format is involved.
 
100
 
 
101
class RemoteBzrDirFormat(_mod_bzrdir.BzrDirMetaFormat1):
 
102
    """Format representing bzrdirs accessed via a smart server"""
 
103
 
 
104
    supports_workingtrees = False
 
105
 
 
106
    def __init__(self):
 
107
        _mod_bzrdir.BzrDirMetaFormat1.__init__(self)
 
108
        # XXX: It's a bit ugly that the network name is here, because we'd
 
109
        # like to believe that format objects are stateless or at least
 
110
        # immutable,  However, we do at least avoid mutating the name after
 
111
        # it's returned.  See <https://bugs.launchpad.net/bzr/+bug/504102>
 
112
        self._network_name = None
 
113
 
 
114
    def __repr__(self):
 
115
        return "%s(_network_name=%r)" % (self.__class__.__name__,
 
116
            self._network_name)
 
117
 
 
118
    def get_format_description(self):
 
119
        if self._network_name:
 
120
            real_format = controldir.network_format_registry.get(self._network_name)
 
121
            return 'Remote: ' + real_format.get_format_description()
 
122
        return 'bzr remote bzrdir'
 
123
 
 
124
    def get_format_string(self):
 
125
        raise NotImplementedError(self.get_format_string)
 
126
 
 
127
    def network_name(self):
 
128
        if self._network_name:
 
129
            return self._network_name
 
130
        else:
 
131
            raise AssertionError("No network name set.")
 
132
 
 
133
    def initialize_on_transport(self, transport):
 
134
        try:
 
135
            # hand off the request to the smart server
 
136
            client_medium = transport.get_smart_medium()
 
137
        except errors.NoSmartMedium:
 
138
            # TODO: lookup the local format from a server hint.
 
139
            local_dir_format = _mod_bzrdir.BzrDirMetaFormat1()
 
140
            return local_dir_format.initialize_on_transport(transport)
 
141
        client = _SmartClient(client_medium)
 
142
        path = client.remote_path_from_transport(transport)
 
143
        try:
 
144
            response = client.call('BzrDirFormat.initialize', path)
 
145
        except errors.ErrorFromSmartServer, err:
 
146
            _translate_error(err, path=path)
 
147
        if response[0] != 'ok':
 
148
            raise errors.SmartProtocolError('unexpected response code %s' % (response,))
 
149
        format = RemoteBzrDirFormat()
 
150
        self._supply_sub_formats_to(format)
 
151
        return RemoteBzrDir(transport, format)
 
152
 
 
153
    def parse_NoneTrueFalse(self, arg):
 
154
        if not arg:
 
155
            return None
 
156
        if arg == 'False':
 
157
            return False
 
158
        if arg == 'True':
 
159
            return True
 
160
        raise AssertionError("invalid arg %r" % arg)
 
161
 
 
162
    def _serialize_NoneTrueFalse(self, arg):
 
163
        if arg is False:
 
164
            return 'False'
 
165
        if arg:
 
166
            return 'True'
 
167
        return ''
 
168
 
 
169
    def _serialize_NoneString(self, arg):
 
170
        return arg or ''
 
171
 
 
172
    def initialize_on_transport_ex(self, transport, use_existing_dir=False,
 
173
        create_prefix=False, force_new_repo=False, stacked_on=None,
 
174
        stack_on_pwd=None, repo_format_name=None, make_working_trees=None,
 
175
        shared_repo=False):
 
176
        try:
 
177
            # hand off the request to the smart server
 
178
            client_medium = transport.get_smart_medium()
 
179
        except errors.NoSmartMedium:
 
180
            do_vfs = True
 
181
        else:
 
182
            # Decline to open it if the server doesn't support our required
 
183
            # version (3) so that the VFS-based transport will do it.
 
184
            if client_medium.should_probe():
 
185
                try:
 
186
                    server_version = client_medium.protocol_version()
 
187
                    if server_version != '2':
 
188
                        do_vfs = True
 
189
                    else:
 
190
                        do_vfs = False
 
191
                except errors.SmartProtocolError:
 
192
                    # Apparently there's no usable smart server there, even though
 
193
                    # the medium supports the smart protocol.
 
194
                    do_vfs = True
 
195
            else:
 
196
                do_vfs = False
 
197
        if not do_vfs:
 
198
            client = _SmartClient(client_medium)
 
199
            path = client.remote_path_from_transport(transport)
 
200
            if client_medium._is_remote_before((1, 16)):
 
201
                do_vfs = True
 
202
        if do_vfs:
 
203
            # TODO: lookup the local format from a server hint.
 
204
            local_dir_format = _mod_bzrdir.BzrDirMetaFormat1()
 
205
            self._supply_sub_formats_to(local_dir_format)
 
206
            return local_dir_format.initialize_on_transport_ex(transport,
 
207
                use_existing_dir=use_existing_dir, create_prefix=create_prefix,
 
208
                force_new_repo=force_new_repo, stacked_on=stacked_on,
 
209
                stack_on_pwd=stack_on_pwd, repo_format_name=repo_format_name,
 
210
                make_working_trees=make_working_trees, shared_repo=shared_repo,
 
211
                vfs_only=True)
 
212
        return self._initialize_on_transport_ex_rpc(client, path, transport,
 
213
            use_existing_dir, create_prefix, force_new_repo, stacked_on,
 
214
            stack_on_pwd, repo_format_name, make_working_trees, shared_repo)
 
215
 
 
216
    def _initialize_on_transport_ex_rpc(self, client, path, transport,
 
217
        use_existing_dir, create_prefix, force_new_repo, stacked_on,
 
218
        stack_on_pwd, repo_format_name, make_working_trees, shared_repo):
 
219
        args = []
 
220
        args.append(self._serialize_NoneTrueFalse(use_existing_dir))
 
221
        args.append(self._serialize_NoneTrueFalse(create_prefix))
 
222
        args.append(self._serialize_NoneTrueFalse(force_new_repo))
 
223
        args.append(self._serialize_NoneString(stacked_on))
 
224
        # stack_on_pwd is often/usually our transport
 
225
        if stack_on_pwd:
 
226
            try:
 
227
                stack_on_pwd = transport.relpath(stack_on_pwd)
 
228
                if not stack_on_pwd:
 
229
                    stack_on_pwd = '.'
 
230
            except errors.PathNotChild:
 
231
                pass
 
232
        args.append(self._serialize_NoneString(stack_on_pwd))
 
233
        args.append(self._serialize_NoneString(repo_format_name))
 
234
        args.append(self._serialize_NoneTrueFalse(make_working_trees))
 
235
        args.append(self._serialize_NoneTrueFalse(shared_repo))
 
236
        request_network_name = self._network_name or \
 
237
            _mod_bzrdir.BzrDirFormat.get_default_format().network_name()
 
238
        try:
 
239
            response = client.call('BzrDirFormat.initialize_ex_1.16',
 
240
                request_network_name, path, *args)
 
241
        except errors.UnknownSmartMethod:
 
242
            client._medium._remember_remote_is_before((1,16))
 
243
            local_dir_format = _mod_bzrdir.BzrDirMetaFormat1()
 
244
            self._supply_sub_formats_to(local_dir_format)
 
245
            return local_dir_format.initialize_on_transport_ex(transport,
 
246
                use_existing_dir=use_existing_dir, create_prefix=create_prefix,
 
247
                force_new_repo=force_new_repo, stacked_on=stacked_on,
 
248
                stack_on_pwd=stack_on_pwd, repo_format_name=repo_format_name,
 
249
                make_working_trees=make_working_trees, shared_repo=shared_repo,
 
250
                vfs_only=True)
 
251
        except errors.ErrorFromSmartServer, err:
 
252
            _translate_error(err, path=path)
 
253
        repo_path = response[0]
 
254
        bzrdir_name = response[6]
 
255
        require_stacking = response[7]
 
256
        require_stacking = self.parse_NoneTrueFalse(require_stacking)
 
257
        format = RemoteBzrDirFormat()
 
258
        format._network_name = bzrdir_name
 
259
        self._supply_sub_formats_to(format)
 
260
        bzrdir = RemoteBzrDir(transport, format, _client=client)
 
261
        if repo_path:
 
262
            repo_format = response_tuple_to_repo_format(response[1:])
 
263
            if repo_path == '.':
 
264
                repo_path = ''
 
265
            if repo_path:
 
266
                repo_bzrdir_format = RemoteBzrDirFormat()
 
267
                repo_bzrdir_format._network_name = response[5]
 
268
                repo_bzr = RemoteBzrDir(transport.clone(repo_path),
 
269
                    repo_bzrdir_format)
 
270
            else:
 
271
                repo_bzr = bzrdir
 
272
            final_stack = response[8] or None
 
273
            final_stack_pwd = response[9] or None
 
274
            if final_stack_pwd:
 
275
                final_stack_pwd = urlutils.join(
 
276
                    transport.base, final_stack_pwd)
 
277
            remote_repo = RemoteRepository(repo_bzr, repo_format)
 
278
            if len(response) > 10:
 
279
                # Updated server verb that locks remotely.
 
280
                repo_lock_token = response[10] or None
 
281
                remote_repo.lock_write(repo_lock_token, _skip_rpc=True)
 
282
                if repo_lock_token:
 
283
                    remote_repo.dont_leave_lock_in_place()
 
284
            else:
 
285
                remote_repo.lock_write()
 
286
            policy = _mod_bzrdir.UseExistingRepository(remote_repo, final_stack,
 
287
                final_stack_pwd, require_stacking)
 
288
            policy.acquire_repository()
 
289
        else:
 
290
            remote_repo = None
 
291
            policy = None
 
292
        bzrdir._format.set_branch_format(self.get_branch_format())
 
293
        if require_stacking:
 
294
            # The repo has already been created, but we need to make sure that
 
295
            # we'll make a stackable branch.
 
296
            bzrdir._format.require_stacking(_skip_repo=True)
 
297
        return remote_repo, bzrdir, require_stacking, policy
 
298
 
 
299
    def _open(self, transport):
 
300
        return RemoteBzrDir(transport, self)
 
301
 
 
302
    def __eq__(self, other):
 
303
        if not isinstance(other, RemoteBzrDirFormat):
 
304
            return False
 
305
        return self.get_format_description() == other.get_format_description()
 
306
 
 
307
    def __return_repository_format(self):
 
308
        # Always return a RemoteRepositoryFormat object, but if a specific bzr
 
309
        # repository format has been asked for, tell the RemoteRepositoryFormat
 
310
        # that it should use that for init() etc.
 
311
        result = RemoteRepositoryFormat()
 
312
        custom_format = getattr(self, '_repository_format', None)
 
313
        if custom_format:
 
314
            if isinstance(custom_format, RemoteRepositoryFormat):
 
315
                return custom_format
 
316
            else:
 
317
                # We will use the custom format to create repositories over the
 
318
                # wire; expose its details like rich_root_data for code to
 
319
                # query
 
320
                result._custom_format = custom_format
 
321
        return result
 
322
 
 
323
    def get_branch_format(self):
 
324
        result = _mod_bzrdir.BzrDirMetaFormat1.get_branch_format(self)
 
325
        if not isinstance(result, RemoteBranchFormat):
 
326
            new_result = RemoteBranchFormat()
 
327
            new_result._custom_format = result
 
328
            # cache the result
 
329
            self.set_branch_format(new_result)
 
330
            result = new_result
 
331
        return result
 
332
 
 
333
    repository_format = property(__return_repository_format,
 
334
        _mod_bzrdir.BzrDirMetaFormat1._set_repository_format) #.im_func)
 
335
 
 
336
 
 
337
class RemoteControlStore(config.IniFileStore):
 
338
    """Control store which attempts to use HPSS calls to retrieve control store.
 
339
 
 
340
    Note that this is specific to bzr-based formats.
 
341
    """
 
342
 
 
343
    def __init__(self, bzrdir):
 
344
        super(RemoteControlStore, self).__init__()
 
345
        self.bzrdir = bzrdir
 
346
        self._real_store = None
 
347
 
 
348
    def lock_write(self, token=None):
 
349
        self._ensure_real()
 
350
        return self._real_store.lock_write(token)
 
351
 
 
352
    def unlock(self):
 
353
        self._ensure_real()
 
354
        return self._real_store.unlock()
 
355
 
 
356
    @needs_write_lock
 
357
    def save(self):
 
358
        # We need to be able to override the undecorated implementation
 
359
        self.save_without_locking()
 
360
 
 
361
    def save_without_locking(self):
 
362
        super(RemoteControlStore, self).save()
 
363
 
 
364
    def _ensure_real(self):
 
365
        self.bzrdir._ensure_real()
 
366
        if self._real_store is None:
 
367
            self._real_store = config.ControlStore(self.bzrdir)
 
368
 
 
369
    def external_url(self):
 
370
        return self.bzrdir.user_url
 
371
 
 
372
    def _load_content(self):
 
373
        medium = self.bzrdir._client._medium
 
374
        path = self.bzrdir._path_for_remote_call(self.bzrdir._client)
 
375
        try:
 
376
            response, handler = self.bzrdir._call_expecting_body(
 
377
                'BzrDir.get_config_file', path)
 
378
        except errors.UnknownSmartMethod:
 
379
            self._ensure_real()
 
380
            return self._real_store._load_content()
 
381
        if len(response) and response[0] != 'ok':
 
382
            raise errors.UnexpectedSmartServerResponse(response)
 
383
        return handler.read_body_bytes()
 
384
 
 
385
    def _save_content(self, content):
 
386
        # FIXME JRV 2011-11-22: Ideally this should use a
 
387
        # HPSS call too, but at the moment it is not possible
 
388
        # to write lock control directories.
 
389
        self._ensure_real()
 
390
        return self._real_store._save_content(content)
 
391
 
 
392
 
 
393
class RemoteBzrDir(_mod_bzrdir.BzrDir, _RpcHelper):
92
394
    """Control directory on a remote server, accessed via bzr:// or similar."""
93
395
 
94
396
    def __init__(self, transport, format, _client=None, _force_probe=False):
97
399
        :param _client: Private parameter for testing. Disables probing and the
98
400
            use of a real bzrdir.
99
401
        """
100
 
        BzrDir.__init__(self, transport, format)
 
402
        _mod_bzrdir.BzrDir.__init__(self, transport, format)
101
403
        # this object holds a delegated bzrdir that uses file-level operations
102
404
        # to talk to the other side
103
405
        self._real_bzrdir = None
163
465
                import traceback
164
466
                warning('VFS BzrDir access triggered\n%s',
165
467
                    ''.join(traceback.format_stack()))
166
 
            self._real_bzrdir = BzrDir.open_from_transport(
 
468
            self._real_bzrdir = _mod_bzrdir.BzrDir.open_from_transport(
167
469
                self.root_transport, _server_formats=False)
168
470
            self._format._network_name = \
169
471
                self._real_bzrdir._format.network_name()
175
477
        # Prevent aliasing problems in the next_open_branch_result cache.
176
478
        # See create_branch for rationale.
177
479
        self._next_open_branch_result = None
178
 
        return BzrDir.break_lock(self)
 
480
        return _mod_bzrdir.BzrDir.break_lock(self)
179
481
 
180
482
    def _vfs_cloning_metadir(self, require_stacking=False):
181
483
        self._ensure_real()
212
514
        if len(branch_info) != 2:
213
515
            raise errors.UnexpectedSmartServerResponse(response)
214
516
        branch_ref, branch_name = branch_info
215
 
        format = bzrdir.network_format_registry.get(control_name)
 
517
        format = controldir.network_format_registry.get(control_name)
216
518
        if repo_name:
217
 
            format.repository_format = repository.network_format_registry.get(
 
519
            format.repository_format = _mod_repository.network_format_registry.get(
218
520
                repo_name)
219
521
        if branch_ref == 'ref':
220
522
            # XXX: we need possible_transports here to avoid reopening the
221
523
            # connection to the referenced location
222
 
            ref_bzrdir = BzrDir.open(branch_name)
 
524
            ref_bzrdir = _mod_bzrdir.BzrDir.open(branch_name)
223
525
            branch_format = ref_bzrdir.cloning_metadir().get_branch_format()
224
526
            format.set_branch_format(branch_format)
225
527
        elif branch_ref == 'branch':
241
543
 
242
544
    def destroy_repository(self):
243
545
        """See BzrDir.destroy_repository"""
244
 
        self._ensure_real()
245
 
        self._real_bzrdir.destroy_repository()
 
546
        path = self._path_for_remote_call(self._client)
 
547
        try:
 
548
            response = self._call('BzrDir.destroy_repository', path)
 
549
        except errors.UnknownSmartMethod:
 
550
            self._ensure_real()
 
551
            self._real_bzrdir.destroy_repository()
 
552
            return
 
553
        if response[0] != 'ok':
 
554
            raise SmartProtocolError('unexpected response code %s' % (response,))
246
555
 
247
 
    def create_branch(self, name=None):
 
556
    def create_branch(self, name=None, repository=None,
 
557
                      append_revisions_only=None):
248
558
        # as per meta1 formats - just delegate to the format object which may
249
559
        # be parameterised.
250
560
        real_branch = self._format.get_branch_format().initialize(self,
251
 
            name=name)
 
561
            name=name, repository=repository,
 
562
            append_revisions_only=append_revisions_only)
252
563
        if not isinstance(real_branch, RemoteBranch):
253
 
            result = RemoteBranch(self, self.find_repository(), real_branch,
254
 
                                  name=name)
 
564
            if not isinstance(repository, RemoteRepository):
 
565
                raise AssertionError(
 
566
                    'need a RemoteRepository to use with RemoteBranch, got %r'
 
567
                    % (repository,))
 
568
            result = RemoteBranch(self, repository, real_branch, name=name)
255
569
        else:
256
570
            result = real_branch
257
571
        # BzrDir.clone_on_transport() uses the result of create_branch but does
265
579
 
266
580
    def destroy_branch(self, name=None):
267
581
        """See BzrDir.destroy_branch"""
268
 
        self._ensure_real()
269
 
        self._real_bzrdir.destroy_branch(name=name)
 
582
        path = self._path_for_remote_call(self._client)
 
583
        try:
 
584
            if name is not None:
 
585
                args = (name, )
 
586
            else:
 
587
                args = ()
 
588
            response = self._call('BzrDir.destroy_branch', path, *args)
 
589
        except errors.UnknownSmartMethod:
 
590
            self._ensure_real()
 
591
            self._real_bzrdir.destroy_branch(name=name)
 
592
            self._next_open_branch_result = None
 
593
            return
270
594
        self._next_open_branch_result = None
 
595
        if response[0] != 'ok':
 
596
            raise SmartProtocolError('unexpected response code %s' % (response,))
271
597
 
272
 
    def create_workingtree(self, revision_id=None, from_branch=None):
 
598
    def create_workingtree(self, revision_id=None, from_branch=None,
 
599
        accelerator_tree=None, hardlink=False):
273
600
        raise errors.NotLocalUrl(self.transport.base)
274
601
 
275
 
    def find_branch_format(self):
 
602
    def find_branch_format(self, name=None):
276
603
        """Find the branch 'format' for this bzrdir.
277
604
 
278
605
        This might be a synthetic object for e.g. RemoteBranch and SVN.
279
606
        """
280
 
        b = self.open_branch()
 
607
        b = self.open_branch(name=name)
281
608
        return b._format
282
609
 
283
 
    def get_branch_reference(self):
 
610
    def get_branch_reference(self, name=None):
284
611
        """See BzrDir.get_branch_reference()."""
 
612
        if name is not None:
 
613
            # XXX JRV20100304: Support opening colocated branches
 
614
            raise errors.NoColocatedBranchSupport(self)
285
615
        response = self._get_branch_reference()
286
616
        if response[0] == 'ref':
287
617
            return response[1]
318
648
            raise errors.UnexpectedSmartServerResponse(response)
319
649
        return response
320
650
 
321
 
    def _get_tree_branch(self):
 
651
    def _get_tree_branch(self, name=None):
322
652
        """See BzrDir._get_tree_branch()."""
323
 
        return None, self.open_branch()
 
653
        return None, self.open_branch(name=name)
324
654
 
325
655
    def open_branch(self, name=None, unsupported=False,
326
656
                    ignore_fallbacks=False):
411
741
 
412
742
    def has_workingtree(self):
413
743
        if self._has_working_tree is None:
414
 
            self._ensure_real()
415
 
            self._has_working_tree = self._real_bzrdir.has_workingtree()
 
744
            path = self._path_for_remote_call(self._client)
 
745
            try:
 
746
                response = self._call('BzrDir.has_workingtree', path)
 
747
            except errors.UnknownSmartMethod:
 
748
                self._ensure_real()
 
749
                self._has_working_tree = self._real_bzrdir.has_workingtree()
 
750
            else:
 
751
                if response[0] not in ('yes', 'no'):
 
752
                    raise SmartProtocolError('unexpected response code %s' % (response,))
 
753
                self._has_working_tree = (response[0] == 'yes')
416
754
        return self._has_working_tree
417
755
 
418
756
    def open_workingtree(self, recommend_upgrade=True):
423
761
 
424
762
    def _path_for_remote_call(self, client):
425
763
        """Return the path to be used for this bzrdir in a remote call."""
426
 
        return client.remote_path_from_transport(self.root_transport)
 
764
        return urlutils.split_segment_parameters_raw(
 
765
            client.remote_path_from_transport(self.root_transport))[0]
427
766
 
428
767
    def get_branch_transport(self, branch_format, name=None):
429
768
        self._ensure_real()
441
780
        """Upgrading of remote bzrdirs is not supported yet."""
442
781
        return False
443
782
 
444
 
    def needs_format_conversion(self, format=None):
 
783
    def needs_format_conversion(self, format):
445
784
        """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
785
        return False
450
786
 
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
787
    def _get_config(self):
458
788
        return RemoteBzrDirConfig(self)
459
789
 
460
 
 
461
 
class RemoteRepositoryFormat(repository.RepositoryFormat):
 
790
    def _get_config_store(self):
 
791
        return RemoteControlStore(self)
 
792
 
 
793
 
 
794
class RemoteRepositoryFormat(vf_repository.VersionedFileRepositoryFormat):
462
795
    """Format for repositories accessed over a _SmartClient.
463
796
 
464
797
    Instances of this repository are represented by RemoteRepository
479
812
    """
480
813
 
481
814
    _matchingbzrdir = RemoteBzrDirFormat()
 
815
    supports_full_versioned_files = True
 
816
    supports_leaving_lock = True
482
817
 
483
818
    def __init__(self):
484
 
        repository.RepositoryFormat.__init__(self)
 
819
        _mod_repository.RepositoryFormat.__init__(self)
485
820
        self._custom_format = None
486
821
        self._network_name = None
487
822
        self._creating_bzrdir = None
 
823
        self._revision_graph_can_have_wrong_parents = None
488
824
        self._supports_chks = None
489
825
        self._supports_external_lookups = None
490
826
        self._supports_tree_reference = None
 
827
        self._supports_funky_characters = None
 
828
        self._supports_nesting_repositories = None
491
829
        self._rich_root_data = None
492
830
 
493
831
    def __repr__(self):
522
860
        return self._supports_external_lookups
523
861
 
524
862
    @property
 
863
    def supports_funky_characters(self):
 
864
        if self._supports_funky_characters is None:
 
865
            self._ensure_real()
 
866
            self._supports_funky_characters = \
 
867
                self._custom_format.supports_funky_characters
 
868
        return self._supports_funky_characters
 
869
 
 
870
    @property
 
871
    def supports_nesting_repositories(self):
 
872
        if self._supports_nesting_repositories is None:
 
873
            self._ensure_real()
 
874
            self._supports_nesting_repositories = \
 
875
                self._custom_format.supports_nesting_repositories
 
876
        return self._supports_nesting_repositories
 
877
 
 
878
    @property
525
879
    def supports_tree_reference(self):
526
880
        if self._supports_tree_reference is None:
527
881
            self._ensure_real()
529
883
                self._custom_format.supports_tree_reference
530
884
        return self._supports_tree_reference
531
885
 
 
886
    @property
 
887
    def revision_graph_can_have_wrong_parents(self):
 
888
        if self._revision_graph_can_have_wrong_parents is None:
 
889
            self._ensure_real()
 
890
            self._revision_graph_can_have_wrong_parents = \
 
891
                self._custom_format.revision_graph_can_have_wrong_parents
 
892
        return self._revision_graph_can_have_wrong_parents
 
893
 
532
894
    def _vfs_initialize(self, a_bzrdir, shared):
533
895
        """Helper for common code in initialize."""
534
896
        if self._custom_format:
569
931
            network_name = self._network_name
570
932
        else:
571
933
            # Select the current bzrlib default and ask for that.
572
 
            reference_bzrdir_format = bzrdir.format_registry.get('default')()
 
934
            reference_bzrdir_format = _mod_bzrdir.format_registry.get('default')()
573
935
            reference_format = reference_bzrdir_format.repository_format
574
936
            network_name = reference_format.network_name()
575
937
        # 2) try direct creation via RPC
601
963
 
602
964
    def _ensure_real(self):
603
965
        if self._custom_format is None:
604
 
            self._custom_format = repository.network_format_registry.get(
 
966
            self._custom_format = _mod_repository.network_format_registry.get(
605
967
                self._network_name)
606
968
 
607
969
    @property
643
1005
        return self._custom_format._serializer
644
1006
 
645
1007
 
646
 
class RemoteRepository(_RpcHelper, lock._RelockDebugMixin,
647
 
    bzrdir.ControlComponent):
 
1008
class RemoteRepository(_mod_repository.Repository, _RpcHelper,
 
1009
        lock._RelockDebugMixin):
648
1010
    """Repository accessed over rpc.
649
1011
 
650
1012
    For the moment most operations are performed using local transport-backed
674
1036
        self._format = format
675
1037
        self._lock_mode = None
676
1038
        self._lock_token = None
 
1039
        self._write_group_tokens = None
677
1040
        self._lock_count = 0
678
1041
        self._leave_lock = False
679
1042
        # Cache of revision parents; misses are cached during read locks, and
703
1066
        # transport, but I'm not sure it's worth making this method
704
1067
        # optional -- mbp 2010-04-21
705
1068
        return self.bzrdir.get_repository_transport(None)
706
 
        
 
1069
 
707
1070
    def __str__(self):
708
1071
        return "%s(%s)" % (self.__class__.__name__, self.base)
709
1072
 
719
1082
 
720
1083
        :param suppress_errors: see Repository.abort_write_group.
721
1084
        """
722
 
        self._ensure_real()
723
 
        return self._real_repository.abort_write_group(
724
 
            suppress_errors=suppress_errors)
 
1085
        if self._real_repository:
 
1086
            self._ensure_real()
 
1087
            return self._real_repository.abort_write_group(
 
1088
                suppress_errors=suppress_errors)
 
1089
        if not self.is_in_write_group():
 
1090
            if suppress_errors:
 
1091
                mutter('(suppressed) not in write group')
 
1092
                return
 
1093
            raise errors.BzrError("not in write group")
 
1094
        path = self.bzrdir._path_for_remote_call(self._client)
 
1095
        try:
 
1096
            response = self._call('Repository.abort_write_group', path,
 
1097
                self._lock_token, self._write_group_tokens)
 
1098
        except Exception, exc:
 
1099
            self._write_group = None
 
1100
            if not suppress_errors:
 
1101
                raise
 
1102
            mutter('abort_write_group failed')
 
1103
            log_exception_quietly()
 
1104
            note(gettext('bzr: ERROR (ignored): %s'), exc)
 
1105
        else:
 
1106
            if response != ('ok', ):
 
1107
                raise errors.UnexpectedSmartServerResponse(response)
 
1108
            self._write_group_tokens = None
725
1109
 
726
1110
    @property
727
1111
    def chk_bytes(self):
741
1125
        for older plugins that don't use e.g. the CommitBuilder
742
1126
        facility.
743
1127
        """
744
 
        self._ensure_real()
745
 
        return self._real_repository.commit_write_group()
 
1128
        if self._real_repository:
 
1129
            self._ensure_real()
 
1130
            return self._real_repository.commit_write_group()
 
1131
        if not self.is_in_write_group():
 
1132
            raise errors.BzrError("not in write group")
 
1133
        path = self.bzrdir._path_for_remote_call(self._client)
 
1134
        response = self._call('Repository.commit_write_group', path,
 
1135
            self._lock_token, self._write_group_tokens)
 
1136
        if response != ('ok', ):
 
1137
            raise errors.UnexpectedSmartServerResponse(response)
 
1138
        self._write_group_tokens = None
746
1139
 
747
1140
    def resume_write_group(self, tokens):
748
 
        self._ensure_real()
749
 
        return self._real_repository.resume_write_group(tokens)
 
1141
        if self._real_repository:
 
1142
            return self._real_repository.resume_write_group(tokens)
 
1143
        path = self.bzrdir._path_for_remote_call(self._client)
 
1144
        try:
 
1145
            response = self._call('Repository.check_write_group', path,
 
1146
               self._lock_token, tokens)
 
1147
        except errors.UnknownSmartMethod:
 
1148
            self._ensure_real()
 
1149
            return self._real_repository.resume_write_group(tokens)
 
1150
        if response != ('ok', ):
 
1151
            raise errors.UnexpectedSmartServerResponse(response)
 
1152
        self._write_group_tokens = tokens
750
1153
 
751
1154
    def suspend_write_group(self):
752
 
        self._ensure_real()
753
 
        return self._real_repository.suspend_write_group()
 
1155
        if self._real_repository:
 
1156
            return self._real_repository.suspend_write_group()
 
1157
        ret = self._write_group_tokens or []
 
1158
        self._write_group_tokens = None
 
1159
        return ret
754
1160
 
755
1161
    def get_missing_parent_inventories(self, check_for_missing_texts=True):
756
1162
        self._ensure_real()
817
1223
    def find_text_key_references(self):
818
1224
        """Find the text key references within the repository.
819
1225
 
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
1226
        :return: A dictionary mapping text keys ((fileid, revision_id) tuples)
824
1227
            to whether they were referred to by the inventory of the
825
1228
            revision_id that they contain. The inventory texts from all present
843
1246
        """Private method for using with old (< 1.2) servers to fallback."""
844
1247
        if revision_id is None:
845
1248
            revision_id = ''
846
 
        elif revision.is_null(revision_id):
 
1249
        elif _mod_revision.is_null(revision_id):
847
1250
            return {}
848
1251
 
849
1252
        path = self.bzrdir._path_for_remote_call(self._client)
873
1276
        return RemoteStreamSource(self, to_format)
874
1277
 
875
1278
    @needs_read_lock
 
1279
    def get_file_graph(self):
 
1280
        return graph.Graph(self.texts)
 
1281
 
 
1282
    @needs_read_lock
876
1283
    def has_revision(self, revision_id):
877
1284
        """True if this repository has a copy of the revision."""
878
1285
        # Copy of bzrlib.repository.Repository.has_revision
895
1302
    def _has_same_fallbacks(self, other_repo):
896
1303
        """Returns true if the repositories have the same fallbacks."""
897
1304
        # XXX: copied from Repository; it should be unified into a base class
898
 
        # <https://bugs.edge.launchpad.net/bzr/+bug/401622>
 
1305
        # <https://bugs.launchpad.net/bzr/+bug/401622>
899
1306
        my_fb = self._fallback_repositories
900
1307
        other_fb = other_repo._fallback_repositories
901
1308
        if len(my_fb) != len(other_fb):
930
1337
        """See Repository.gather_stats()."""
931
1338
        path = self.bzrdir._path_for_remote_call(self._client)
932
1339
        # revid can be None to indicate no revisions, not just NULL_REVISION
933
 
        if revid is None or revision.is_null(revid):
 
1340
        if revid is None or _mod_revision.is_null(revid):
934
1341
            fmt_revid = ''
935
1342
        else:
936
1343
            fmt_revid = revid
965
1372
 
966
1373
    def get_physical_lock_status(self):
967
1374
        """See Repository.get_physical_lock_status()."""
968
 
        # should be an API call to the server.
969
 
        self._ensure_real()
970
 
        return self._real_repository.get_physical_lock_status()
 
1375
        path = self.bzrdir._path_for_remote_call(self._client)
 
1376
        try:
 
1377
            response = self._call('Repository.get_physical_lock_status', path)
 
1378
        except errors.UnknownSmartMethod:
 
1379
            self._ensure_real()
 
1380
            return self._real_repository.get_physical_lock_status()
 
1381
        if response[0] not in ('yes', 'no'):
 
1382
            raise errors.UnexpectedSmartServerResponse(response)
 
1383
        return (response[0] == 'yes')
971
1384
 
972
1385
    def is_in_write_group(self):
973
1386
        """Return True if there is an open write group.
974
1387
 
975
1388
        write groups are only applicable locally for the smart server..
976
1389
        """
 
1390
        if self._write_group_tokens is not None:
 
1391
            return True
977
1392
        if self._real_repository:
978
1393
            return self._real_repository.is_in_write_group()
979
1394
 
997
1412
        pass
998
1413
 
999
1414
    def lock_read(self):
 
1415
        """Lock the repository for read operations.
 
1416
 
 
1417
        :return: A bzrlib.lock.LogicalLockResult.
 
1418
        """
1000
1419
        # wrong eventually - want a local lock cache context
1001
1420
        if not self._lock_mode:
1002
1421
            self._note_lock('r')
1009
1428
                repo.lock_read()
1010
1429
        else:
1011
1430
            self._lock_count += 1
 
1431
        return lock.LogicalLockResult(self.unlock)
1012
1432
 
1013
1433
    def _remote_lock_write(self, token):
1014
1434
        path = self.bzrdir._path_for_remote_call(self._client)
1054
1474
            raise errors.ReadOnlyError(self)
1055
1475
        else:
1056
1476
            self._lock_count += 1
1057
 
        return self._lock_token or None
 
1477
        return RepositoryWriteLockResult(self.unlock, self._lock_token or None)
1058
1478
 
1059
1479
    def leave_lock_in_place(self):
1060
1480
        if not self._lock_token:
1109
1529
            self._real_repository.lock_write(self._lock_token)
1110
1530
        elif self._lock_mode == 'r':
1111
1531
            self._real_repository.lock_read()
 
1532
        if self._write_group_tokens is not None:
 
1533
            # if we are already in a write group, resume it
 
1534
            self._real_repository.resume_write_group(self._write_group_tokens)
 
1535
            self._write_group_tokens = None
1112
1536
 
1113
1537
    def start_write_group(self):
1114
1538
        """Start a write group on the decorated repository.
1118
1542
        for older plugins that don't use e.g. the CommitBuilder
1119
1543
        facility.
1120
1544
        """
1121
 
        self._ensure_real()
1122
 
        return self._real_repository.start_write_group()
 
1545
        if self._real_repository:
 
1546
            self._ensure_real()
 
1547
            return self._real_repository.start_write_group()
 
1548
        if not self.is_write_locked():
 
1549
            raise errors.NotWriteLocked(self)
 
1550
        if self._write_group_tokens is not None:
 
1551
            raise errors.BzrError('already in a write group')
 
1552
        path = self.bzrdir._path_for_remote_call(self._client)
 
1553
        try:
 
1554
            response = self._call('Repository.start_write_group', path,
 
1555
                self._lock_token)
 
1556
        except (errors.UnknownSmartMethod, errors.UnsuspendableWriteGroup):
 
1557
            self._ensure_real()
 
1558
            return self._real_repository.start_write_group()
 
1559
        if response[0] != 'ok':
 
1560
            raise errors.UnexpectedSmartServerResponse(response)
 
1561
        self._write_group_tokens = response[1]
1123
1562
 
1124
1563
    def _unlock(self, token):
1125
1564
        path = self.bzrdir._path_for_remote_call(self._client)
1152
1591
            # This is just to let the _real_repository stay up to date.
1153
1592
            if self._real_repository is not None:
1154
1593
                self._real_repository.unlock()
 
1594
            elif self._write_group_tokens is not None:
 
1595
                self.abort_write_group()
1155
1596
        finally:
1156
1597
            # The rpc-level lock should be released even if there was a
1157
1598
            # problem releasing the vfs-based lock.
1169
1610
 
1170
1611
    def break_lock(self):
1171
1612
        # should hand off to the network
1172
 
        self._ensure_real()
1173
 
        return self._real_repository.break_lock()
 
1613
        path = self.bzrdir._path_for_remote_call(self._client)
 
1614
        try:
 
1615
            response = self._call("Repository.break_lock", path)
 
1616
        except errors.UnknownSmartMethod:
 
1617
            self._ensure_real()
 
1618
            return self._real_repository.break_lock()
 
1619
        if response != ('ok',):
 
1620
            raise errors.UnexpectedSmartServerResponse(response)
1174
1621
 
1175
1622
    def _get_tarball(self, compression):
1176
1623
        """Return a TemporaryFile containing a repository tarball.
1194
1641
            return t
1195
1642
        raise errors.UnexpectedSmartServerResponse(response)
1196
1643
 
 
1644
    @needs_read_lock
1197
1645
    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)
 
1646
        """Create a descendent repository for new development.
 
1647
 
 
1648
        Unlike clone, this does not copy the settings of the repository.
 
1649
        """
 
1650
        dest_repo = self._create_sprouting_repo(to_bzrdir, shared=False)
1202
1651
        dest_repo.fetch(self, revision_id=revision_id)
1203
1652
        return dest_repo
1204
1653
 
 
1654
    def _create_sprouting_repo(self, a_bzrdir, shared):
 
1655
        if not isinstance(a_bzrdir._format, self.bzrdir._format.__class__):
 
1656
            # use target default format.
 
1657
            dest_repo = a_bzrdir.create_repository()
 
1658
        else:
 
1659
            # Most control formats need the repository to be specifically
 
1660
            # created, but on some old all-in-one formats it's not needed
 
1661
            try:
 
1662
                dest_repo = self._format.initialize(a_bzrdir, shared=shared)
 
1663
            except errors.UninitializableFormat:
 
1664
                dest_repo = a_bzrdir.open_repository()
 
1665
        return dest_repo
 
1666
 
1205
1667
    ### These methods are just thin shims to the VFS object for now.
1206
1668
 
 
1669
    @needs_read_lock
1207
1670
    def revision_tree(self, revision_id):
1208
 
        self._ensure_real()
1209
 
        return self._real_repository.revision_tree(revision_id)
 
1671
        revision_id = _mod_revision.ensure_null(revision_id)
 
1672
        if revision_id == _mod_revision.NULL_REVISION:
 
1673
            return InventoryRevisionTree(self,
 
1674
                Inventory(root_id=None), _mod_revision.NULL_REVISION)
 
1675
        else:
 
1676
            return list(self.revision_trees([revision_id]))[0]
1210
1677
 
1211
1678
    def get_serializer_format(self):
1212
 
        self._ensure_real()
1213
 
        return self._real_repository.get_serializer_format()
 
1679
        path = self.bzrdir._path_for_remote_call(self._client)
 
1680
        try:
 
1681
            response = self._call('VersionedFileRepository.get_serializer_format',
 
1682
                path)
 
1683
        except errors.UnknownSmartMethod:
 
1684
            self._ensure_real()
 
1685
            return self._real_repository.get_serializer_format()
 
1686
        if response[0] != 'ok':
 
1687
            raise errors.UnexpectedSmartServerResponse(response)
 
1688
        return response[1]
1214
1689
 
1215
1690
    def get_commit_builder(self, branch, parents, config, timestamp=None,
1216
1691
                           timezone=None, committer=None, revprops=None,
1217
 
                           revision_id=None):
 
1692
                           revision_id=None, lossy=False):
1218
1693
        # FIXME: It ought to be possible to call this without immediately
1219
1694
        # triggering _ensure_real.  For now it's the easiest thing to do.
1220
1695
        self._ensure_real()
1221
1696
        real_repo = self._real_repository
1222
1697
        builder = real_repo.get_commit_builder(branch, parents,
1223
1698
                config, timestamp=timestamp, timezone=timezone,
1224
 
                committer=committer, revprops=revprops, revision_id=revision_id)
 
1699
                committer=committer, revprops=revprops,
 
1700
                revision_id=revision_id, lossy=lossy)
1225
1701
        return builder
1226
1702
 
1227
1703
    def add_fallback_repository(self, repository):
1235
1711
        # We need to accumulate additional repositories here, to pass them in
1236
1712
        # on various RPC's.
1237
1713
        #
 
1714
        # Make the check before we lock: this raises an exception.
 
1715
        self._check_fallback_repository(repository)
1238
1716
        if self.is_locked():
1239
1717
            # We will call fallback.unlock() when we transition to the unlocked
1240
1718
            # state, so always add a lock here. If a caller passes us a locked
1241
1719
            # repository, they are responsible for unlocking it later.
1242
1720
            repository.lock_read()
1243
 
        self._check_fallback_repository(repository)
1244
1721
        self._fallback_repositories.append(repository)
1245
1722
        # If self._real_repository was parameterised already (e.g. because a
1246
1723
        # _real_branch had its get_stacked_on_url method called), then the
1288
1765
 
1289
1766
    @needs_read_lock
1290
1767
    def get_revision(self, revision_id):
1291
 
        self._ensure_real()
1292
 
        return self._real_repository.get_revision(revision_id)
 
1768
        return self.get_revisions([revision_id])[0]
1293
1769
 
1294
1770
    def get_transaction(self):
1295
1771
        self._ensure_real()
1297
1773
 
1298
1774
    @needs_read_lock
1299
1775
    def clone(self, a_bzrdir, revision_id=None):
1300
 
        self._ensure_real()
1301
 
        return self._real_repository.clone(a_bzrdir, revision_id=revision_id)
 
1776
        dest_repo = self._create_sprouting_repo(
 
1777
            a_bzrdir, shared=self.is_shared())
 
1778
        self.copy_content_into(dest_repo, revision_id)
 
1779
        return dest_repo
1302
1780
 
1303
1781
    def make_working_trees(self):
1304
1782
        """See Repository.make_working_trees"""
1305
 
        self._ensure_real()
1306
 
        return self._real_repository.make_working_trees()
 
1783
        path = self.bzrdir._path_for_remote_call(self._client)
 
1784
        try:
 
1785
            response = self._call('Repository.make_working_trees', path)
 
1786
        except errors.UnknownSmartMethod:
 
1787
            self._ensure_real()
 
1788
            return self._real_repository.make_working_trees()
 
1789
        if response[0] not in ('yes', 'no'):
 
1790
            raise SmartProtocolError('unexpected response code %s' % (response,))
 
1791
        return response[0] == 'yes'
1307
1792
 
1308
1793
    def refresh_data(self):
1309
 
        """Re-read any data needed to to synchronise with disk.
 
1794
        """Re-read any data needed to synchronise with disk.
1310
1795
 
1311
1796
        This method is intended to be called after another repository instance
1312
1797
        (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.
 
1798
        repository. On all repositories this will work outside of write groups.
 
1799
        Some repository formats (pack and newer for bzrlib native formats)
 
1800
        support refresh_data inside write groups. If called inside a write
 
1801
        group on a repository that does not support refreshing in a write group
 
1802
        IsInWriteGroupError will be raised.
1315
1803
        """
1316
 
        if self.is_in_write_group():
1317
 
            raise errors.InternalBzrError(
1318
 
                "May not refresh_data while in a write group.")
1319
1804
        if self._real_repository is not None:
1320
1805
            self._real_repository.refresh_data()
1321
1806
 
1333
1818
        return result
1334
1819
 
1335
1820
    @needs_read_lock
1336
 
    def search_missing_revision_ids(self, other, revision_id=None, find_ghosts=True):
 
1821
    def search_missing_revision_ids(self, other,
 
1822
            revision_id=symbol_versioning.DEPRECATED_PARAMETER,
 
1823
            find_ghosts=True, revision_ids=None, if_present_ids=None,
 
1824
            limit=None):
1337
1825
        """Return the revision ids that other has that this does not.
1338
1826
 
1339
1827
        These are returned in topological order.
1340
1828
 
1341
1829
        revision_id: only return revision ids included by revision_id.
1342
1830
        """
1343
 
        return repository.InterRepository.get(
1344
 
            other, self).search_missing_revision_ids(revision_id, find_ghosts)
 
1831
        if symbol_versioning.deprecated_passed(revision_id):
 
1832
            symbol_versioning.warn(
 
1833
                'search_missing_revision_ids(revision_id=...) was '
 
1834
                'deprecated in 2.4.  Use revision_ids=[...] instead.',
 
1835
                DeprecationWarning, stacklevel=2)
 
1836
            if revision_ids is not None:
 
1837
                raise AssertionError(
 
1838
                    'revision_ids is mutually exclusive with revision_id')
 
1839
            if revision_id is not None:
 
1840
                revision_ids = [revision_id]
 
1841
        inter_repo = _mod_repository.InterRepository.get(other, self)
 
1842
        return inter_repo.search_missing_revision_ids(
 
1843
            find_ghosts=find_ghosts, revision_ids=revision_ids,
 
1844
            if_present_ids=if_present_ids, limit=limit)
1345
1845
 
1346
 
    def fetch(self, source, revision_id=None, pb=None, find_ghosts=False,
 
1846
    def fetch(self, source, revision_id=None, find_ghosts=False,
1347
1847
            fetch_spec=None):
1348
1848
        # No base implementation to use as RemoteRepository is not a subclass
1349
1849
        # of Repository; so this is a copy of Repository.fetch().
1360
1860
            # check that last_revision is in 'from' and then return a
1361
1861
            # no-operation.
1362
1862
            if (revision_id is not None and
1363
 
                not revision.is_null(revision_id)):
 
1863
                not _mod_revision.is_null(revision_id)):
1364
1864
                self.get_revision(revision_id)
1365
1865
            return 0, []
1366
1866
        # if there is no specific appropriate InterRepository, this will get
1367
1867
        # the InterRepository base class, which raises an
1368
1868
        # IncompatibleRepositories when asked to fetch.
1369
 
        inter = repository.InterRepository.get(source, self)
1370
 
        return inter.fetch(revision_id=revision_id, pb=pb,
 
1869
        inter = _mod_repository.InterRepository.get(source, self)
 
1870
        return inter.fetch(revision_id=revision_id,
1371
1871
            find_ghosts=find_ghosts, fetch_spec=fetch_spec)
1372
1872
 
1373
1873
    def create_bundle(self, target, base, fileobj, format=None):
1375
1875
        self._real_repository.create_bundle(target, base, fileobj, format)
1376
1876
 
1377
1877
    @needs_read_lock
 
1878
    @symbol_versioning.deprecated_method(
 
1879
        symbol_versioning.deprecated_in((2, 4, 0)))
1378
1880
    def get_ancestry(self, revision_id, topo_sorted=True):
1379
1881
        self._ensure_real()
1380
1882
        return self._real_repository.get_ancestry(revision_id, topo_sorted)
1394
1896
        self._ensure_real()
1395
1897
        return self._real_repository.iter_files_bytes(desired_files)
1396
1898
 
 
1899
    def get_cached_parent_map(self, revision_ids):
 
1900
        """See bzrlib.CachingParentsProvider.get_cached_parent_map"""
 
1901
        return self._unstacked_provider.get_cached_parent_map(revision_ids)
 
1902
 
1397
1903
    def get_parent_map(self, revision_ids):
1398
1904
        """See bzrlib.Graph.get_parent_map()."""
1399
1905
        return self._make_parents_provider().get_parent_map(revision_ids)
1457
1963
        if parents_map is None:
1458
1964
            # Repository is not locked, so there's no cache.
1459
1965
            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)
 
1966
        if _DEFAULT_SEARCH_DEPTH <= 0:
 
1967
            (start_set, stop_keys,
 
1968
             key_count) = graph.search_result_from_parent_map(
 
1969
                parents_map, self._unstacked_provider.missing_keys)
 
1970
        else:
 
1971
            (start_set, stop_keys,
 
1972
             key_count) = graph.limited_search_result_from_parent_map(
 
1973
                parents_map, self._unstacked_provider.missing_keys,
 
1974
                keys, depth=_DEFAULT_SEARCH_DEPTH)
1480
1975
        recipe = ('manual', start_set, stop_keys, key_count)
1481
1976
        body = self._serialise_search_recipe(recipe)
1482
1977
        path = self.bzrdir._path_for_remote_call(self._client)
1544
2039
        return self._real_repository.reconcile(other=other, thorough=thorough)
1545
2040
 
1546
2041
    def all_revision_ids(self):
1547
 
        self._ensure_real()
1548
 
        return self._real_repository.all_revision_ids()
 
2042
        path = self.bzrdir._path_for_remote_call(self._client)
 
2043
        try:
 
2044
            response_tuple, response_handler = self._call_expecting_body(
 
2045
                "Repository.all_revision_ids", path)
 
2046
        except errors.UnknownSmartMethod:
 
2047
            self._ensure_real()
 
2048
            return self._real_repository.all_revision_ids()
 
2049
        if response_tuple != ("ok", ):
 
2050
            raise errors.UnexpectedSmartServerResponse(response_tuple)
 
2051
        revids = set(response_handler.read_body_bytes().splitlines())
 
2052
        for fallback in self._fallback_repositories:
 
2053
            revids.update(set(fallback.all_revision_ids()))
 
2054
        return list(revids)
1549
2055
 
1550
2056
    @needs_read_lock
1551
2057
    def get_deltas_for_revisions(self, revisions, specific_fileids=None):
1555
2061
 
1556
2062
    @needs_read_lock
1557
2063
    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)
 
2064
        r = self.get_revision(revision_id)
 
2065
        return list(self.get_deltas_for_revisions([r],
 
2066
            specific_fileids=specific_fileids))[0]
1561
2067
 
1562
2068
    @needs_read_lock
1563
2069
    def revision_trees(self, revision_ids):
1576
2082
            callback_refs=callback_refs, check_repo=check_repo)
1577
2083
 
1578
2084
    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)
 
2085
        """Make a complete copy of the content in self into destination.
 
2086
 
 
2087
        This is a destructive operation! Do not use it on existing
 
2088
        repositories.
 
2089
        """
 
2090
        interrepo = _mod_repository.InterRepository.get(self, destination)
 
2091
        return interrepo.copy_content(revision_id)
1582
2092
 
1583
2093
    def _copy_repository_tarball(self, to_bzrdir, revision_id=None):
1584
2094
        # get a tarball of the remote repository, and copy from that into the
1586
2096
        from bzrlib import osutils
1587
2097
        import tarfile
1588
2098
        # TODO: Maybe a progress bar while streaming the tarball?
1589
 
        note("Copying repository content as tarball...")
 
2099
        note(gettext("Copying repository content as tarball..."))
1590
2100
        tar_file = self._get_tarball('bz2')
1591
2101
        if tar_file is None:
1592
2102
            return None
1597
2107
            tmpdir = osutils.mkdtemp()
1598
2108
            try:
1599
2109
                _extract_tar(tar, tmpdir)
1600
 
                tmp_bzrdir = BzrDir.open(tmpdir)
 
2110
                tmp_bzrdir = _mod_bzrdir.BzrDir.open(tmpdir)
1601
2111
                tmp_repo = tmp_bzrdir.open_repository()
1602
2112
                tmp_repo.copy_content_into(destination, revision_id)
1603
2113
            finally:
1688
2198
    def supports_rich_root(self):
1689
2199
        return self._format.rich_root_data
1690
2200
 
 
2201
    @symbol_versioning.deprecated_method(symbol_versioning.deprecated_in((2, 4, 0)))
1691
2202
    def iter_reverse_revision_history(self, revision_id):
1692
2203
        self._ensure_real()
1693
2204
        return self._real_repository.iter_reverse_revision_history(revision_id)
1696
2207
    def _serializer(self):
1697
2208
        return self._format._serializer
1698
2209
 
 
2210
    @needs_write_lock
1699
2211
    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)
 
2212
        signature = gpg_strategy.sign(plaintext)
 
2213
        self.add_signature_text(revision_id, signature)
1703
2214
 
1704
2215
    def add_signature_text(self, revision_id, signature):
1705
2216
        self._ensure_real()
1706
2217
        return self._real_repository.add_signature_text(revision_id, signature)
1707
2218
 
1708
2219
    def has_signature_for_revision_id(self, revision_id):
 
2220
        path = self.bzrdir._path_for_remote_call(self._client)
 
2221
        try:
 
2222
            response = self._call('Repository.has_signature_for_revision_id',
 
2223
                path, revision_id)
 
2224
        except errors.UnknownSmartMethod:
 
2225
            self._ensure_real()
 
2226
            return self._real_repository.has_signature_for_revision_id(
 
2227
                revision_id)
 
2228
        if response[0] not in ('yes', 'no'):
 
2229
            raise SmartProtocolError('unexpected response code %s' % (response,))
 
2230
        return (response[0] == 'yes')
 
2231
 
 
2232
    def verify_revision_signature(self, revision_id, gpg_strategy):
1709
2233
        self._ensure_real()
1710
 
        return self._real_repository.has_signature_for_revision_id(revision_id)
 
2234
        return self._real_repository.verify_revision_signature(
 
2235
            revision_id, gpg_strategy)
1711
2236
 
1712
2237
    def item_keys_introduced_by(self, revision_ids, _files_pb=None):
1713
2238
        self._ensure_real()
1714
2239
        return self._real_repository.item_keys_introduced_by(revision_ids,
1715
2240
            _files_pb=_files_pb)
1716
2241
 
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
2242
    def _find_inconsistent_revision_parents(self, revisions_iterator=None):
1723
2243
        self._ensure_real()
1724
2244
        return self._real_repository._find_inconsistent_revision_parents(
1732
2252
        providers = [self._unstacked_provider]
1733
2253
        if other is not None:
1734
2254
            providers.insert(0, other)
1735
 
        providers.extend(r._make_parents_provider() for r in
1736
 
                         self._fallback_repositories)
1737
 
        return graph.StackedParentsProvider(providers)
 
2255
        return graph.StackedParentsProvider(_LazyListJoin(
 
2256
            providers, self._fallback_repositories))
1738
2257
 
1739
2258
    def _serialise_search_recipe(self, recipe):
1740
2259
        """Serialise a graph search recipe.
1748
2267
        return '\n'.join((start_keys, stop_keys, count))
1749
2268
 
1750
2269
    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)]
 
2270
        parts = search_result.get_network_struct()
1757
2271
        return '\n'.join(parts)
1758
2272
 
1759
2273
    def autopack(self):
1769
2283
            raise errors.UnexpectedSmartServerResponse(response)
1770
2284
 
1771
2285
 
1772
 
class RemoteStreamSink(repository.StreamSink):
 
2286
class RemoteStreamSink(vf_repository.StreamSink):
1773
2287
 
1774
2288
    def _insert_real(self, stream, src_format, resume_tokens):
1775
2289
        self.target_repo._ensure_real()
1876
2390
        self._last_substream and self._last_stream so that the stream can be
1877
2391
        resumed by _resume_stream_with_vfs.
1878
2392
        """
1879
 
                    
 
2393
 
1880
2394
        stream_iter = iter(stream)
1881
2395
        for substream_kind, substream in stream_iter:
1882
2396
            if substream_kind == 'inventory-deltas':
1885
2399
                return
1886
2400
            else:
1887
2401
                yield substream_kind, substream
1888
 
            
1889
 
 
1890
 
class RemoteStreamSource(repository.StreamSource):
 
2402
 
 
2403
 
 
2404
class RemoteStreamSource(vf_repository.StreamSource):
1891
2405
    """Stream data from a remote server."""
1892
2406
 
1893
2407
    def get_stream(self, search):
1953
2467
        candidate_verbs = [
1954
2468
            ('Repository.get_stream_1.19', (1, 19)),
1955
2469
            ('Repository.get_stream', (1, 13))]
 
2470
 
1956
2471
        found_verb = False
1957
2472
        for verb, version in candidate_verbs:
1958
2473
            if medium._is_remote_before(version):
1962
2477
                    verb, args, search_bytes)
1963
2478
            except errors.UnknownSmartMethod:
1964
2479
                medium._remember_remote_is_before(version)
 
2480
            except errors.UnknownErrorFromSmartServer, e:
 
2481
                if isinstance(search, graph.EverythingResult):
 
2482
                    error_verb = e.error_from_smart_server.error_verb
 
2483
                    if error_verb == 'BadSearch':
 
2484
                        # Pre-2.4 servers don't support this sort of search.
 
2485
                        # XXX: perhaps falling back to VFS on BadSearch is a
 
2486
                        # good idea in general?  It might provide a little bit
 
2487
                        # of protection against client-side bugs.
 
2488
                        medium._remember_remote_is_before((2, 4))
 
2489
                        break
 
2490
                raise
1965
2491
            else:
1966
2492
                response_tuple, response_handler = response
1967
2493
                found_verb = True
1971
2497
        if response_tuple[0] != 'ok':
1972
2498
            raise errors.UnexpectedSmartServerResponse(response_tuple)
1973
2499
        byte_stream = response_handler.read_streamed_body()
1974
 
        src_format, stream = smart_repo._byte_stream_to_stream(byte_stream)
 
2500
        src_format, stream = smart_repo._byte_stream_to_stream(byte_stream,
 
2501
            self._record_counter)
1975
2502
        if src_format.network_name() != repo._format.network_name():
1976
2503
            raise AssertionError(
1977
2504
                "Mismatched RemoteRepository and stream src %r, %r" % (
2063
2590
        return a_bzrdir.open_branch(name=name, 
2064
2591
            ignore_fallbacks=ignore_fallbacks)
2065
2592
 
2066
 
    def _vfs_initialize(self, a_bzrdir, name):
 
2593
    def _vfs_initialize(self, a_bzrdir, name, append_revisions_only):
2067
2594
        # Initialisation when using a local bzrdir object, or a non-vfs init
2068
2595
        # method is not available on the server.
2069
2596
        # self._custom_format is always set - the start of initialize ensures
2071
2598
        if isinstance(a_bzrdir, RemoteBzrDir):
2072
2599
            a_bzrdir._ensure_real()
2073
2600
            result = self._custom_format.initialize(a_bzrdir._real_bzrdir,
2074
 
                name)
 
2601
                name, append_revisions_only=append_revisions_only)
2075
2602
        else:
2076
2603
            # We assume the bzrdir is parameterised; it may not be.
2077
 
            result = self._custom_format.initialize(a_bzrdir, name)
 
2604
            result = self._custom_format.initialize(a_bzrdir, name,
 
2605
                append_revisions_only=append_revisions_only)
2078
2606
        if (isinstance(a_bzrdir, RemoteBzrDir) and
2079
2607
            not isinstance(result, RemoteBranch)):
2080
2608
            result = RemoteBranch(a_bzrdir, a_bzrdir.find_repository(), result,
2081
2609
                                  name=name)
2082
2610
        return result
2083
2611
 
2084
 
    def initialize(self, a_bzrdir, name=None):
 
2612
    def initialize(self, a_bzrdir, name=None, repository=None,
 
2613
                   append_revisions_only=None):
2085
2614
        # 1) get the network name to use.
2086
2615
        if self._custom_format:
2087
2616
            network_name = self._custom_format.network_name()
2088
2617
        else:
2089
2618
            # Select the current bzrlib default and ask for that.
2090
 
            reference_bzrdir_format = bzrdir.format_registry.get('default')()
 
2619
            reference_bzrdir_format = _mod_bzrdir.format_registry.get('default')()
2091
2620
            reference_format = reference_bzrdir_format.get_branch_format()
2092
2621
            self._custom_format = reference_format
2093
2622
            network_name = reference_format.network_name()
2094
2623
        # Being asked to create on a non RemoteBzrDir:
2095
2624
        if not isinstance(a_bzrdir, RemoteBzrDir):
2096
 
            return self._vfs_initialize(a_bzrdir, name=name)
 
2625
            return self._vfs_initialize(a_bzrdir, name=name,
 
2626
                append_revisions_only=append_revisions_only)
2097
2627
        medium = a_bzrdir._client._medium
2098
2628
        if medium._is_remote_before((1, 13)):
2099
 
            return self._vfs_initialize(a_bzrdir, name=name)
 
2629
            return self._vfs_initialize(a_bzrdir, name=name,
 
2630
                append_revisions_only=append_revisions_only)
2100
2631
        # Creating on a remote bzr dir.
2101
2632
        # 2) try direct creation via RPC
2102
2633
        path = a_bzrdir._path_for_remote_call(a_bzrdir._client)
2109
2640
        except errors.UnknownSmartMethod:
2110
2641
            # Fallback - use vfs methods
2111
2642
            medium._remember_remote_is_before((1, 13))
2112
 
            return self._vfs_initialize(a_bzrdir, name=name)
 
2643
            return self._vfs_initialize(a_bzrdir, name=name,
 
2644
                    append_revisions_only=append_revisions_only)
2113
2645
        if response[0] != 'ok':
2114
2646
            raise errors.UnexpectedSmartServerResponse(response)
2115
2647
        # Turn the response into a RemoteRepository object.
2116
2648
        format = RemoteBranchFormat(network_name=response[1])
2117
2649
        repo_format = response_tuple_to_repo_format(response[3:])
2118
 
        if response[2] == '':
2119
 
            repo_bzrdir = a_bzrdir
 
2650
        repo_path = response[2]
 
2651
        if repository is not None:
 
2652
            remote_repo_url = urlutils.join(a_bzrdir.user_url, repo_path)
 
2653
            url_diff = urlutils.relative_url(repository.user_url,
 
2654
                    remote_repo_url)
 
2655
            if url_diff != '.':
 
2656
                raise AssertionError(
 
2657
                    'repository.user_url %r does not match URL from server '
 
2658
                    'response (%r + %r)'
 
2659
                    % (repository.user_url, a_bzrdir.user_url, repo_path))
 
2660
            remote_repo = repository
2120
2661
        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)
 
2662
            if repo_path == '':
 
2663
                repo_bzrdir = a_bzrdir
 
2664
            else:
 
2665
                repo_bzrdir = RemoteBzrDir(
 
2666
                    a_bzrdir.root_transport.clone(repo_path), a_bzrdir._format,
 
2667
                    a_bzrdir._client)
 
2668
            remote_repo = RemoteRepository(repo_bzrdir, repo_format)
2125
2669
        remote_branch = RemoteBranch(a_bzrdir, remote_repo,
2126
2670
            format=format, setup_stacking=False, name=name)
 
2671
        if append_revisions_only:
 
2672
            remote_branch.set_append_revisions_only(append_revisions_only)
2127
2673
        # XXX: We know this is a new branch, so it must have revno 0, revid
2128
2674
        # NULL_REVISION. Creating the branch locked would make this be unable
2129
2675
        # to be wrong; here its simply very unlikely to be wrong. RBC 20090225
2148
2694
        self._ensure_real()
2149
2695
        return self._custom_format.supports_set_append_revisions_only()
2150
2696
 
 
2697
    def _use_default_local_heads_to_fetch(self):
 
2698
        # If the branch format is a metadir format *and* its heads_to_fetch
 
2699
        # implementation is not overridden vs the base class, we can use the
 
2700
        # base class logic rather than use the heads_to_fetch RPC.  This is
 
2701
        # usually cheaper in terms of net round trips, as the last-revision and
 
2702
        # tags info fetched is cached and would be fetched anyway.
 
2703
        self._ensure_real()
 
2704
        if isinstance(self._custom_format, branch.BranchFormatMetadir):
 
2705
            branch_class = self._custom_format._branch_class()
 
2706
            heads_to_fetch_impl = branch_class.heads_to_fetch.im_func
 
2707
            if heads_to_fetch_impl is branch.Branch.heads_to_fetch.im_func:
 
2708
                return True
 
2709
        return False
 
2710
 
 
2711
 
 
2712
class RemoteBranchStore(config.IniFileStore):
 
2713
    """Branch store which attempts to use HPSS calls to retrieve branch store.
 
2714
 
 
2715
    Note that this is specific to bzr-based formats.
 
2716
    """
 
2717
 
 
2718
    def __init__(self, branch):
 
2719
        super(RemoteBranchStore, self).__init__()
 
2720
        self.branch = branch
 
2721
        self.id = "branch"
 
2722
        self._real_store = None
 
2723
 
 
2724
    def lock_write(self, token=None):
 
2725
        return self.branch.lock_write(token)
 
2726
 
 
2727
    def unlock(self):
 
2728
        return self.branch.unlock()
 
2729
 
 
2730
    @needs_write_lock
 
2731
    def save(self):
 
2732
        # We need to be able to override the undecorated implementation
 
2733
        self.save_without_locking()
 
2734
 
 
2735
    def save_without_locking(self):
 
2736
        super(RemoteBranchStore, self).save()
 
2737
 
 
2738
    def external_url(self):
 
2739
        return self.branch.user_url
 
2740
 
 
2741
    def _load_content(self):
 
2742
        path = self.branch._remote_path()
 
2743
        try:
 
2744
            response, handler = self.branch._call_expecting_body(
 
2745
                'Branch.get_config_file', path)
 
2746
        except errors.UnknownSmartMethod:
 
2747
            self._ensure_real()
 
2748
            return self._real_store._load_content()
 
2749
        if len(response) and response[0] != 'ok':
 
2750
            raise errors.UnexpectedSmartServerResponse(response)
 
2751
        return handler.read_body_bytes()
 
2752
 
 
2753
    def _save_content(self, content):
 
2754
        path = self.branch._remote_path()
 
2755
        try:
 
2756
            response, handler = self.branch._call_with_body_bytes_expecting_body(
 
2757
                'Branch.put_config_file', (path,
 
2758
                    self.branch._lock_token, self.branch._repo_lock_token),
 
2759
                content)
 
2760
        except errors.UnknownSmartMethod:
 
2761
            self._ensure_real()
 
2762
            return self._real_store._save_content(content)
 
2763
        handler.cancel_read_body()
 
2764
        if response != ('ok', ):
 
2765
            raise errors.UnexpectedSmartServerResponse(response)
 
2766
 
 
2767
    def _ensure_real(self):
 
2768
        self.branch._ensure_real()
 
2769
        if self._real_store is None:
 
2770
            self._real_store = config.BranchStore(self.branch)
 
2771
 
2151
2772
 
2152
2773
class RemoteBranch(branch.Branch, _RpcHelper, lock._RelockDebugMixin):
2153
2774
    """Branch stored on a server accessed by HPSS RPC.
2243
2864
    def _get_config(self):
2244
2865
        return RemoteBranchConfig(self)
2245
2866
 
 
2867
    def _get_config_store(self):
 
2868
        return RemoteBranchStore(self)
 
2869
 
2246
2870
    def _get_real_transport(self):
2247
2871
        # if we try vfs access, return the real branch's vfs transport
2248
2872
        self._ensure_real()
2311
2935
                self.bzrdir, self._client)
2312
2936
        return self._control_files
2313
2937
 
2314
 
    def _get_checkout_format(self):
 
2938
    def _get_checkout_format(self, lightweight=False):
2315
2939
        self._ensure_real()
2316
 
        return self._real_branch._get_checkout_format()
 
2940
        if lightweight:
 
2941
            format = RemoteBzrDirFormat()
 
2942
            self.bzrdir._format._supply_sub_formats_to(format)
 
2943
            format.workingtree_format = self._real_branch._get_checkout_format(
 
2944
                lightweight=lightweight).workingtree_format
 
2945
            return format
 
2946
        else:
 
2947
            return self._real_branch._get_checkout_format(lightweight=False)
2317
2948
 
2318
2949
    def get_physical_lock_status(self):
2319
2950
        """See Branch.get_physical_lock_status()."""
2320
 
        # should be an API call to the server, as branches must be lockable.
2321
 
        self._ensure_real()
2322
 
        return self._real_branch.get_physical_lock_status()
 
2951
        try:
 
2952
            response = self._client.call('Branch.get_physical_lock_status',
 
2953
                self._remote_path())
 
2954
        except errors.UnknownSmartMethod:
 
2955
            self._ensure_real()
 
2956
            return self._real_branch.get_physical_lock_status()
 
2957
        if response[0] not in ('yes', 'no'):
 
2958
            raise errors.UnexpectedSmartServerResponse(response)
 
2959
        return (response[0] == 'yes')
2323
2960
 
2324
2961
    def get_stacked_on_url(self):
2325
2962
        """Get the URL this branch is stacked against.
2352
2989
            self._is_stacked = False
2353
2990
        else:
2354
2991
            self._is_stacked = True
2355
 
        
 
2992
 
2356
2993
    def _vfs_get_tags_bytes(self):
2357
2994
        self._ensure_real()
2358
2995
        return self._real_branch._get_tags_bytes()
2359
2996
 
 
2997
    @needs_read_lock
2360
2998
    def _get_tags_bytes(self):
 
2999
        if self._tags_bytes is None:
 
3000
            self._tags_bytes = self._get_tags_bytes_via_hpss()
 
3001
        return self._tags_bytes
 
3002
 
 
3003
    def _get_tags_bytes_via_hpss(self):
2361
3004
        medium = self._client._medium
2362
3005
        if medium._is_remote_before((1, 13)):
2363
3006
            return self._vfs_get_tags_bytes()
2373
3016
        return self._real_branch._set_tags_bytes(bytes)
2374
3017
 
2375
3018
    def _set_tags_bytes(self, bytes):
 
3019
        if self.is_locked():
 
3020
            self._tags_bytes = bytes
2376
3021
        medium = self._client._medium
2377
3022
        if medium._is_remote_before((1, 18)):
2378
3023
            self._vfs_set_tags_bytes(bytes)
2387
3032
            self._vfs_set_tags_bytes(bytes)
2388
3033
 
2389
3034
    def lock_read(self):
 
3035
        """Lock the branch for read operations.
 
3036
 
 
3037
        :return: A bzrlib.lock.LogicalLockResult.
 
3038
        """
2390
3039
        self.repository.lock_read()
2391
3040
        if not self._lock_mode:
2392
3041
            self._note_lock('r')
2396
3045
                self._real_branch.lock_read()
2397
3046
        else:
2398
3047
            self._lock_count += 1
 
3048
        return lock.LogicalLockResult(self.unlock)
2399
3049
 
2400
3050
    def _remote_lock_write(self, token):
2401
3051
        if token is None:
2402
3052
            branch_token = repo_token = ''
2403
3053
        else:
2404
3054
            branch_token = token
2405
 
            repo_token = self.repository.lock_write()
 
3055
            repo_token = self.repository.lock_write().repository_token
2406
3056
            self.repository.unlock()
2407
3057
        err_context = {'token': token}
2408
 
        response = self._call(
2409
 
            'Branch.lock_write', self._remote_path(), branch_token,
2410
 
            repo_token or '', **err_context)
 
3058
        try:
 
3059
            response = self._call(
 
3060
                'Branch.lock_write', self._remote_path(), branch_token,
 
3061
                repo_token or '', **err_context)
 
3062
        except errors.LockContention, e:
 
3063
            # The LockContention from the server doesn't have any
 
3064
            # information about the lock_url. We re-raise LockContention
 
3065
            # with valid lock_url.
 
3066
            raise errors.LockContention('(remote lock)',
 
3067
                self.repository.base.split('.bzr/')[0])
2411
3068
        if response[0] != 'ok':
2412
3069
            raise errors.UnexpectedSmartServerResponse(response)
2413
3070
        ok, branch_token, repo_token = response
2434
3091
            self._lock_mode = 'w'
2435
3092
            self._lock_count = 1
2436
3093
        elif self._lock_mode == 'r':
2437
 
            raise errors.ReadOnlyTransaction
 
3094
            raise errors.ReadOnlyError(self)
2438
3095
        else:
2439
3096
            if token is not None:
2440
3097
                # A token was given to lock_write, and we're relocking, so
2445
3102
            self._lock_count += 1
2446
3103
            # Re-lock the repository too.
2447
3104
            self.repository.lock_write(self._repo_lock_token)
2448
 
        return self._lock_token or None
 
3105
        return BranchWriteLockResult(self.unlock, self._lock_token or None)
2449
3106
 
2450
3107
    def _unlock(self, branch_token, repo_token):
2451
3108
        err_context = {'token': str((branch_token, repo_token))}
2489
3146
            self.repository.unlock()
2490
3147
 
2491
3148
    def break_lock(self):
2492
 
        self._ensure_real()
2493
 
        return self._real_branch.break_lock()
 
3149
        try:
 
3150
            response = self._call(
 
3151
                'Branch.break_lock', self._remote_path())
 
3152
        except errors.UnknownSmartMethod:
 
3153
            self._ensure_real()
 
3154
            return self._real_branch.break_lock()
 
3155
        if response != ('ok',):
 
3156
            raise errors.UnexpectedSmartServerResponse(response)
2494
3157
 
2495
3158
    def leave_lock_in_place(self):
2496
3159
        if not self._lock_token:
2520
3183
            missing_parent = parent_map[missing_parent]
2521
3184
        raise errors.RevisionNotPresent(missing_parent, self.repository)
2522
3185
 
2523
 
    def _last_revision_info(self):
 
3186
    def _read_last_revision_info(self):
2524
3187
        response = self._call('Branch.last_revision_info', self._remote_path())
2525
3188
        if response[0] != 'ok':
2526
3189
            raise SmartProtocolError('unexpected response code %s' % (response,))
2589
3252
            raise errors.UnexpectedSmartServerResponse(response)
2590
3253
        self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2591
3254
 
 
3255
    @symbol_versioning.deprecated_method(symbol_versioning.deprecated_in((2, 4, 0)))
2592
3256
    @needs_write_lock
2593
3257
    def set_revision_history(self, rev_history):
 
3258
        """See Branch.set_revision_history."""
 
3259
        self._set_revision_history(rev_history)
 
3260
 
 
3261
    @needs_write_lock
 
3262
    def _set_revision_history(self, rev_history):
2594
3263
        # Send just the tip revision of the history; the server will generate
2595
3264
        # the full history from that.  If the revision doesn't exist in this
2596
3265
        # branch, NoSuchRevision will be raised.
2654
3323
            _override_hook_target=self, **kwargs)
2655
3324
 
2656
3325
    @needs_read_lock
2657
 
    def push(self, target, overwrite=False, stop_revision=None):
 
3326
    def push(self, target, overwrite=False, stop_revision=None, lossy=False):
2658
3327
        self._ensure_real()
2659
3328
        return self._real_branch.push(
2660
 
            target, overwrite=overwrite, stop_revision=stop_revision,
 
3329
            target, overwrite=overwrite, stop_revision=stop_revision, lossy=lossy,
2661
3330
            _override_hook_source_branch=self)
2662
3331
 
2663
3332
    def is_locked(self):
2664
3333
        return self._lock_count >= 1
2665
3334
 
2666
3335
    @needs_read_lock
 
3336
    def revision_id_to_dotted_revno(self, revision_id):
 
3337
        """Given a revision id, return its dotted revno.
 
3338
 
 
3339
        :return: a tuple like (1,) or (400,1,3).
 
3340
        """
 
3341
        try:
 
3342
            response = self._call('Branch.revision_id_to_revno',
 
3343
                self._remote_path(), revision_id)
 
3344
        except errors.UnknownSmartMethod:
 
3345
            self._ensure_real()
 
3346
            return self._real_branch.revision_id_to_revno(revision_id)
 
3347
        if response[0] == 'ok':
 
3348
            return tuple([int(x) for x in response[1:]])
 
3349
        else:
 
3350
            raise errors.UnexpectedSmartServerResponse(response)
 
3351
 
 
3352
    @needs_read_lock
2667
3353
    def revision_id_to_revno(self, revision_id):
2668
 
        self._ensure_real()
2669
 
        return self._real_branch.revision_id_to_revno(revision_id)
 
3354
        """Given a revision id on the branch mainline, return its revno.
 
3355
 
 
3356
        :return: an integer
 
3357
        """
 
3358
        try:
 
3359
            response = self._call('Branch.revision_id_to_revno',
 
3360
                self._remote_path(), revision_id)
 
3361
        except errors.UnknownSmartMethod:
 
3362
            self._ensure_real()
 
3363
            return self._real_branch.revision_id_to_revno(revision_id)
 
3364
        if response[0] == 'ok':
 
3365
            if len(response) == 2:
 
3366
                return int(response[1])
 
3367
            raise NoSuchRevision(self, revision_id)
 
3368
        else:
 
3369
            raise errors.UnexpectedSmartServerResponse(response)
2670
3370
 
2671
3371
    @needs_write_lock
2672
3372
    def set_last_revision_info(self, revno, revision_id):
2673
3373
        # XXX: These should be returned by the set_last_revision_info verb
2674
3374
        old_revno, old_revid = self.last_revision_info()
2675
3375
        self._run_pre_change_branch_tip_hooks(revno, revision_id)
2676
 
        revision_id = ensure_null(revision_id)
 
3376
        if not revision_id or not isinstance(revision_id, basestring):
 
3377
            raise errors.InvalidRevisionId(revision_id=revision_id, branch=self)
2677
3378
        try:
2678
3379
            response = self._call('Branch.set_last_revision_info',
2679
3380
                self._remote_path(), self._lock_token, self._repo_lock_token,
2708
3409
            except errors.UnknownSmartMethod:
2709
3410
                medium._remember_remote_is_before((1, 6))
2710
3411
        self._clear_cached_state_of_remote_branch_only()
2711
 
        self.set_revision_history(self._lefthand_history(revision_id,
 
3412
        self._set_revision_history(self._lefthand_history(revision_id,
2712
3413
            last_rev=last_rev,other_branch=other_branch))
2713
3414
 
2714
3415
    def set_push_location(self, location):
2715
3416
        self._ensure_real()
2716
3417
        return self._real_branch.set_push_location(location)
2717
3418
 
 
3419
    def heads_to_fetch(self):
 
3420
        if self._format._use_default_local_heads_to_fetch():
 
3421
            # We recognise this format, and its heads-to-fetch implementation
 
3422
            # is the default one (tip + tags).  In this case it's cheaper to
 
3423
            # just use the default implementation rather than a special RPC as
 
3424
            # the tip and tags data is cached.
 
3425
            return branch.Branch.heads_to_fetch(self)
 
3426
        medium = self._client._medium
 
3427
        if medium._is_remote_before((2, 4)):
 
3428
            return self._vfs_heads_to_fetch()
 
3429
        try:
 
3430
            return self._rpc_heads_to_fetch()
 
3431
        except errors.UnknownSmartMethod:
 
3432
            medium._remember_remote_is_before((2, 4))
 
3433
            return self._vfs_heads_to_fetch()
 
3434
 
 
3435
    def _rpc_heads_to_fetch(self):
 
3436
        response = self._call('Branch.heads_to_fetch', self._remote_path())
 
3437
        if len(response) != 2:
 
3438
            raise errors.UnexpectedSmartServerResponse(response)
 
3439
        must_fetch, if_present_fetch = response
 
3440
        return set(must_fetch), set(if_present_fetch)
 
3441
 
 
3442
    def _vfs_heads_to_fetch(self):
 
3443
        self._ensure_real()
 
3444
        return self._real_branch.heads_to_fetch()
 
3445
 
2718
3446
 
2719
3447
class RemoteConfig(object):
2720
3448
    """A Config that reads and writes from smart verbs.
2734
3462
        """
2735
3463
        try:
2736
3464
            configobj = self._get_configobj()
 
3465
            section_obj = None
2737
3466
            if section is None:
2738
3467
                section_obj = configobj
2739
3468
            else:
2740
3469
                try:
2741
3470
                    section_obj = configobj[section]
2742
3471
                except KeyError:
2743
 
                    return default
2744
 
            return section_obj.get(name, default)
 
3472
                    pass
 
3473
            if section_obj is None:
 
3474
                value = default
 
3475
            else:
 
3476
                value = section_obj.get(name, default)
2745
3477
        except errors.UnknownSmartMethod:
2746
 
            return self._vfs_get_option(name, section, default)
 
3478
            value = self._vfs_get_option(name, section, default)
 
3479
        for hook in config.OldConfigHooks['get']:
 
3480
            hook(self, name, value)
 
3481
        return value
2747
3482
 
2748
3483
    def _response_to_configobj(self, response):
2749
3484
        if len(response[0]) and response[0][0] != 'ok':
2750
3485
            raise errors.UnexpectedSmartServerResponse(response)
2751
3486
        lines = response[1].read_body_bytes().splitlines()
2752
 
        return config.ConfigObj(lines, encoding='utf-8')
 
3487
        conf = config.ConfigObj(lines, encoding='utf-8')
 
3488
        for hook in config.OldConfigHooks['load']:
 
3489
            hook(self)
 
3490
        return conf
2753
3491
 
2754
3492
 
2755
3493
class RemoteBranchConfig(RemoteConfig):
2774
3512
        medium = self._branch._client._medium
2775
3513
        if medium._is_remote_before((1, 14)):
2776
3514
            return self._vfs_set_option(value, name, section)
 
3515
        if isinstance(value, dict):
 
3516
            if medium._is_remote_before((2, 2)):
 
3517
                return self._vfs_set_option(value, name, section)
 
3518
            return self._set_config_option_dict(value, name, section)
 
3519
        else:
 
3520
            return self._set_config_option(value, name, section)
 
3521
 
 
3522
    def _set_config_option(self, value, name, section):
2777
3523
        try:
2778
3524
            path = self._branch._remote_path()
2779
3525
            response = self._branch._client.call('Branch.set_config_option',
2780
3526
                path, self._branch._lock_token, self._branch._repo_lock_token,
2781
3527
                value.encode('utf8'), name, section or '')
2782
3528
        except errors.UnknownSmartMethod:
 
3529
            medium = self._branch._client._medium
2783
3530
            medium._remember_remote_is_before((1, 14))
2784
3531
            return self._vfs_set_option(value, name, section)
2785
3532
        if response != ():
2786
3533
            raise errors.UnexpectedSmartServerResponse(response)
2787
3534
 
 
3535
    def _serialize_option_dict(self, option_dict):
 
3536
        utf8_dict = {}
 
3537
        for key, value in option_dict.items():
 
3538
            if isinstance(key, unicode):
 
3539
                key = key.encode('utf8')
 
3540
            if isinstance(value, unicode):
 
3541
                value = value.encode('utf8')
 
3542
            utf8_dict[key] = value
 
3543
        return bencode.bencode(utf8_dict)
 
3544
 
 
3545
    def _set_config_option_dict(self, value, name, section):
 
3546
        try:
 
3547
            path = self._branch._remote_path()
 
3548
            serialised_dict = self._serialize_option_dict(value)
 
3549
            response = self._branch._client.call(
 
3550
                'Branch.set_config_option_dict',
 
3551
                path, self._branch._lock_token, self._branch._repo_lock_token,
 
3552
                serialised_dict, name, section or '')
 
3553
        except errors.UnknownSmartMethod:
 
3554
            medium = self._branch._client._medium
 
3555
            medium._remember_remote_is_before((2, 2))
 
3556
            return self._vfs_set_option(value, name, section)
 
3557
        if response != ():
 
3558
            raise errors.UnexpectedSmartServerResponse(response)
 
3559
 
2788
3560
    def _real_object(self):
2789
3561
        self._branch._ensure_real()
2790
3562
        return self._branch._real_branch
2839
3611
        tar.extract(tarinfo, to_dir)
2840
3612
 
2841
3613
 
 
3614
error_translators = registry.Registry()
 
3615
no_context_error_translators = registry.Registry()
 
3616
 
 
3617
 
2842
3618
def _translate_error(err, **context):
2843
3619
    """Translate an ErrorFromSmartServer into a more useful error.
2844
3620
 
2873
3649
                    'Missing key %r in context %r', key_err.args[0], context)
2874
3650
                raise err
2875
3651
 
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':
2880
 
        raise NoSuchRevision(find('branch'), err.error_args[0])
2881
 
    elif err.error_verb == 'nosuchrevision':
2882
 
        raise NoSuchRevision(find('repository'), err.error_args[0])
2883
 
    elif err.error_verb == 'nobranch':
2884
 
        if len(err.error_args) >= 1:
2885
 
            extra = err.error_args[0]
2886
 
        else:
2887
 
            extra = None
2888
 
        raise errors.NotBranchError(path=find('bzrdir').root_transport.base,
2889
 
            detail=extra)
2890
 
    elif err.error_verb == 'norepository':
2891
 
        raise errors.NoRepositoryPresent(find('bzrdir'))
2892
 
    elif err.error_verb == 'LockContention':
2893
 
        raise errors.LockContention('(remote lock)')
2894
 
    elif err.error_verb == 'UnlockableTransport':
2895
 
        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
 
    elif err.error_verb == 'TokenMismatch':
2899
 
        raise errors.TokenMismatch(find('token'), '(remote token)')
2900
 
    elif err.error_verb == 'Diverged':
2901
 
        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
 
    elif err.error_verb == 'NotStacked':
2909
 
        raise errors.NotStacked(branch=find('branch'))
2910
 
    elif err.error_verb == 'PermissionDenied':
2911
 
        path = get_path()
2912
 
        if len(err.error_args) >= 2:
2913
 
            extra = err.error_args[1]
2914
 
        else:
2915
 
            extra = None
2916
 
        raise errors.PermissionDenied(path, extra=extra)
2917
 
    elif err.error_verb == 'ReadError':
2918
 
        path = get_path()
2919
 
        raise errors.ReadError(path)
2920
 
    elif err.error_verb == 'NoSuchFile':
2921
 
        path = get_path()
2922
 
        raise errors.NoSuchFile(path)
2923
 
    elif err.error_verb == 'FileExists':
2924
 
        raise errors.FileExists(err.error_args[0])
2925
 
    elif err.error_verb == 'DirectoryNotEmpty':
2926
 
        raise errors.DirectoryNotEmpty(err.error_args[0])
2927
 
    elif err.error_verb == 'ShortReadvError':
2928
 
        args = err.error_args
2929
 
        raise errors.ShortReadvError(
2930
 
            args[0], int(args[1]), int(args[2]), int(args[3]))
2931
 
    elif err.error_verb in ('UnicodeEncodeError', 'UnicodeDecodeError'):
 
3652
    try:
 
3653
        translator = error_translators.get(err.error_verb)
 
3654
    except KeyError:
 
3655
        pass
 
3656
    else:
 
3657
        raise translator(err, find, get_path)
 
3658
    try:
 
3659
        translator = no_context_error_translators.get(err.error_verb)
 
3660
    except KeyError:
 
3661
        raise errors.UnknownErrorFromSmartServer(err)
 
3662
    else:
 
3663
        raise translator(err)
 
3664
 
 
3665
 
 
3666
error_translators.register('NoSuchRevision',
 
3667
    lambda err, find, get_path: NoSuchRevision(
 
3668
        find('branch'), err.error_args[0]))
 
3669
error_translators.register('nosuchrevision',
 
3670
    lambda err, find, get_path: NoSuchRevision(
 
3671
        find('repository'), err.error_args[0]))
 
3672
 
 
3673
def _translate_nobranch_error(err, find, get_path):
 
3674
    if len(err.error_args) >= 1:
 
3675
        extra = err.error_args[0]
 
3676
    else:
 
3677
        extra = None
 
3678
    return errors.NotBranchError(path=find('bzrdir').root_transport.base,
 
3679
        detail=extra)
 
3680
 
 
3681
error_translators.register('nobranch', _translate_nobranch_error)
 
3682
error_translators.register('norepository',
 
3683
    lambda err, find, get_path: errors.NoRepositoryPresent(
 
3684
        find('bzrdir')))
 
3685
error_translators.register('UnlockableTransport',
 
3686
    lambda err, find, get_path: errors.UnlockableTransport(
 
3687
        find('bzrdir').root_transport))
 
3688
error_translators.register('TokenMismatch',
 
3689
    lambda err, find, get_path: errors.TokenMismatch(
 
3690
        find('token'), '(remote token)'))
 
3691
error_translators.register('Diverged',
 
3692
    lambda err, find, get_path: errors.DivergedBranches(
 
3693
        find('branch'), find('other_branch')))
 
3694
error_translators.register('NotStacked',
 
3695
    lambda err, find, get_path: errors.NotStacked(branch=find('branch')))
 
3696
 
 
3697
def _translate_PermissionDenied(err, find, get_path):
 
3698
    path = get_path()
 
3699
    if len(err.error_args) >= 2:
 
3700
        extra = err.error_args[1]
 
3701
    else:
 
3702
        extra = None
 
3703
    return errors.PermissionDenied(path, extra=extra)
 
3704
 
 
3705
error_translators.register('PermissionDenied', _translate_PermissionDenied)
 
3706
error_translators.register('ReadError',
 
3707
    lambda err, find, get_path: errors.ReadError(get_path()))
 
3708
error_translators.register('NoSuchFile',
 
3709
    lambda err, find, get_path: errors.NoSuchFile(get_path()))
 
3710
no_context_error_translators.register('IncompatibleRepositories',
 
3711
    lambda err: errors.IncompatibleRepositories(
 
3712
        err.error_args[0], err.error_args[1], err.error_args[2]))
 
3713
no_context_error_translators.register('LockContention',
 
3714
    lambda err: errors.LockContention('(remote lock)'))
 
3715
no_context_error_translators.register('LockFailed',
 
3716
    lambda err: errors.LockFailed(err.error_args[0], err.error_args[1]))
 
3717
no_context_error_translators.register('TipChangeRejected',
 
3718
    lambda err: errors.TipChangeRejected(err.error_args[0].decode('utf8')))
 
3719
no_context_error_translators.register('UnstackableBranchFormat',
 
3720
    lambda err: errors.UnstackableBranchFormat(*err.error_args))
 
3721
no_context_error_translators.register('UnstackableRepositoryFormat',
 
3722
    lambda err: errors.UnstackableRepositoryFormat(*err.error_args))
 
3723
no_context_error_translators.register('FileExists',
 
3724
    lambda err: errors.FileExists(err.error_args[0]))
 
3725
no_context_error_translators.register('DirectoryNotEmpty',
 
3726
    lambda err: errors.DirectoryNotEmpty(err.error_args[0]))
 
3727
 
 
3728
def _translate_short_readv_error(err):
 
3729
    args = err.error_args
 
3730
    return errors.ShortReadvError(args[0], int(args[1]), int(args[2]),
 
3731
        int(args[3]))
 
3732
 
 
3733
no_context_error_translators.register('ShortReadvError',
 
3734
    _translate_short_readv_error)
 
3735
 
 
3736
def _translate_unicode_error(err):
2932
3737
        encoding = str(err.error_args[0]) # encoding must always be a string
2933
3738
        val = err.error_args[1]
2934
3739
        start = int(err.error_args[2])
2942
3747
            raise UnicodeDecodeError(encoding, val, start, end, reason)
2943
3748
        elif err.error_verb == 'UnicodeEncodeError':
2944
3749
            raise UnicodeEncodeError(encoding, val, start, end, reason)
2945
 
    elif err.error_verb == 'ReadOnlyError':
2946
 
        raise errors.TransportNotPossible('readonly transport')
2947
 
    raise errors.UnknownErrorFromSmartServer(err)
 
3750
 
 
3751
no_context_error_translators.register('UnicodeEncodeError',
 
3752
    _translate_unicode_error)
 
3753
no_context_error_translators.register('UnicodeDecodeError',
 
3754
    _translate_unicode_error)
 
3755
no_context_error_translators.register('ReadOnlyError',
 
3756
    lambda err: errors.TransportNotPossible('readonly transport'))
 
3757
no_context_error_translators.register('MemoryError',
 
3758
    lambda err: errors.BzrError("remote server out of memory\n"
 
3759
        "Retry non-remotely, or contact the server admin for details."))
 
3760
 
 
3761
no_context_error_translators.register('BzrCheckError',
 
3762
    lambda err: errors.BzrCheckError(msg=err.error_args[0]))
 
3763
 
 
3764
error_translators.register('UnsuspendableWriteGroup',
 
3765
    lambda err, find, get_path: errors.UnsuspendableWriteGroup(
 
3766
        repository=find('repository')))
 
3767
error_translators.register('UnresumableWriteGroup',
 
3768
    lambda err, find, get_path: errors.UnresumableWriteGroup(
 
3769
        repository=find('repository'), write_groups=err.error_args[0],
 
3770
        reason=err.error_args[1]))