← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/remote.py

  • Committer: Martin Pool
  • Date: 2011-02-07 01:39:42 UTC
  • mto: This revision was merged to the branch mainline in revision 5650.
  • Revision ID: mbp@canonical.com-20110207013942-roj88kez6jir13tr
Add brief user documentation of command line splitting

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/remote.py
19
19
from bzrlib import (
20
20
    bencode,
21
21
    branch,
22
 
    bzrdir as _mod_bzrdir,
 
22
    bzrdir,
23
23
    config,
24
24
    controldir,
25
25
    debug,
27
27
    graph,
28
28
    lock,
29
29
    lockdir,
 
30
    repository,
30
31
    repository as _mod_repository,
 
32
    revision,
31
33
    revision as _mod_revision,
32
34
    static_tuple,
33
35
    symbol_versioning,
34
36
    urlutils,
35
37
)
36
38
from bzrlib.branch import BranchReferenceFormat, BranchWriteLockResult
 
39
from bzrlib.bzrdir import BzrDir, RemoteBzrDirFormat
37
40
from bzrlib.decorators import needs_read_lock, needs_write_lock, only_raises
38
41
from bzrlib.errors import (
39
42
    NoSuchRevision,
41
44
    )
42
45
from bzrlib.lockable_files import LockableFiles
43
46
from bzrlib.smart import client, vfs, repository as smart_repo
44
 
from bzrlib.smart.client import _SmartClient
45
 
from bzrlib.revision import NULL_REVISION
 
47
from bzrlib.revision import ensure_null, NULL_REVISION
46
48
from bzrlib.repository import RepositoryWriteLockResult
47
49
from bzrlib.trace import mutter, note, warning
48
50
 
87
89
    return format
88
90
 
89
91
 
90
 
# Note that RemoteBzrDirProber lives in bzrlib.bzrdir so bzrlib.remote
91
 
# does not have to be imported unless a remote format is involved.
92
 
 
93
 
class RemoteBzrDirFormat(_mod_bzrdir.BzrDirMetaFormat1):
94
 
    """Format representing bzrdirs accessed via a smart server"""
95
 
 
96
 
    supports_workingtrees = False
97
 
 
98
 
    def __init__(self):
99
 
        _mod_bzrdir.BzrDirMetaFormat1.__init__(self)
100
 
        # XXX: It's a bit ugly that the network name is here, because we'd
101
 
        # like to believe that format objects are stateless or at least
102
 
        # immutable,  However, we do at least avoid mutating the name after
103
 
        # it's returned.  See <https://bugs.launchpad.net/bzr/+bug/504102>
104
 
        self._network_name = None
105
 
 
106
 
    def __repr__(self):
107
 
        return "%s(_network_name=%r)" % (self.__class__.__name__,
108
 
            self._network_name)
109
 
 
110
 
    def get_format_description(self):
111
 
        if self._network_name:
112
 
            real_format = controldir.network_format_registry.get(self._network_name)
113
 
            return 'Remote: ' + real_format.get_format_description()
114
 
        return 'bzr remote bzrdir'
115
 
 
116
 
    def get_format_string(self):
117
 
        raise NotImplementedError(self.get_format_string)
118
 
 
119
 
    def network_name(self):
120
 
        if self._network_name:
121
 
            return self._network_name
122
 
        else:
123
 
            raise AssertionError("No network name set.")
124
 
 
125
 
    def initialize_on_transport(self, transport):
126
 
        try:
127
 
            # hand off the request to the smart server
128
 
            client_medium = transport.get_smart_medium()
129
 
        except errors.NoSmartMedium:
130
 
            # TODO: lookup the local format from a server hint.
131
 
            local_dir_format = _mod_bzrdir.BzrDirMetaFormat1()
132
 
            return local_dir_format.initialize_on_transport(transport)
133
 
        client = _SmartClient(client_medium)
134
 
        path = client.remote_path_from_transport(transport)
135
 
        try:
136
 
            response = client.call('BzrDirFormat.initialize', path)
137
 
        except errors.ErrorFromSmartServer, err:
138
 
            _translate_error(err, path=path)
139
 
        if response[0] != 'ok':
140
 
            raise errors.SmartProtocolError('unexpected response code %s' % (response,))
141
 
        format = RemoteBzrDirFormat()
142
 
        self._supply_sub_formats_to(format)
143
 
        return RemoteBzrDir(transport, format)
144
 
 
145
 
    def parse_NoneTrueFalse(self, arg):
146
 
        if not arg:
147
 
            return None
148
 
        if arg == 'False':
149
 
            return False
150
 
        if arg == 'True':
151
 
            return True
152
 
        raise AssertionError("invalid arg %r" % arg)
153
 
 
154
 
    def _serialize_NoneTrueFalse(self, arg):
155
 
        if arg is False:
