← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/remote.py

  • Committer: John Arbash Meinel
  • Date: 2011-01-12 21:27:00 UTC
  • mto: This revision was merged to the branch mainline in revision 5605.
  • Revision ID: john@arbash-meinel.com-20110112212700-esqmtrmevddxrsq2
Clean up the test slightly, hoping to avoid race conditions, update NEWS

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
 
    vf_repository,
36
 
    )
 
37
)
37
38
from bzrlib.branch import BranchReferenceFormat, BranchWriteLockResult
 
39
from bzrlib.bzrdir import BzrDir, RemoteBzrDirFormat
38
40
from bzrlib.decorators import needs_read_lock, needs_write_lock, only_raises
39
41
from bzrlib.errors import (
40
42
    NoSuchRevision,
42
44
    )
43
45
from bzrlib.lockable_files import LockableFiles
44
46
from bzrlib.smart import client, vfs, repository as smart_repo
45
 
from bzrlib.smart.client import _SmartClient
46
 
from bzrlib.revision import NULL_REVISION
47
 
from bzrlib.repository import RepositoryWriteLockResult, _LazyListJoin
 
47
from bzrlib.revision import ensure_null, NULL_REVISION
 
48
from bzrlib.repository import RepositoryWriteLockResult
48
49
from bzrlib.trace import mutter, note, warning
49
50
 
50
51
 
88
89
    return format
89
90
 
90
91
 
91
 
# Note that RemoteBzrDirProber lives in bzrlib.bzrdir so bzrlib.remote
92
 
# does not have to be imported unless a remote format is involved.
93
 
 
94
 
class RemoteBzrDirFormat(_mod_bzrdir.BzrDirMetaFormat1):
95
 
    """Format representing bzrdirs accessed via a smart server"""
96
 
 
97
 
    supports_workingtrees = False
98
 
 
99
 
    def __init__(self):
100
 
        _mod_bzrdir.BzrDirMetaFormat1.__init__(self)
101
 
        # XXX: It's a bit ugly that the network name is here, because we'd
102
 
        # like to believe that format objects are stateless or at least
103
 
        # immutable,  However, we do at least avoid mutating the name after
104
 
        # it's returned.  See <https://bugs.launchpad.net/bzr/+bug/504102>
105
 
        self._network_name = None
106
 
 
107
 
    def __repr__(self):
108
 
        return "%s(_network_name=%r)" % (self.__class__.__name__,
109
 
            self._network_name)
110
 
 
111
 
    def get_format_description(self):
112
 
        if self._network_name:
113
 
            real_format = controldir.network_format_registry.get(self._network_name)
114
 
            return 'Remote: ' + real_format.get_format_description()
115
 
        return 'bzr remote bzrdir'
116
 
 
117
 
    def get_format_string(self):
118
 
        raise NotImplementedError(self.get_format_string)
119
 
 
120
 
    def network_name(self):
121
 
        if self._network_name:
122
 
            return self._network_name
123
 
        else:
124
 
            raise AssertionError("No network name set.")
125
 
 
126
 
    def initialize_on_transport(self, transport):
127
 
        try:
128
 
            # hand off the request to the smart server
129
 
            client_medium = transport.get_smart_medium()
130
 
        except errors.NoSmartMedium:
131
 
            # TODO: lookup the local format from a server hint.
132
 
            local_dir_format = _mod_bzrdir.BzrDirMetaFormat1()
133
 
            return local_dir_format.initialize_on_transport(transport)
134
 
        client = _SmartClient(client_medium)
135
 
        path = client.remote_path_from_transport(transport)
136
 
        try:
137
 
            response = client.call('BzrDirFormat.initialize', path)
138
 
        except errors.ErrorFromSmartServer, err:
139
 
            _translate_error(err, path=path)
140
 
        if response[0] != 'ok':
141
 
            raise errors.SmartProtocolError('unexpected response code %s' % (response,))
142
 
        format = RemoteBzrDirFormat()
143
 
        self._supply_sub_formats_to(format)
144
 
        return RemoteBzrDir(transport, format)
145
 
 
146
 
    def parse_NoneTrueFalse(self, arg):
147
 
        if not arg:
148
 
            return None
149
 
        if arg == 'False':
150
 
            return False
151
 
        if arg == 'True':
152
 
            return True
153
 
        raise AssertionError("invalid arg %r" % arg)
154
 
 
155
 
    def _serialize_NoneTrueFalse(self, arg):
156
 
        if arg is False:
157
 
            return 'False'
158
 
        if arg:
159
 
            return 'True'
160
 
        return ''
161
 
 
162
 
    def _serialize_NoneString(self, arg):
163
 
        return arg or ''
164
 
 
165
 
    def initialize_on_transport_ex(self, transport, use_existing_dir=False,
166
 
        create_prefix=False, force_new_repo=False, stacked_on=None,
167
 
        stack_on_pwd=None, repo_format_name=None, make_working_trees=None,
168
 
        shared_repo=False):
169
 
        try:
170
 
            # hand off the request to the smart server
171
 
            client_medium = transport.get_smart_medium()
172
 
        except errors.NoSmartMedium:
173
 
            do_vfs = True
174
 
        else:
175
 
            # Decline to open it if the server doesn't support our required
176
 
            # version (3) so that the VFS-based transport will do it.
177
 
            if client_medium.should_probe():
178
 
                try:
179
 
                    server_version = client_medium.protocol_version()
180
 
                    if server_version != '2':
181
 
                        do_vfs = True
182
 
                    else:
183
 
                        do_vfs = False
184
 
                except errors.SmartProtocolError:
185
 
                    # Apparently there's no usable smart server there, even though
186
 
                    # the medium supports the smart protocol.
187
 
                    do_vfs = True
188
 
            else:
189
 
                do_vfs = False
190
 
        if not do_vfs:
191
 
            client = _SmartClient(client_medium)
192
 
            path = client.remote_path_from_transport(transport)
193
 
            if client_medium._is_remote_before((1, 16)):
194
 
                do_vfs = True
195
 
        if do_vfs:
196
 
            # TODO: lookup the local format from a server hint.
197
 
            local_dir_format = _mod_bzrdir.BzrDirMetaFormat1()
198
 
            self._supply_sub_formats_to(local_dir_format)
199
 
            return local_dir_format.initialize_on_transport_ex(transport,
200
 
                use_existing_dir=use_existing_dir, create_prefix=create_prefix,
201
 
                force_new_repo=force_new_repo, stacked_on=stacked_on,
202
 
                stack_on_pwd=stack_on_pwd, repo_format_name=repo_format_name,
203
 
                make_working_trees=make_working_trees, shared_repo=shared_repo,
204
 
                vfs_only=True)
205
 
        return self._initialize_on_transport_ex_rpc(client, path, transport,
206
 
            use_existing_dir, create_prefix, force_new_repo, stacked_on,
207
 
            stack_on_pwd, repo_format_name, make_working_trees, shared_repo)
208
 
 
209
 
    def _initialize_on_transport_ex_rpc(self, client, path, transport,
210
 
        use_existing_dir, create_prefix, force_new_repo, stacked_on,
211
 
        stack_on_pwd, repo_format_name, make_working_trees, shared_repo):
212
 
        args = []
213
 
        args.append(self._serialize_NoneTrueFalse(use_existing_dir))
214
 
        args.append(self._serialize_NoneTrueFalse(create_prefix))
215
 
        args.append(self._serialize_NoneTrueFalse(force_new_repo))
216
 
        args.append(self._serialize_NoneString(stacked_on))
217
 
        # stack_on_pwd is often/usually our transport
218
 
        if stack_on_pwd:
219
 
            try:
220
 
                stack_on_pwd = transport.relpath(stack_on_pwd)
221
 
                if not stack_on_pwd:
222
 
                    stack_on_pwd = '.'
223
 
            except errors.PathNotChild:
224
 
                pass
225
 
        args.append(self._serialize_NoneString(stack_on_pwd))
226
 
        args.append(self._serialize_NoneString(repo_format_name))
227
 
        args.append(self._serialize_NoneTrueFalse(make_working_trees))
228
 
        args.append(self._serialize_NoneTrueFalse(shared_repo))
229
 
        request_network_name = self._network_name or \
230
 
            _mod_bzrdir.BzrDirFormat.get_default_format().network_name()
231
 
        try:
232
 
            response = client.call('BzrDirFormat.initialize_ex_1.16',
233
 
                request_network_name, path, *args)
234
 
        except errors.UnknownSmartMethod:
235
 
            client._medium._remember_remote_is_before((1,16))
236
 
            local_dir_format = _mod_bzrdir.BzrDirMetaFormat1()
237
 
            self._supply_sub_formats_to(local_dir_format)
238
 
            return local_dir_format.initialize_on_transport_ex(transport,
239
 
                use_existing_dir=use_existing_dir, create_prefix=create_prefix,
240
 
                force_new_repo=force_new_repo, stacked_on=stacked_on,
241
 
                stack_on_pwd=stack_on_pwd, repo_format_name=repo_format_name,
242
 
                make_working_trees=make_working_trees, shared_repo=shared_repo,
243
 
                vfs_only=True)
244
 
        except errors.ErrorFromSmartServer, err:
245
 
            _translate_error(err, path=path)
246
 
        repo_path = response[0]
247
 
        bzrdir_name = response[6]
248
 
        require_stacking = response[7]
249
 
        require_stacking = self.parse_NoneTrueFalse(require_stacking)
250
 
        format = RemoteBzrDirFormat()
251
 
        format._network_name = bzrdir_name
252
 
        self._supply_sub_formats_to(format)
253
 
        bzrdir = RemoteBzrDir(transport, format, _client=client)
254
 
        if repo_path:
255
 
            repo_format = response_tuple_to_repo_format(response[1:])
256
 
            if repo_path == '.':
257
 
                repo_path = ''
258
 
            if repo_path:
259
 
                repo_bzrdir_format = RemoteBzrDirFormat()
260
 
                repo_bzrdir_format._network_name = response[5]
261
 
                repo_bzr = RemoteBzrDir(transport.clone(repo_path),
262
 
                    repo_bzrdir_format)
263
 
            else:
264
 
                repo_bzr = bzrdir
265
 
            final_stack = response[8] or None
266
 
            final_stack_pwd = response[9] or None
267
 
            if final_stack_pwd:
268
 
                final_stack_pwd = urlutils.join(
269
 
                    transport.base, final_stack_pwd)
270
 
            remote_repo = RemoteRepository(repo_bzr, repo_format)
271
 
            if len(response) > 10:
272
 
                # Updated server verb that locks remotely.
273
 
                repo_lock_token = response[10] or None
274
 
                remote_repo.lock_write(repo_lock_token, _skip_rpc=True)
275
 
                if repo_lock_token:
276
 
                    remote_repo.dont_leave_lock_in_place()
277
 
            else:
278
 
                remote_repo.lock_write()
279
 
            policy = _mod_bzrdir.UseExistingRepository(remote_repo, final_stack,
280
 
                final_stack_pwd, require_stacking)