156
 
            return 'False'
157
 
        if arg:
158
 
            return 'True'
159
 
        return ''
160
 
 
161
 
    def _serialize_NoneString(self, arg):
162
 
        return arg or ''
163
 
 
164
 
    def initialize_on_transport_ex(self, transport, use_existing_dir=False,
165
 
        create_prefix=False, force_new_repo=False, stacked_on=None,
166
 
        stack_on_pwd=None, repo_format_name=None, make_working_trees=None,
167
 
        shared_repo=False):
168
 
        try:
169
 
            # hand off the request to the smart server
170
 
            client_medium = transport.get_smart_medium()
171
 
        except errors.NoSmartMedium:
172
 
            do_vfs = True
173
 
        else:
174
 
            # Decline to open it if the server doesn't support our required
175
 
            # version (3) so that the VFS-based transport will do it.
176
 
            if client_medium.should_probe():
177
 
                try:
178
 
                    server_version = client_medium.protocol_version()
179
 
                    if server_version != '2':
180
 
                        do_vfs = True
181
 
                    else:
182
 
                        do_vfs = False
183
 
                except errors.SmartProtocolError:
184
 
                    # Apparently there's no usable smart server there, even though
185
 
                    # the medium supports the smart protocol.
186
 
                    do_vfs = True
187
 
            else:
188
 
                do_vfs = False
189
 
        if not do_vfs:
190
 
            client = _SmartClient(client_medium)
191
 
            path = client.remote_path_from_transport(transport)
192
 
            if client_medium._is_remote_before((1, 16)):
193
 
                do_vfs = True
194
 
        if do_vfs:
195
 
            # TODO: lookup the local format from a server hint.
196
 
            local_dir_format = _mod_bzrdir.BzrDirMetaFormat1()
197
 
            self._supply_sub_formats_to(local_dir_format)
198
 
            return local_dir_format.initialize_on_transport_ex(transport,
199
 
                use_existing_dir=use_existing_dir, create_prefix=create_prefix,
200
 
                force_new_repo=force_new_repo, stacked_on=stacked_on,
201
 
                stack_on_pwd=stack_on_pwd, repo_format_name=repo_format_name,
202
 
                make_working_trees=make_working_trees, shared_repo=shared_repo,
203
 
                vfs_only=True)
204
 
        return self._initialize_on_transport_ex_rpc(client, path, transport,
205
 
            use_existing_dir, create_prefix, force_new_repo, stacked_on,
206
 
            stack_on_pwd, repo_format_name, make_working_trees, shared_repo)
207
 
 
208
 
    def _initialize_on_transport_ex_rpc(self, client, path, transport,
209
 
        use_existing_dir, create_prefix, force_new_repo, stacked_on,
210
 
        stack_on_pwd, repo_format_name, make_working_trees, shared_repo):
211
 
        args = []
212
 
        args.append(self._serialize_NoneTrueFalse(use_existing_dir))
213
 
        args.append(self._serialize_NoneTrueFalse(create_prefix))
214
 
        args.append(self._serialize_NoneTrueFalse(force_new_repo))
215
 
        args.append(self._serialize_NoneString(stacked_on))
216
 
        # stack_on_pwd is often/usually our transport
217
 
        if stack_on_pwd:
218
 
            try:
219
 
                stack_on_pwd = transport.relpath(stack_on_pwd)
220
 
                if not stack_on_pwd:
221
 
                    stack_on_pwd = '.'
222
 
            except errors.PathNotChild:
223
 
                pass
224
 
        args.append(self._serialize_NoneString(stack_on_pwd))
225
 
        args.append(self._serialize_NoneString(repo_format_name))
226
 
        args.append(self._serialize_NoneTrueFalse(make_working_trees))
227
 
        args.append(self._serialize_NoneTrueFalse(shared_repo))
228
 
        request_network_name = self._network_name or \
229
 
            _mod_bzrdir.BzrDirFormat.get_default_format().network_name()
230
 
        try:
231
 
            response = client.call('BzrDirFormat.initialize_ex_1.16',
232
 
                request_network_name, path, *args)
233
 
        except errors.UnknownSmartMethod:
234
 
            client._medium._remember_remote_is_before((1,16))
235
 
            local_dir_format = _mod_bzrdir.BzrDirMetaFormat1()
236
 
            self._supply_sub_formats_to(local_dir_format)
237
 
            return local_dir_format.initialize_on_transport_ex(transport,
238
 
                use_existing_dir=use_existing_dir, create_prefix=create_prefix,
239
 
                force_new_repo=force_new_repo, stacked_on=stacked_on,
240
 
                stack_on_pwd=stack_on_pwd, repo_format_name=repo_format_name,
241
 
                make_working_trees=make_working_trees, shared_repo=shared_repo,
242
 
                vfs_only=True)