281
 
            policy.acquire_repository()
282
 
        else:
283
 
            remote_repo = None
284
 
            policy = None
285
 
        bzrdir._format.set_branch_format(self.get_branch_format())
286
 
        if require_stacking:
287
 
            # The repo has already been created, but we need to make sure that
288
 
            # we'll make a stackable branch.
289
 
            bzrdir._format.require_stacking(_skip_repo=True)
290
 
        return remote_repo, bzrdir, require_stacking, policy
291
 
 
292
 
    def _open(self, transport):
293
 
        return RemoteBzrDir(transport, self)
294
 
 
295
 
    def __eq__(self, other):
296
 
        if not isinstance(other, RemoteBzrDirFormat):
297
 
            return False
298
 
        return self.get_format_description() == other.get_format_description()
299
 
 
300
 
    def __return_repository_format(self):
301
 
        # Always return a RemoteRepositoryFormat object, but if a specific bzr
302
 
        # repository format has been asked for, tell the RemoteRepositoryFormat
303
 
        # that it should use that for init() etc.
304
 
        result = RemoteRepositoryFormat()
305
 
        custom_format = getattr(self, '_repository_format', None)
306
 
        if custom_format:
307
 
            if isinstance(custom_format, RemoteRepositoryFormat):
308
 
                return custom_format
309
 
            else:
310
 
                # We will use the custom format to create repositories over the
311
 
                # wire; expose its details like rich_root_data for code to
312
 
                # query
313
 
                result._custom_format = custom_format
314
 
        return result
315
 
 
316
 
    def get_branch_format(self):
317
 
        result = _mod_bzrdir.BzrDirMetaFormat1.get_branch_format(self)
318
 
        if not isinstance(result, RemoteBranchFormat):
319
 
            new_result = RemoteBranchFormat()
320
 
            new_result._custom_format = result
321
 
            # cache the result
322
 
            self.set_branch_format(new_result)
323
 
            result = new_result
324
 
        return result
325
 
 
326
 
    repository_format = property(__return_repository_format,
327
 
        _mod_bzrdir.BzrDirMetaFormat1._set_repository_format) #.im_func)
328
 
 
329
 
 
330
 
class RemoteBzrDir(_mod_bzrdir.BzrDir, _RpcHelper):
 
92
# Note: RemoteBzrDirFormat is in bzrdir.py
 
93
 
 
94
class RemoteBzrDir(BzrDir, _RpcHelper):
331
95
    """Control directory on a remote server, accessed via bzr:// or similar."""
332
96
 
333
97
    def __init__(self, transport, format, _client=None, _force_probe=False):
336
100
        :param _client: Private parameter for testing. Disables probing and the
337
101
            use of a real bzrdir.
338
102
        """
339
 
        _mod_bzrdir.BzrDir.__init__(self, transport, format)
 
103
        BzrDir.__init__(self, transport, format)
340
104
        # this object holds a delegated bzrdir that uses file-level operations
341
105
        # to talk to the other side
342
106
        self._real_bzrdir = None
402
166
                import traceback
403
167
                warning('VFS BzrDir access triggered\n%s',
404
168
                    ''.join(traceback.format_stack()))
405
 
            self._real_bzrdir = _mod_bzrdir.BzrDir.open_from_transport(
 
169
            self._real_bzrdir = BzrDir.open_from_transport(
406
170
                self.root_transport, _server_formats=False)
407
171
            self._format._network_name = \
408
172
                self._real_bzrdir._format.network_name()
414
178
        # Prevent aliasing problems in the next_open_branch_result cache.
415
179
        # See create_branch for rationale.
416
180
        self._next_open_branch_result = None
417
 
        return _mod_bzrdir.BzrDir.break_lock(self)
 
181
        return BzrDir.break_lock(self)
418
182
 
419
183
    def _vfs_cloning_metadir(self, require_stacking=False):
420
184
        self._ensure_real()
453
217
        branch_ref, branch_name = branch_info
454
218
        format = controldir.network_format_registry.get(control_name)
455
219
        if repo_name:
456
 
            format.repository_format = _mod_repository.network_format_registry.get(
 
220
            format.repository_format = repository.network_format_registry.get(
457
221
                repo_name)
458
222
        if branch_ref == 'ref':
459
223
            # XXX: we need possible_transports here to avoid reopening the
460
224
            # connection to the referenced location
461
 
            ref_bzrdir = _mod_bzrdir.BzrDir.open(branch_name)
 
225
            ref_bzrdir = BzrDir.open(branch_name)
462
226
            branch_format = ref_bzrdir.cloning_metadir().get_branch_format()
463
227
            format.set_branch_format(branch_format)
464
228
        elif branch_ref == 'branch':
687
451
        """Upgrading of remote bzrdirs is not supported yet."""
688
452
        return False
689
453
 
690
 
    def needs_format_conversion(self, format):
 
454
    def needs_format_conversion(self, format=None):
691
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)')
692
459
        return False
693
460
 
694
461
    def clone(self, url, revision_id=None, force_new_repo=False,
701
468
        return RemoteBzrDirConfig(self)
702
469
 
703
470
 
704
 
class RemoteRepositoryFormat(vf_repository.VersionedFileRepositoryFormat):
 
471
class RemoteRepositoryFormat(repository.RepositoryFormat):
705
472
    """Format for repositories accessed over a _SmartClient.
706
473
 
707
474
    Instances of this repository are represented by RemoteRepository