243
 
        except errors.ErrorFromSmartServer, err:
244
 
            _translate_error(err, path=path)
245
 
        repo_path = response[0]
246
 
        bzrdir_name = response[6]
247
 
        require_stacking = response[7]
248
 
        require_stacking = self.parse_NoneTrueFalse(require_stacking)
249
 
        format = RemoteBzrDirFormat()
250
 
        format._network_name = bzrdir_name
251
 
        self._supply_sub_formats_to(format)
252
 
        bzrdir = RemoteBzrDir(transport, format, _client=client)
253
 
        if repo_path:
254
 
            repo_format = response_tuple_to_repo_format(response[1:])
255
 
            if repo_path == '.':
256
 
                repo_path = ''
257
 
            if repo_path:
258
 
                repo_bzrdir_format = RemoteBzrDirFormat()
259
 
                repo_bzrdir_format._network_name = response[5]
260
 
                repo_bzr = RemoteBzrDir(transport.clone(repo_path),
261
 
                    repo_bzrdir_format)
262
 
            else:
263
 
                repo_bzr = bzrdir
264
 
            final_stack = response[8] or None
265
 
            final_stack_pwd = response[9] or None
266
 
            if final_stack_pwd:
267
 
                final_stack_pwd = urlutils.join(
268
 
                    transport.base, final_stack_pwd)
269
 
            remote_repo = RemoteRepository(repo_bzr, repo_format)
270
 
            if len(response) > 10:
271
 
                # Updated server verb that locks remotely.
272
 
                repo_lock_token = response[10] or None
273
 
                remote_repo.lock_write(repo_lock_token, _skip_rpc=True)
274
 
                if repo_lock_token:
275
 
                    remote_repo.dont_leave_lock_in_place()
276
 
            else:
277
 
                remote_repo.lock_write()
278
 
            policy = _mod_bzrdir.UseExistingRepository(remote_repo, final_stack,
279
 
                final_stack_pwd, require_stacking)
280
 
            policy.acquire_repository()
281
 
        else:
282
 
            remote_repo = None
283
 
            policy = None
284
 
        bzrdir._format.set_branch_format(self.get_branch_format())
285
 
        if require_stacking:
286
 
            # The repo has already been created, but we need to make sure that
287
 
            # we'll make a stackable branch.
288
 
            bzrdir._format.require_stacking(_skip_repo=True)
289
 
        return remote_repo, bzrdir, require_stacking, policy
290
 
 
291
 
    def _open(self, transport):
292
 
        return RemoteBzrDir(transport, self)
293
 
 
294
 
    def __eq__(self, other):
295
 
        if not isinstance(other, RemoteBzrDirFormat):
296
 
            return False
297
 
        return self.get_format_description() == other.get_format_description()
298
 
 
299
 
    def __return_repository_format(self):
300
 
        # Always return a RemoteRepositoryFormat object, but if a specific bzr
301
 
        # repository format has been asked for, tell the RemoteRepositoryFormat
302
 
        # that it should use that for init() etc.
303
 
        result = RemoteRepositoryFormat()
304
 
        custom_format = getattr(self, '_repository_format', None)
305
 
        if custom_format:
306
 
            if isinstance(custom_format, RemoteRepositoryFormat):
307
 
                return custom_format
308
 
            else:
309
 
                # We will use the custom format to create repositories over the
310
 
                # wire; expose its details like rich_root_data for code to
311
 
                # query
312
 
                result._custom_format = custom_format
313
 
        return result
314
 
 
315
 
    def get_branch_format(self):
316
 
        result = _mod_bzrdir.BzrDirMetaFormat1.get_branch_format(self)
317
 
        if not isinstance(result, RemoteBranchFormat):
318
 
            new_result = RemoteBranchFormat()
319
 
            new_result._custom_format = result
320
 
            # cache the result
321
 
            self.set_branch_format(new_result)
322
 
            result = new_result
323
 
        return result
324
 
 
325
 
    repository_format = property(__return_repository_format,
326
 
        _mod_bzrdir.BzrDirMetaFormat1._set_repository_format) #.im_func)
327
 
 
328
 
 
329
 
class RemoteBzrDir(_mod_bzrdir.BzrDir, _RpcHelper):
 
92
# Note: RemoteBzrDirFormat is in bzrdir.py
 
93
 
 
94
class RemoteBzrDir(BzrDir, _RpcHelper):
330
95
    """Control directory on a remote server, accessed via bzr:// or similar."""
331
96
 
332
97
    def __init__(self, transport, format, _client=None, _force_probe=False):
335
100
        :param _client: Private parameter for testing. Disables probing and the
336
101
            use of a real bzrdir.
337
102
        """
338
 
        _mod_bzrdir.BzrDir.__init__(self, transport, format)
 
103
        BzrDir.__init__(self, transport, format)
339
104
        # this object holds a delegated bzrdir that uses file-level operations
340
105
        # to talk to the other side
341
106
        self._real_bzrdir = None
401
166
                import traceback
402
167
                warning('VFS BzrDir access triggered\n%s',
403
168
                    ''.join(traceback.format_stack()))
404
 
            self._real_bzrdir = _mod_bzrdir.BzrDir.open_from_transport(
 
169
            self._real_bzrdir = BzrDir.open_from_transport(
405
170
                self.root_transport, _server_formats=False)
406
171
            self._format._network_name = \
407
172
                self._real_bzrdir._format.network_name()
413
178
        # Prevent aliasing problems in the next_open_branch_result cache.
414
179
        # See create_branch for rationale.
415
180
        self._next_open_branch_result = None
416
 
        return _mod_bzrdir.BzrDir.break_lock(self)
 
181
        return BzrDir.break_lock(self)
417
182
 
418
183
    def _vfs_cloning_metadir(self, require_stacking=False):
419
184
        self._ensure_real()
452
217
        branch_ref, branch_name = branch_info
453
218
        format = controldir.network_format_registry.get(control_name)
454
219
        if repo_name:
455
 
            format.repository_format = _mod_repository.network_format_registry.get(
 
220
            format.repository_format = repository.network_format_registry.get(
456
221
                repo_name)
457
222
        if branch_ref == 'ref':
458
223
            # XXX: we need possible_transports here to avoid reopening the
459
224
            # connection to the referenced location
460
 
            ref_bzrdir = _mod_bzrdir.BzrDir.open(branch_name)
 
225
            ref_bzrdir = BzrDir.open(branch_name)
461
226
            branch_format = ref_bzrdir.cloning_metadir().get_branch_format()
462
227
            format.set_branch_format(branch_format)
463
228
        elif branch_ref == 'branch':
686
451
        """Upgrading of remote bzrdirs is not supported yet."""
687
452
        return False
688
453
 
689
 
    def needs_format_conversion(self, format):
 
454
    def needs_format_conversion(self, format=None):
690
455
        """Upgrading of remote bzrdirs is not supported yet."""
 
456
        if format is None:
 
457
            symbol_versioning.warn(symbol_versioning.deprecated_in((1, 13, 0))
 
458
                % 'needs_format_conversion(format=None)')
691
459
        return False
692
460
 
693
461
    def clone(self, url, revision_id=None, force_new_repo=False,
700
468
        return RemoteBzrDirConfig(self)
701
469
 
702
470
 
703
 
class RemoteRepositoryFormat(_mod_repository.RepositoryFormat):
 
471
class RemoteRepositoryFormat(repository.RepositoryFormat):
704
472
    """Format for repositories accessed over a _SmartClient.
705
473
 
706
474
    Instances of this repository are represented by RemoteRepository