722
489
    """
723
490
 
724
491
    _matchingbzrdir = RemoteBzrDirFormat()
725
 
    supports_full_versioned_files = True
726
 
    supports_leaving_lock = True
727
492
 
728
493
    def __init__(self):
729
 
        _mod_repository.RepositoryFormat.__init__(self)
 
494
        repository.RepositoryFormat.__init__(self)
730
495
        self._custom_format = None
731
496
        self._network_name = None
732
497
        self._creating_bzrdir = None
733
 
        self._revision_graph_can_have_wrong_parents = None
734
498
        self._supports_chks = None
735
499
        self._supports_external_lookups = None
736
500
        self._supports_tree_reference = None
737
 
        self._supports_funky_characters = None
738
501
        self._rich_root_data = None
739
502
 
740
503
    def __repr__(self):
769
532
        return self._supports_external_lookups
770
533
 
771
534
    @property
772
 
    def supports_funky_characters(self):
773
 
        if self._supports_funky_characters is None:
774
 
            self._ensure_real()
775
 
            self._supports_funky_characters = \
776
 
                self._custom_format.supports_funky_characters
777
 
        return self._supports_funky_characters
778
 
 
779
 
    @property
780
535
    def supports_tree_reference(self):
781
536
        if self._supports_tree_reference is None:
782
537
            self._ensure_real()
784
539
                self._custom_format.supports_tree_reference
785
540
        return self._supports_tree_reference
786
541
 
787
 
    @property
788
 
    def revision_graph_can_have_wrong_parents(self):
789
 
        if self._revision_graph_can_have_wrong_parents is None:
790
 
            self._ensure_real()
791
 
            self._revision_graph_can_have_wrong_parents = \
792
 
                self._custom_format.revision_graph_can_have_wrong_parents
793
 
        return self._revision_graph_can_have_wrong_parents
794
 
 
795
542
    def _vfs_initialize(self, a_bzrdir, shared):
796
543
        """Helper for common code in initialize."""
797
544
        if self._custom_format:
832
579
            network_name = self._network_name
833
580
        else:
834
581
            # Select the current bzrlib default and ask for that.
835
 
            reference_bzrdir_format = _mod_bzrdir.format_registry.get('default')()
 
582
            reference_bzrdir_format = bzrdir.format_registry.get('default')()
836
583
            reference_format = reference_bzrdir_format.repository_format
837
584
            network_name = reference_format.network_name()
838
585
        # 2) try direct creation via RPC
864
611
 
865
612
    def _ensure_real(self):
866
613
        if self._custom_format is None:
867
 
            self._custom_format = _mod_repository.network_format_registry.get(
 
614
            self._custom_format = repository.network_format_registry.get(
868
615
                self._network_name)
869
616
 
870
617
    @property
966
713
        # transport, but I'm not sure it's worth making this method
967
714
        # optional -- mbp 2010-04-21
968
715
        return self.bzrdir.get_repository_transport(None)
969
 
 
 
716
        
970
717
    def __str__(self):
971
718
        return "%s(%s)" % (self.__class__.__name__, self.base)
972
719
 
1080
827
    def find_text_key_references(self):
1081
828
        """Find the text key references within the repository.
1082
829
 
 
830
        :return: a dictionary mapping (file_id, revision_id) tuples to altered file-ids to an iterable of
 
831
        revision_ids. Each altered file-ids has the exact revision_ids that
 
832
        altered it listed explicitly.
1083
833
        :return: A dictionary mapping text keys ((fileid, revision_id) tuples)
1084
834
            to whether they were referred to by the inventory of the
1085
835
            revision_id that they contain. The inventory texts from all present
1103
853
        """Private method for using with old (< 1.2) servers to fallback."""
1104
854
        if revision_id is None:
1105
855
            revision_id = ''
1106
 
        elif _mod_revision.is_null(revision_id):
 
856
        elif revision.is_null(revision_id):
1107
857
            return {}
1108
858
 
1109
859
        path = self.bzrdir._path_for_remote_call(self._client)
1133
883
        return RemoteStreamSource(self, to_format)
1134
884
 
1135
885
    @needs_read_lock
1136
 
    def get_file_graph(self):
1137
 
        return graph.Graph(self.texts)
1138
 
 
1139
 
    @needs_read_lock
1140
886
    def has_revision(self, revision_id):
1141
887
        """True if this repository has a copy of the revision."""
1142
888
        # Copy of bzrlib.repository.Repository.has_revision
1194
940
        """See Repository.gather_stats()."""
1195
941
        path = self.bzrdir._path_for_remote_call(self._client)
1196
942
        # revid can be None to indicate no revisions, not just NULL_REVISION
1197
 
        if revid is None or _mod_revision.is_null(revid):
 
943
        if revid is None or revision.is_null(revid):
1198
944
            fmt_revid = ''
1199
945
        else:
1200
946
            fmt_revid = revid
1483
1229
 
1484
1230
    def get_commit_builder(self, branch, parents, config, timestamp=None,
1485
1231
                           timezone=None, committer=None, revprops=None,
1486
 
                           revision_id=None, lossy=False):
 
1232
                           revision_id=None):
1487
1233
        # FIXME: It ought to be possible to call this without immediately
1488
1234
        # triggering _ensure_real.  For now it's the easiest thing to do.
1489
1235
        self._ensure_real()
1490
1236
        real_repo = self._real_repository
1491
1237
        builder = real_repo.get_commit_builder(branch, parents,
1492
1238
                config, timestamp=timestamp, timezone=timezone,
1493
 
                committer=committer, revprops=revprops,
1494
 
                revision_id=revision_id, lossy=lossy)
 
1239
                committer=committer, revprops=revprops, revision_id=revision_id)