721
489
    """
722
490
 
723
491
    _matchingbzrdir = RemoteBzrDirFormat()
724
 
    supports_full_versioned_files = True
725
 
    supports_leaving_lock = True
726
492
 
727
493
    def __init__(self):
728
 
        _mod_repository.RepositoryFormat.__init__(self)
 
494
        repository.RepositoryFormat.__init__(self)
729
495
        self._custom_format = None
730
496
        self._network_name = None
731
497
        self._creating_bzrdir = None
732
 
        self._revision_graph_can_have_wrong_parents = None
733
498
        self._supports_chks = None
734
499
        self._supports_external_lookups = None
735
500
        self._supports_tree_reference = None
736
 
        self._supports_funky_characters = None
737
501
        self._rich_root_data = None
738
502
 
739
503
    def __repr__(self):
768
532
        return self._supports_external_lookups
769
533
 
770
534
    @property
771
 
    def supports_funky_characters(self):
772
 
        if self._supports_funky_characters is None:
773
 
            self._ensure_real()
774
 
            self._supports_funky_characters = \
775
 
                self._custom_format.supports_funky_characters
776
 
        return self._supports_funky_characters
777
 
 
778
 
    @property
779
535
    def supports_tree_reference(self):
780
536
        if self._supports_tree_reference is None:
781
537
            self._ensure_real()
783
539
                self._custom_format.supports_tree_reference
784
540
        return self._supports_tree_reference
785
541
 
786
 
    @property
787
 
    def revision_graph_can_have_wrong_parents(self):
788
 
        if self._revision_graph_can_have_wrong_parents is None:
789
 
            self._ensure_real()
790
 
            self._revision_graph_can_have_wrong_parents = \
791
 
                self._custom_format.revision_graph_can_have_wrong_parents
792
 
        return self._revision_graph_can_have_wrong_parents
793
 
 
794
542
    def _vfs_initialize(self, a_bzrdir, shared):
795
543
        """Helper for common code in initialize."""
796
544
        if self._custom_format:
831
579
            network_name = self._network_name
832
580
        else:
833
581
            # Select the current bzrlib default and ask for that.
834
 
            reference_bzrdir_format = _mod_bzrdir.format_registry.get('default')()
 
582
            reference_bzrdir_format = bzrdir.format_registry.get('default')()
835
583
            reference_format = reference_bzrdir_format.repository_format
836
584
            network_name = reference_format.network_name()
837
585
        # 2) try direct creation via RPC
863
611
 
864
612
    def _ensure_real(self):
865
613
        if self._custom_format is None:
866
 
            self._custom_format = _mod_repository.network_format_registry.get(
 
614
            self._custom_format = repository.network_format_registry.get(
867
615
                self._network_name)
868
616
 
869
617
    @property
965
713
        # transport, but I'm not sure it's worth making this method
966
714
        # optional -- mbp 2010-04-21
967
715
        return self.bzrdir.get_repository_transport(None)
968
 
 
 
716
        
969
717
    def __str__(self):
970
718
        return "%s(%s)" % (self.__class__.__name__, self.base)
971
719
 
1105
853
        """Private method for using with old (< 1.2) servers to fallback."""
1106
854
        if revision_id is None:
1107
855
            revision_id = ''
1108
 
        elif _mod_revision.is_null(revision_id):
 
856
        elif revision.is_null(revision_id):
1109
857
            return {}
1110
858
 
1111
859
        path = self.bzrdir._path_for_remote_call(self._client)
1192
940
        """See Repository.gather_stats()."""
1193
941
        path = self.bzrdir._path_for_remote_call(self._client)
1194
942
        # revid can be None to indicate no revisions, not just NULL_REVISION
1195
 
        if revid is None or _mod_revision.is_null(revid):
 
943
        if revid is None or revision.is_null(revid):
1196
944
            fmt_revid = ''
1197
945
        else:
1198
946
            fmt_revid = revid
1481
1229
 
1482
1230
    def get_commit_builder(self, branch, parents, config, timestamp=None,
1483
1231
                           timezone=None, committer=None, revprops=None,
1484
 
                           revision_id=None, lossy=False):
 
1232
                           revision_id=None):
1485
1233
        # FIXME: It ought to be possible to call this without immediately
1486
1234
        # triggering _ensure_real.  For now it's the easiest thing to do.
1487
1235
        self._ensure_real()
1488
1236
        real_repo = self._real_repository
1489
1237
        builder = real_repo.get_commit_builder(branch, parents,
1490
1238
                config, timestamp=timestamp, timezone=timezone,
1491
 
                committer=committer, revprops=revprops,
1492
 
                revision_id=revision_id, lossy=lossy)
 
1239
                committer=committer, revprops=revprops, revision_id=revision_id)
1493
1240
        return builder
1494
1241
 
1495
1242
    def add_fallback_repository(self, repository):
1613
1360
        if symbol_versioning.deprecated_passed(revision_id):
1614
1361
            symbol_versioning.warn(
1615
1362
                'search_missing_revision_ids(revision_id=...) was '
1616
 
                'deprecated in 2.4.  Use revision_ids=[...] instead.',
 
1363
                'deprecated in 2.3.  Use revision_ids=[...] instead.',
1617
1364
                DeprecationWarning, stacklevel=2)
1618
1365
            if revision_ids is not None:
1619
1366
                raise AssertionError(
1620
1367
                    'revision_ids is mutually exclusive with revision_id')
1621
1368
            if revision_id is not None:
1622
1369
                revision_ids = [revision_id]
1623
 
        inter_repo = _mod_repository.InterRepository.get(other, self)
 
1370
        inter_repo = repository.InterRepository.get(other, self)
1624
1371
        return inter_repo.search_missing_revision_ids(
1625
1372
            find_ghosts=find_ghosts, revision_ids=revision_ids,
1626
1373
            if_present_ids=if_present_ids)
1627
1374
 
1628
 
    def fetch(self, source, revision_id=None, find_ghosts=False,
 
1375
    def fetch(self, source, revision_id=None, pb=None, find_ghosts=False,
1629
1376
            fetch_spec=None):
1630
1377
        # No base implementation to use as RemoteRepository is not a subclass
1631
1378
        # of Repository; so this is a copy of Repository.fetch().
1642
1389
            # check that last_revision is in 'from' and then return a
1643
1390
            # no-operation.
1644
1391
            if (revision_id is not None and
1645
 
                not _mod_revision.is_null(revision_id)):
 
1392
                not revision.is_null(revision_id)):
1646
1393
                self.get_revision(revision_id)
1647
1394
            return 0, []
1648
1395
        # if there is no specific appropriate InterRepository, this will get
1649
1396
        # the InterRepository base class, which raises an
1650
1397
        # IncompatibleRepositories when asked to fetch.
1651
 
        inter = _mod_repository.InterRepository.get(source, self)
1652
 
        return inter.fetch(revision_id=revision_id,
 
1398
        inter = repository.InterRepository.get(source, self)
 
1399
        return inter.fetch(revision_id=revision_id, pb=pb,
1653
1400
            find_ghosts=find_ghosts, fetch_spec=fetch_spec)
1654
1401
 
1655
1402
    def create_bundle(self, target, base, fileobj, format=None):
1879
1626
            tmpdir = osutils.mkdtemp()
1880
1627
            try:
1881
1628
                _extract_tar(tar, tmpdir)
1882
 
                tmp_bzrdir = _mod_bzrdir.BzrDir.open(tmpdir)
 
1629
                tmp_bzrdir = BzrDir.open(tmpdir)
1883
1630
                tmp_repo = tmp_bzrdir.open_repository()
1884
1631
                tmp_repo.copy_content_into(destination, revision_id)
1885
1632
            finally:
1996
1743
        return self._real_repository.item_keys_introduced_by(revision_ids,
1997
1744
            _files_pb=_files_pb)
1998
1745
 
 
1746
    def revision_graph_can_have_wrong_parents(self):
 
1747
        # The answer depends on the remote repo format.
 
1748
        self._ensure_real()
 
1749
        return self._real_repository.revision_graph_can_have_wrong_parents()
 
1750
 
1999
1751
    def _find_inconsistent_revision_parents(self, revisions_iterator=None):
2000
1752
        self._ensure_real()
2001
1753
        return self._real_repository._find_inconsistent_revision_parents(
2041
1793
            raise errors.UnexpectedSmartServerResponse(response)
2042
1794
 
2043
1795
 
2044
 
class RemoteStreamSink(_mod_repository.StreamSink):
 
1796
class RemoteStreamSink(repository.StreamSink):
2045
1797
 
2046
1798
    def _insert_real(self, stream, src_format, resume_tokens):
2047
1799
        self.target_repo._ensure_real()
2148
1900
        self._last_substream and self._last_stream so that the stream can be
2149
1901
        resumed by _resume_stream_with_vfs.
2150
1902
        """
2151
 
 
 
1903
                    
2152
1904
        stream_iter = iter(stream)
2153
1905
        for substream_kind, substream in stream_iter:
2154
1906
            if substream_kind == 'inventory-deltas':
2157
1909
                return
2158
1910
            else:
2159
1911
                yield substream_kind, substream
2160
 
 
2161
 
 
2162
 
class RemoteStreamSource(_mod_repository.StreamSource):
 
1912
            
 
1913
 
 
1914
class RemoteStreamSource(repository.StreamSource):
2163
1915
    """Stream data from a remote server."""
2164
1916
 
2165
1917
    def get_stream(self, search):
2239
1991
                if isinstance(search, graph.EverythingResult):
2240
1992
                    error_verb = e.error_from_smart_server.error_verb
2241
1993
                    if error_verb == 'BadSearch':
2242
 
                        # Pre-2.4 servers don't support this sort of search.
 
1994
                        # Pre-2.3 servers don't support this sort of search.
2243
1995
                        # XXX: perhaps falling back to VFS on BadSearch is a
2244
1996
                        # good idea in general?  It might provide a little bit
2245
1997
                        # of protection against client-side bugs.
2246
 
                        medium._remember_remote_is_before((2, 4))
 
1998
                        medium._remember_remote_is_before((2, 3))
2247
1999
                        break
2248
2000
                raise
2249
2001
            else:
2372
2124
            network_name = self._custom_format.network_name()
2373
2125
        else:
2374
2126
            # Select the current bzrlib default and ask for that.
2375
 
            reference_bzrdir_format = _mod_bzrdir.format_registry.get('default')()
 
2127
            reference_bzrdir_format = bzrdir.format_registry.get('default')()
2376
2128
            reference_format = reference_bzrdir_format.get_branch_format()
2377
2129
            self._custom_format = reference_format
2378
2130
            network_name = reference_format.network_name()
2402
2154
        repo_format = response_tuple_to_repo_format(response[3:])
2403
2155
        repo_path = response[2]
2404
2156
        if repository is not None:
2405
 
            remote_repo_url = urlutils.join(a_bzrdir.user_url, repo_path)
 
2157
            remote_repo_url = urlutils.join(medium.base, repo_path)
2406
2158
            url_diff = urlutils.relative_url(repository.user_url,
2407
2159
                    remote_repo_url)
2408
2160
            if url_diff != '.':
2409
2161
                raise AssertionError(
2410
2162
                    'repository.user_url %r does not match URL from server '
2411
2163
                    'response (%r + %r)'
2412
 
                    % (repository.user_url, a_bzrdir.user_url, repo_path))
 