1495
1240
        return builder
1496
1241
 
1497
1242
    def add_fallback_repository(self, repository):
1603
1348
        return result
1604
1349
 
1605
1350
    @needs_read_lock
1606
 
    def search_missing_revision_ids(self, other,
1607
 
            revision_id=symbol_versioning.DEPRECATED_PARAMETER,
1608
 
            find_ghosts=True, revision_ids=None, if_present_ids=None,
1609
 
            limit=None):
 
1351
    def search_missing_revision_ids(self, other, revision_id=None, find_ghosts=True):
1610
1352
        """Return the revision ids that other has that this does not.
1611
1353
 
1612
1354
        These are returned in topological order.
1613
1355
 
1614
1356
        revision_id: only return revision ids included by revision_id.
1615
1357
        """
1616
 
        if symbol_versioning.deprecated_passed(revision_id):
1617
 
            symbol_versioning.warn(
1618
 
                'search_missing_revision_ids(revision_id=...) was '
1619
 
                'deprecated in 2.4.  Use revision_ids=[...] instead.',
1620
 
                DeprecationWarning, stacklevel=2)
1621
 
            if revision_ids is not None:
1622
 
                raise AssertionError(
1623
 
                    'revision_ids is mutually exclusive with revision_id')
1624
 
            if revision_id is not None:
1625
 
                revision_ids = [revision_id]
1626
 
        inter_repo = _mod_repository.InterRepository.get(other, self)
1627
 
        return inter_repo.search_missing_revision_ids(
1628
 
            find_ghosts=find_ghosts, revision_ids=revision_ids,
1629
 
            if_present_ids=if_present_ids, limit=limit)
 
1358
        return repository.InterRepository.get(
 
1359
            other, self).search_missing_revision_ids(revision_id, find_ghosts)
1630
1360
 
1631
 
    def fetch(self, source, revision_id=None, find_ghosts=False,
 
1361
    def fetch(self, source, revision_id=None, pb=None, find_ghosts=False,
1632
1362
            fetch_spec=None):
1633
1363
        # No base implementation to use as RemoteRepository is not a subclass
1634
1364
        # of Repository; so this is a copy of Repository.fetch().
1645
1375
            # check that last_revision is in 'from' and then return a
1646
1376
            # no-operation.
1647
1377
            if (revision_id is not None and
1648
 
                not _mod_revision.is_null(revision_id)):
 
1378
                not revision.is_null(revision_id)):
1649
1379
                self.get_revision(revision_id)
1650
1380
            return 0, []
1651
1381
        # if there is no specific appropriate InterRepository, this will get
1652
1382
        # the InterRepository base class, which raises an
1653
1383
        # IncompatibleRepositories when asked to fetch.
1654
 
        inter = _mod_repository.InterRepository.get(source, self)