2164
                    % (repository.user_url, medium.base, repo_path))
2413
2165
            remote_repo = repository
2414
2166
        else:
2415
2167
            if repo_path == '':
2445
2197
        self._ensure_real()
2446
2198
        return self._custom_format.supports_set_append_revisions_only()
2447
2199
 
2448
 
    def _use_default_local_heads_to_fetch(self):
2449
 
        # If the branch format is a metadir format *and* its heads_to_fetch
2450
 
        # implementation is not overridden vs the base class, we can use the
2451
 
        # base class logic rather than use the heads_to_fetch RPC.  This is
2452
 
        # usually cheaper in terms of net round trips, as the last-revision and
2453
 
        # tags info fetched is cached and would be fetched anyway.
2454
 
        self._ensure_real()
2455
 
        if isinstance(self._custom_format, branch.BranchFormatMetadir):
2456
 
            branch_class = self._custom_format._branch_class()
2457
 
            heads_to_fetch_impl = branch_class.heads_to_fetch.im_func
2458
 
            if heads_to_fetch_impl is branch.Branch.heads_to_fetch.im_func:
2459
 
                return True
2460
 
        return False
2461
2200
 
2462
2201
class RemoteBranch(branch.Branch, _RpcHelper, lock._RelockDebugMixin):
2463
2202
    """Branch stored on a server accessed by HPSS RPC.
2662
2401
            self._is_stacked = False
2663
2402
        else:
2664
2403
            self._is_stacked = True
2665
 
 
 
2404
        
2666
2405
    def _vfs_get_tags_bytes(self):
2667
2406
        self._ensure_real()
2668
2407
        return self._real_branch._get_tags_bytes()
2919
2658
            raise errors.UnexpectedSmartServerResponse(response)
2920
2659
        self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2921
2660
 
2922
 
    @symbol_versioning.deprecated_method(symbol_versioning.deprecated_in((2, 4, 0)))
2923
2661
    @needs_write_lock
2924
2662
    def set_revision_history(self, rev_history):
2925
 
        """See Branch.set_revision_history."""
2926
 
        self._set_revision_history(rev_history)
2927
 
 
2928
 
    @needs_write_lock
2929
 
    def _set_revision_history(self, rev_history):
2930
2663
        # Send just the tip revision of the history; the server will generate
2931
2664
        # the full history from that.  If the revision doesn't exist in this
2932
2665
        # branch, NoSuchRevision will be raised.
3009
2742
        # XXX: These should be returned by the set_last_revision_info verb
3010
2743
        old_revno, old_revid = self.last_revision_info()
3011
2744
        self._run_pre_change_branch_tip_hooks(revno, revision_id)
3012
 
        if not revision_id or not isinstance(revision_id, basestring):
3013
 
            raise errors.InvalidRevisionId(revision_id=revision_id, branch=self)
 
2745
        revision_id = ensure_null(revision_id)
3014
2746
        try:
3015
2747
            response = self._call('Branch.set_last_revision_info',
3016
2748
                self._remote_path(), self._lock_token, self._repo_lock_token,
3045
2777
            except errors.UnknownSmartMethod:
3046
2778
                medium._remember_remote_is_before((1, 6))
3047
2779
        self._clear_cached_state_of_remote_branch_only()
3048
 
        self._set_revision_history(self._lefthand_history(revision_id,
 
2780
        self.set_revision_history(self._lefthand_history(revision_id,
3049
2781
            last_rev=last_rev,other_branch=other_branch))
3050
2782
 
3051
2783
    def set_push_location(self, location):
3052
2784
        self._ensure_real()
3053
2785
        return self._real_branch.set_push_location(location)
3054
2786
 
3055
 
    def heads_to_fetch(self):
3056
 
        if self._format._use_default_local_heads_to_fetch():
3057
 
            # We recognise this format, and its heads-to-fetch implementation
3058
 
            # is the default one (tip + tags).  In this case it's cheaper to
3059
 
            # just use the default implementation rather than a special RPC as
3060
 
            # the tip and tags data is cached.
3061
 
            return branch.Branch.heads_to_fetch(self)
3062
 
        medium = self._client._medium
3063
 
        if medium._is_remote_before((2, 4)):
3064
 
            return self._vfs_heads_to_fetch()
3065
 
        try:
3066
 
            return self._rpc_heads_to_fetch()
3067
 
        except errors.UnknownSmartMethod:
3068
 
            medium._remember_remote_is_before((2, 4))
3069
 
            return self._vfs_heads_to_fetch()
3070
 
 
3071
 
    def _rpc_heads_to_fetch(self):
3072
 
        response = self._call('Branch.heads_to_fetch', self._remote_path())
3073
 
        if len(response) != 2:
3074
 
            raise errors.UnexpectedSmartServerResponse(response)
3075
 
        must_fetch, if_present_fetch = response
3076
 
        return set(must_fetch), set(if_present_fetch)
3077
 
 
3078
 
    def _vfs_heads_to_fetch(self):
3079
 
        self._ensure_real()
3080
 
        return self._real_branch.heads_to_fetch()
3081
 
 
3082
2787
 
3083
2788
class RemoteConfig(object):
3084
2789
    """A Config that reads and writes from smart verbs.