1655
 
        return inter.fetch(revision_id=revision_id,
 
1384
        inter = repository.InterRepository.get(source, self)
 
1385
        return inter.fetch(revision_id=revision_id, pb=pb,
1656
1386
            find_ghosts=find_ghosts, fetch_spec=fetch_spec)
1657
1387
 
1658
1388
    def create_bundle(self, target, base, fileobj, format=None):
1660
1390
        self._real_repository.create_bundle(target, base, fileobj, format)
1661
1391
 
1662
1392
    @needs_read_lock
1663
 
    @symbol_versioning.deprecated_method(
1664
 
        symbol_versioning.deprecated_in((2, 4, 0)))
1665
1393
    def get_ancestry(self, revision_id, topo_sorted=True):
1666
1394
        self._ensure_real()
1667
1395
        return self._real_repository.get_ancestry(revision_id, topo_sorted)
1884
1612
            tmpdir = osutils.mkdtemp()
1885
1613
            try:
1886
1614
                _extract_tar(tar, tmpdir)
1887
 
                tmp_bzrdir = _mod_bzrdir.BzrDir.open(tmpdir)
 
1615
                tmp_bzrdir = BzrDir.open(tmpdir)
1888
1616
                tmp_repo = tmp_bzrdir.open_repository()
1889
1617
                tmp_repo.copy_content_into(destination, revision_id)
1890
1618
            finally:
1975
1703
    def supports_rich_root(self):
1976
1704
        return self._format.rich_root_data
1977
1705
 
1978
 
    @symbol_versioning.deprecated_method(symbol_versioning.deprecated_in((2, 4, 0)))
1979
1706
    def iter_reverse_revision_history(self, revision_id):
1980
1707
        self._ensure_real()
1981
1708
        return self._real_repository.iter_reverse_revision_history(revision_id)
2002
1729
        return self._real_repository.item_keys_introduced_by(revision_ids,
2003
1730
            _files_pb=_files_pb)
2004
1731
 
 
1732
    def revision_graph_can_have_wrong_parents(self):
 
1733
        # The answer depends on the remote repo format.
 
1734
        self._ensure_real()
 
1735
        return self._real_repository.revision_graph_can_have_wrong_parents()
 
1736
 
2005
1737
    def _find_inconsistent_revision_parents(self, revisions_iterator=None):
2006
1738
        self._ensure_real()
2007
1739
        return self._real_repository._find_inconsistent_revision_parents(
2015
1747
        providers = [self._unstacked_provider]
2016
1748
        if other is not None:
2017
1749
            providers.insert(0, other)
2018
 
        return graph.StackedParentsProvider(_LazyListJoin(
2019
 
            providers, self._fallback_repositories))
 
1750
        providers.extend(r._make_parents_provider() for r in
 
1751
                         self._fallback_repositories)
 
1752
        return graph.StackedParentsProvider(providers)
2020
1753
 
2021
1754
    def _serialise_search_recipe(self, recipe):
2022
1755
        """Serialise a graph search recipe.
2030
1763
        return '\n'.join((start_keys, stop_keys, count))
2031
1764
 
2032
1765
    def _serialise_search_result(self, search_result):
2033
 
        parts = search_result.get_network_struct()
 
1766
        if isinstance(search_result, graph.PendingAncestryResult):
 
1767
            parts = ['ancestry-of']
 
1768
            parts.extend(search_result.heads)
 
1769
        else:
 
1770
            recipe = search_result.get_recipe()
 
1771
            parts = [recipe[0], self._serialise_search_recipe(recipe)]
2034
1772
        return '\n'.join(parts)
2035
1773
 
2036
1774
    def autopack(self):
2046
1784
            raise errors.UnexpectedSmartServerResponse(response)
2047
1785
 
2048
1786
 
2049
 
class RemoteStreamSink(vf_repository.StreamSink):
 
1787
class RemoteStreamSink(repository.StreamSink):
2050
1788
 
2051
1789
    def _insert_real(self, stream, src_format, resume_tokens):
2052
1790
        self.target_repo._ensure_real()
2153
1891
        self._last_substream and self._last_stream so that the stream can be
2154
1892
        resumed by _resume_stream_with_vfs.
2155
1893
        """
2156
 
 
 
1894
                    
2157
1895
        stream_iter = iter(stream)
2158
1896
        for substream_kind, substream in stream_iter:
2159
1897
            if substream_kind == 'inventory-deltas':
2162
1900
                return
2163
1901
            else:
2164
1902
                yield substream_kind, substream
2165
 
 
2166
 
 
2167
 
class RemoteStreamSource(vf_repository.StreamSource):
 
1903
            
 
1904
 
 
1905
class RemoteStreamSource(repository.StreamSource):
2168
1906
    """Stream data from a remote server."""
2169
1907
 
2170
1908
    def get_stream(self, search):
2230
1968
        candidate_verbs = [
2231
1969
            ('Repository.get_stream_1.19', (1, 19)),
2232
1970
            ('Repository.get_stream', (1, 13))]
2233
 
 
2234
1971
        found_verb = False
2235
1972
        for verb, version in candidate_verbs:
2236
1973
            if medium._is_remote_before(version):
2240
1977
                    verb, args, search_bytes)
2241
1978
            except errors.UnknownSmartMethod:
2242
1979
                medium._remember_remote_is_before(version)
2243
 
            except errors.UnknownErrorFromSmartServer, e:
2244
 
                if isinstance(search, graph.EverythingResult):
2245
 
                    error_verb = e.error_from_smart_server.error_verb
2246
 
                    if error_verb == 'BadSearch':
2247
 
                        # Pre-2.4 servers don't support this sort of search.
2248
 
                        # XXX: perhaps falling back to VFS on BadSearch is a
2249
 
                        # good idea in general?  It might provide a little bit
2250
 
                        # of protection against client-side bugs.
2251
 
                        medium._remember_remote_is_before((2, 4))
2252
 
                        break
2253
 
                raise
2254
1980
            else:
2255
1981
                response_tuple, response_handler = response
2256
1982
                found_verb = True
2377
2103
            network_name = self._custom_format.network_name()
2378
2104
        else:
2379
2105
            # Select the current bzrlib default and ask for that.
2380
 
            reference_bzrdir_format = _mod_bzrdir.format_registry.get('default')()
 
2106
            reference_bzrdir_format = bzrdir.format_registry.get('default')()
2381
2107
            reference_format = reference_bzrdir_format.get_branch_format()
2382
2108
            self._custom_format = reference_format
2383
2109
            network_name = reference_format.network_name()
2407
2133
        repo_format = response_tuple_to_repo_format(response[3:])
2408
2134
        repo_path = response[2]
2409
2135
        if repository is not None:
2410
 
            remote_repo_url = urlutils.join(a_bzrdir.user_url, repo_path)
 
2136
            remote_repo_url = urlutils.join(medium.base, repo_path)
2411
2137
            url_diff = urlutils.relative_url(repository.user_url,
2412
2138
                    remote_repo_url)
2413
2139
            if url_diff != '.':
2414
2140
                raise AssertionError(
2415
2141
                    'repository.user_url %r does not match URL from server '
2416
2142
                    'response (%r + %r)'
2417
 
                    % (repository.user_url, a_bzrdir.user_url, repo_path))
 
2143
                    % (repository.user_url, medium.base, repo_path))
2418
2144
            remote_repo = repository
2419
2145
        else:
2420
2146
            if repo_path == '':
2450
2176
        self._ensure_real()
2451
2177
        return self._custom_format.supports_set_append_revisions_only()
2452
2178
 
2453
 
    def _use_default_local_heads_to_fetch(self):
2454
 
        # If the branch format is a metadir format *and* its heads_to_fetch
2455
 
        # implementation is not overridden vs the base class, we can use the
2456
 
        # base class logic rather than use the heads_to_fetch RPC.  This is
2457
 
        # usually cheaper in terms of net round trips, as the last-revision and
2458
 
        # tags info fetched is cached and would be fetched anyway.
2459
 
        self._ensure_real()
2460
 
        if isinstance(self._custom_format, branch.BranchFormatMetadir):
2461
 
            branch_class = self._custom_format._branch_class()
2462
 
            heads_to_fetch_impl = branch_class.heads_to_fetch.im_func
2463
 
            if heads_to_fetch_impl is branch.Branch.heads_to_fetch.im_func:
2464
 
                return True
2465
 
        return False
2466
2179
 
2467
2180
class RemoteBranch(branch.Branch, _RpcHelper, lock._RelockDebugMixin):
2468
2181
    """Branch stored on a server accessed by HPSS RPC.
2667
2380
            self._is_stacked = False
2668
2381
        else:
2669
2382
            self._is_stacked = True
2670
 
 
 
2383
        
2671
2384
    def _vfs_get_tags_bytes(self):
2672
2385
        self._ensure_real()
2673
2386
        return self._real_branch._get_tags_bytes()
2855
2568
            missing_parent = parent_map[missing_parent]
2856
2569
        raise errors.RevisionNotPresent(missing_parent, self.repository)
2857
2570
 
2858
 
    def _read_last_revision_info(self):
 
2571
    def _last_revision_info(self):
2859
2572
        response = self._call('Branch.last_revision_info', self._remote_path())
2860
2573
        if response[0] != 'ok':
2861
2574
            raise SmartProtocolError('unexpected response code %s' % (response,))
2924
2637
            raise errors.UnexpectedSmartServerResponse(response)
2925
2638
        self._run_post_change_branch_tip_hooks(old_revno, old_revid)
2926
2639
 
2927
 
    @symbol_versioning.deprecated_method(symbol_versioning.deprecated_in((2, 4, 0)))
2928
2640
    @needs_write_lock
2929
2641
    def set_revision_history(self, rev_history):
2930
 
        """See Branch.set_revision_history."""
2931
 
        self._set_revision_history(rev_history)
2932
 
 
2933
 
    @needs_write_lock
2934
 
    def _set_revision_history(self, rev_history):
2935
2642
        # Send just the tip revision of the history; the server will generate
2936
2643
        # the full history from that.  If the revision doesn't exist in this
2937
2644
        # branch, NoSuchRevision will be raised.
2995
2702
            _override_hook_target=self, **kwargs)
2996
2703
 
2997
2704
    @needs_read_lock
2998
 
    def push(self, target, overwrite=False, stop_revision=None, lossy=False):
 
2705
    def push(self, target, overwrite=False, stop_revision=None):
2999
2706
        self._ensure_real()
3000
2707
        return self._real_branch.push(
3001
 
            target, overwrite=overwrite, stop_revision=stop_revision, lossy=lossy,
 
2708
            target, overwrite=overwrite, stop_revision=stop_revision,
3002
2709
            _override_hook_source_branch=self)
3003
2710
 
3004
2711
    def is_locked(self):
3014
2721
        # XXX: These should be returned by the set_last_revision_info verb
3015
2722
        old_revno, old_revid = self.last_revision_info()
3016
2723
        self._run_pre_change_branch_tip_hooks(revno, revision_id)
3017
 
        if not revision_id or not isinstance(revision_id, basestring):
3018
 
            raise errors.InvalidRevisionId(revision_id=revision_id, branch=self)
 
2724
        revision_id = ensure_null(revision_id)
3019
2725
        try:
3020
2726
            response = self._call('Branch.set_last_revision_info',
3021
2727
                self._remote_path(), self._lock_token, self._repo_lock_token,
3050
2756
            except errors.UnknownSmartMethod:
3051
2757
                medium._remember_remote_is_before((1, 6))
3052
2758
        self._clear_cached_state_of_remote_branch_only()
3053
 
        self._set_revision_history(self._lefthand_history(revision_id,
 
2759
        self.set_revision_history(self._lefthand_history(revision_id,
3054
2760
            last_rev=last_rev,other_branch=other_branch))
3055
2761
 
3056
2762
    def set_push_location(self, location):
3057
2763
        self._ensure_real()
3058
2764
        return self._real_branch.set_push_location(location)
3059
2765
 
3060
 
    def heads_to_fetch(self):
3061
 
        if self._format._use_default_local_heads_to_fetch():
3062
 
            # We recognise this format, and its heads-to-fetch implementation
3063
 
            # is the default one (tip + tags).  In this case it's cheaper to
3064
 
            # just use the default implementation rather than a special RPC as
3065
 
            # the tip and tags data is cached.
3066
 
            return branch.Branch.heads_to_fetch(self)
3067
 
        medium = self._client._medium
3068
 
        if medium._is_remote_before((2, 4)):
3069
 
            return self._vfs_heads_to_fetch()
3070
 
        try:
3071
 
            return self._rpc_heads_to_fetch()
3072
 
        except errors.UnknownSmartMethod:
3073
 
            medium._remember_remote_is_before((2, 4))
3074
 
            return self._vfs_heads_to_fetch()
3075
 
 
3076
 
    def _rpc_heads_to_fetch(self):
3077
 
        response = self._call('Branch.heads_to_fetch', self._remote_path())
3078
 
        if len(response) != 2:
3079
 
            raise errors.UnexpectedSmartServerResponse(response)
3080
 
        must_fetch, if_present_fetch = response
3081
 
        return set(must_fetch), set(if_present_fetch)
3082
 
 
3083
 
    def _vfs_heads_to_fetch(self):
3084
 
        self._ensure_real()
3085
 
        return self._real_branch.heads_to_fetch()
3086
 
 
3087
2766
 
3088
2767
class RemoteConfig(object):
3089
2768
    """A Config that reads and writes from smart verbs.
3103
2782
        """
3104
2783
        try:
3105
2784
            configobj = self._get_configobj()
3106
 
            section_obj = None
3107
2785
            if section is None:
3108
2786
                section_obj = configobj
3109
2787
            else:
3110
2788
                try:
3111
2789
                    section_obj = configobj[section]
3112
2790
                except KeyError:
3113
 
                    pass
3114
 
            if section_obj is None:
3115
 
                value = default
3116
 
            else:
3117
 
                value = section_obj.get(name, default)
 
2791
                    return default
 
2792
            return section_obj.get(name, default)
3118
2793
        except errors.UnknownSmartMethod:
3119
 
            value = self._vfs_get_option(name, section, default)
3120
 
        for hook in config.OldConfigHooks['get']:
3121
 
            hook(self, name, value)
3122
 
        return value
 
2794
            return self._vfs_get_option(name, section, default)
3123
2795
 
3124
2796
    def _response_to_configobj(self, response):
3125
2797
        if len(response[0]) and response[0][0] != 'ok':
3126
2798
            raise errors.UnexpectedSmartServerResponse(response)
3127
2799
        lines = response[1].read_body_bytes().splitlines()
3128
 
        conf = config.ConfigObj(lines, encoding='utf-8')
3129
 
        for hook in config.OldConfigHooks['load']:
3130
 
            hook(self)
3131
 
        return conf
 
2800
        return config.ConfigObj(lines, encoding='utf-8')
3132
2801
 
3133
2802
 
3134
2803
class RemoteBranchConfig(RemoteConfig):
3286
2955
                    'Missing key %r in context %r', key_err.args[0], context)
3287
2956
                raise err
3288
2957
 
3289
 
    if err.error_verb == 'NoSuchRevision':
 
2958
    if err.error_verb == 'IncompatibleRepositories':
 
2959
        raise errors.IncompatibleRepositories(err.error_args[0],
 
2960
            err.error_args[1], err.error_args[2])
 
2961
    elif err.error_verb == 'NoSuchRevision':
3290
2962
        raise NoSuchRevision(find('branch'), err.error_args[0])
3291
2963
    elif err.error_verb == 'nosuchrevision':
3292
2964
        raise NoSuchRevision(find('repository'), err.error_args[0])
3299
2971
            detail=extra)
3300
2972
    elif err.error_verb == 'norepository':
3301
2973
        raise errors.NoRepositoryPresent(find('bzrdir'))
 
2974
    elif err.error_verb == 'LockContention':
 
2975
        raise errors.LockContention('(remote lock)')
3302
2976
    elif err.error_verb == 'UnlockableTransport':
3303
2977
        raise errors.UnlockableTransport(find('bzrdir').root_transport)
 
2978
    elif err.error_verb == 'LockFailed':
 
2979
        raise errors.LockFailed(err.error_args[0], err.error_args[1])
3304
2980
    elif err.error_verb == 'TokenMismatch':
3305
2981
        raise errors.TokenMismatch(find('token'), '(remote token)')
3306
2982
    elif err.error_verb == 'Diverged':
3307
2983
        raise errors.DivergedBranches(find('branch'), find('other_branch'))
 
2984
    elif err.error_verb == 'TipChangeRejected':
 
2985
        raise errors.TipChangeRejected(err.error_args[0].decode('utf8'))
 
2986
    elif err.error_verb == 'UnstackableBranchFormat':
 
2987
        raise errors.UnstackableBranchFormat(*err.error_args)
 
2988
    elif err.error_verb == 'UnstackableRepositoryFormat':
 
2989
        raise errors.UnstackableRepositoryFormat(*err.error_args)
3308
2990
    elif err.error_verb == 'NotStacked':
3309
2991
        raise errors.NotStacked(branch=find('branch'))
3310
2992
    elif err.error_verb == 'PermissionDenied':
3320
3002
    elif err.error_verb == 'NoSuchFile':
3321
3003
        path = get_path()
3322
3004
        raise errors.NoSuchFile(path)
3323
 
    _translate_error_without_context(err)
3324
 
 
3325
 
 
3326
 
def _translate_error_without_context(err):
3327
 
    """Translate any ErrorFromSmartServer values that don't require context"""
3328
 
    if err.error_verb == 'IncompatibleRepositories':
3329
 
        raise errors.IncompatibleRepositories(err.error_args[0],
3330
 
            err.error_args[1], err.error_args[2])
3331
 
    elif err.error_verb == 'LockContention':
3332
 
        raise errors.LockContention('(remote lock)')
3333
 
    elif err.error_verb == 'LockFailed':
3334
 
        raise errors.LockFailed(err.error_args[0], err.error_args[1])
3335
 
    elif err.error_verb == 'TipChangeRejected':
3336
 
        raise errors.TipChangeRejected(err.error_args[0].decode('utf8'))
3337
 
    elif err.error_verb == 'UnstackableBranchFormat':
3338
 
        raise errors.UnstackableBranchFormat(*err.error_args)
3339
 
    elif err.error_verb == 'UnstackableRepositoryFormat':
3340
 
        raise errors.UnstackableRepositoryFormat(*err.error_args)
3341
3005
    elif err.error_verb == 'FileExists':
3342
3006
        raise errors.FileExists(err.error_args[0])
3343
3007
    elif err.error_verb == 'DirectoryNotEmpty':
3362
3026
            raise UnicodeEncodeError(encoding, val, start, end, reason)
3363
3027
    elif err.error_verb == 'ReadOnlyError':
3364
3028
        raise errors.TransportNotPossible('readonly transport')
3365
 
    elif err.error_verb == 'MemoryError':
3366
 
        raise errors.BzrError("remote server out of memory\n"
3367
 
            "Retry non-remotely, or contact the server admin for details.")
3368
3029
    raise errors.UnknownErrorFromSmartServer(err)