3271
2976
                    'Missing key %r in context %r', key_err.args[0], context)
3272
2977
                raise err
3273
2978
 
3274
 
    if err.error_verb == 'NoSuchRevision':
 
2979
    if err.error_verb == 'IncompatibleRepositories':
 
2980
        raise errors.IncompatibleRepositories(err.error_args[0],
 
2981
            err.error_args[1], err.error_args[2])
 
2982
    elif err.error_verb == 'NoSuchRevision':
3275
2983
        raise NoSuchRevision(find('branch'), err.error_args[0])
3276
2984
    elif err.error_verb == 'nosuchrevision':
3277
2985
        raise NoSuchRevision(find('repository'), err.error_args[0])
3284
2992
            detail=extra)
3285
2993
    elif err.error_verb == 'norepository':
3286
2994
        raise errors.NoRepositoryPresent(find('bzrdir'))
 
2995
    elif err.error_verb == 'LockContention':
 
2996
        raise errors.LockContention('(remote lock)')
3287
2997
    elif err.error_verb == 'UnlockableTransport':
3288
2998
        raise errors.UnlockableTransport(find('bzrdir').root_transport)
 
2999
    elif err.error_verb == 'LockFailed':
 
3000
        raise errors.LockFailed(err.error_args[0], err.error_args[1])
3289
3001
    elif err.error_verb == 'TokenMismatch':
3290
3002
        raise errors.TokenMismatch(find('token'), '(remote token)')
3291
3003
    elif err.error_verb == 'Diverged':
3292
3004
        raise errors.DivergedBranches(find('branch'), find('other_branch'))
 
3005
    elif err.error_verb == 'TipChangeRejected':
 
3006
        raise errors.TipChangeRejected(err.error_args[0].decode('utf8'))
 
3007
    elif err.error_verb == 'UnstackableBranchFormat':
 
3008
        raise errors.UnstackableBranchFormat(*err.error_args)
 
3009
    elif err.error_verb == 'UnstackableRepositoryFormat':
 
3010
        raise errors.UnstackableRepositoryFormat(*err.error_args)
3293
3011
    elif err.error_verb == 'NotStacked':
3294
3012
        raise errors.NotStacked(branch=find('branch'))
3295
3013
    elif err.error_verb == 'PermissionDenied':
3305
3023
    elif err.error_verb == 'NoSuchFile':
3306
3024
        path = get_path()
3307
3025
        raise errors.NoSuchFile(path)
3308
 
    _translate_error_without_context(err)
3309
 
 
3310
 
 
3311
 
def _translate_error_without_context(err):
3312
 
    """Translate any ErrorFromSmartServer values that don't require context"""
3313
 
    if err.error_verb == 'IncompatibleRepositories':
3314
 
        raise errors.IncompatibleRepositories(err.error_args[0],
3315
 
            err.error_args[1], err.error_args[2])
3316
 
    elif err.error_verb == 'LockContention':
3317
 
        raise errors.LockContention('(remote lock)')
3318
 
    elif err.error_verb == 'LockFailed':
3319
 
        raise errors.LockFailed(err.error_args[0], err.error_args[1])
3320
 
    elif err.error_verb == 'TipChangeRejected':
3321
 
        raise errors.TipChangeRejected(err.error_args[0].decode('utf8'))
3322
 
    elif err.error_verb == 'UnstackableBranchFormat':
3323
 
        raise errors.UnstackableBranchFormat(*err.error_args)
3324
 
    elif err.error_verb == 'UnstackableRepositoryFormat':
3325
 
        raise errors.UnstackableRepositoryFormat(*err.error_args)
3326
3026
    elif err.error_verb == 'FileExists':
3327
3027
        raise errors.FileExists(err.error_args[0])
3328
3028
    elif err.error_verb == 'DirectoryNotEmpty':
3347
3047
            raise UnicodeEncodeError(encoding, val, start, end, reason)
3348
3048
    elif err.error_verb == 'ReadOnlyError':
3349
3049
        raise errors.TransportNotPossible('readonly transport')
3350
 
    elif err.error_verb == 'MemoryError':
3351
 
        raise errors.BzrError("remote server out of memory\n"
3352
 
            "Retry non-remotely, or contact the server admin for details.")
3353
3050
    raise errors.UnknownErrorFromSmartServer(err)