/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: Jared Bunting
  • Date: 2010-10-21 22:27:43 UTC
  • mto: This revision was merged to the branch mainline in revision 5514.
  • Revision ID: jared.bunting@peachjean.com-20101021222743-tn9n0cgzg3z8cb25
Changed _win32_local_path_from_url to not allow "file:///C:" form.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/remote.py
21
21
    branch,
22
22
    bzrdir,
23
23
    config,
 
24
    controldir,
24
25
    debug,
25
26
    errors,
26
27
    graph,
33
34
    static_tuple,
34
35
    symbol_versioning,
35
36
)
36
 
from bzrlib.branch import BranchReferenceFormat
 
37
from bzrlib.branch import BranchReferenceFormat, BranchWriteLockResult
37
38
from bzrlib.bzrdir import BzrDir, RemoteBzrDirFormat
38
39
from bzrlib.decorators import needs_read_lock, needs_write_lock, only_raises
39
40
from bzrlib.errors import (
43
44
from bzrlib.lockable_files import LockableFiles
44
45
from bzrlib.smart import client, vfs, repository as smart_repo
45
46
from bzrlib.revision import ensure_null, NULL_REVISION
 
47
from bzrlib.repository import RepositoryWriteLockResult
46
48
from bzrlib.trace import mutter, note, warning
47
49
 
48
50
 
212
214
        if len(branch_info) != 2:
213
215
            raise errors.UnexpectedSmartServerResponse(response)
214
216
        branch_ref, branch_name = branch_info
215
 
        format = bzrdir.network_format_registry.get(control_name)
 
217
        format = controldir.network_format_registry.get(control_name)
216
218
        if repo_name:
217
219
            format.repository_format = repository.network_format_registry.get(
218
220
                repo_name)
269
271
        self._real_bzrdir.destroy_branch(name=name)
270
272
        self._next_open_branch_result = None
271
273
 
272
 
    def create_workingtree(self, revision_id=None, from_branch=None):
 
274
    def create_workingtree(self, revision_id=None, from_branch=None,
 
275
        accelerator_tree=None, hardlink=False):
273
276
        raise errors.NotLocalUrl(self.transport.base)
274
277
 
275
 
    def find_branch_format(self):
 
278
    def find_branch_format(self, name=None):
276
279
        """Find the branch 'format' for this bzrdir.
277
280
 
278
281
        This might be a synthetic object for e.g. RemoteBranch and SVN.
279
282
        """
280
 
        b = self.open_branch()
 
283
        b = self.open_branch(name=name)
281
284
        return b._format
282
285
 
283
 
    def get_branch_reference(self):
 
286
    def get_branch_reference(self, name=None):
284
287
        """See BzrDir.get_branch_reference()."""
 
288
        if name is not None:
 
289
            # XXX JRV20100304: Support opening colocated branches
 
290
            raise errors.NoColocatedBranchSupport(self)
285
291
        response = self._get_branch_reference()
286
292
        if response[0] == 'ref':
287
293
            return response[1]
318
324
            raise errors.UnexpectedSmartServerResponse(response)
319
325
        return response
320
326
 
321
 
    def _get_tree_branch(self):
 
327
    def _get_tree_branch(self, name=None):
322
328
        """See BzrDir._get_tree_branch()."""
323
 
        return None, self.open_branch()
 
329
        return None, self.open_branch(name=name)
324
330
 
325
331
    def open_branch(self, name=None, unsupported=False,
326
332
                    ignore_fallbacks=False):
644
650
 
645
651
 
646
652
class RemoteRepository(_RpcHelper, lock._RelockDebugMixin,
647
 
    bzrdir.ControlComponent):
 
653
    controldir.ControlComponent):
648
654
    """Repository accessed over rpc.
649
655
 
650
656
    For the moment most operations are performed using local transport-backed
895
901
    def _has_same_fallbacks(self, other_repo):
896
902
        """Returns true if the repositories have the same fallbacks."""
897
903
        # XXX: copied from Repository; it should be unified into a base class
898
 
        # <https://bugs.edge.launchpad.net/bzr/+bug/401622>
 
904
        # <https://bugs.launchpad.net/bzr/+bug/401622>
899
905
        my_fb = self._fallback_repositories
900
906
        other_fb = other_repo._fallback_repositories
901
907
        if len(my_fb) != len(other_fb):
997
1003
        pass
998
1004
 
999
1005
    def lock_read(self):
 
1006
        """Lock the repository for read operations.
 
1007
 
 
1008
        :return: A bzrlib.lock.LogicalLockResult.
 
1009
        """
1000
1010
        # wrong eventually - want a local lock cache context
1001
1011
        if not self._lock_mode:
1002
1012
            self._note_lock('r')
1009
1019
                repo.lock_read()
1010
1020
        else:
1011
1021
            self._lock_count += 1
 
1022
        return lock.LogicalLockResult(self.unlock)
1012
1023
 
1013
1024
    def _remote_lock_write(self, token):
1014
1025
        path = self.bzrdir._path_for_remote_call(self._client)
1054
1065
            raise errors.ReadOnlyError(self)
1055
1066
        else:
1056
1067
            self._lock_count += 1
1057
 
        return self._lock_token or None
 
1068
        return RepositoryWriteLockResult(self.unlock, self._lock_token or None)
1058
1069
 
1059
1070
    def leave_lock_in_place(self):
1060
1071
        if not self._lock_token:
1306
1317
        return self._real_repository.make_working_trees()
1307
1318
 
1308
1319
    def refresh_data(self):
1309
 
        """Re-read any data needed to to synchronise with disk.
 
1320
        """Re-read any data needed to synchronise with disk.
1310
1321
 
1311
1322
        This method is intended to be called after another repository instance
1312
1323
        (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.
 
1324
        repository. On all repositories this will work outside of write groups.
 
1325
        Some repository formats (pack and newer for bzrlib native formats)
 
1326
        support refresh_data inside write groups. If called inside a write
 
1327
        group on a repository that does not support refreshing in a write group
 
1328
        IsInWriteGroupError will be raised.
1315
1329
        """
1316
 
        if self.is_in_write_group():
1317
 
            raise errors.InternalBzrError(
1318
 
                "May not refresh_data while in a write group.")
1319
1330
        if self._real_repository is not None:
1320
1331
            self._real_repository.refresh_data()
1321
1332
 
1971
1982
        if response_tuple[0] != 'ok':
1972
1983
            raise errors.UnexpectedSmartServerResponse(response_tuple)
1973
1984
        byte_stream = response_handler.read_streamed_body()
1974
 
        src_format, stream = smart_repo._byte_stream_to_stream(byte_stream)
 
1985
        src_format, stream = smart_repo._byte_stream_to_stream(byte_stream,
 
1986
            self._record_counter)
1975
1987
        if src_format.network_name() != repo._format.network_name():
1976
1988
            raise AssertionError(
1977
1989
                "Mismatched RemoteRepository and stream src %r, %r" % (
2387
2399
            self._vfs_set_tags_bytes(bytes)
2388
2400
 
2389
2401
    def lock_read(self):
 
2402
        """Lock the branch for read operations.
 
2403
 
 
2404
        :return: A bzrlib.lock.LogicalLockResult.
 
2405
        """
2390
2406
        self.repository.lock_read()
2391
2407
        if not self._lock_mode:
2392
2408
            self._note_lock('r')
2396
2412
                self._real_branch.lock_read()
2397
2413
        else:
2398
2414
            self._lock_count += 1
 
2415
        return lock.LogicalLockResult(self.unlock)
2399
2416
 
2400
2417
    def _remote_lock_write(self, token):
2401
2418
        if token is None:
2402
2419
            branch_token = repo_token = ''
2403
2420
        else:
2404
2421
            branch_token = token
2405
 
            repo_token = self.repository.lock_write()
 
2422
            repo_token = self.repository.lock_write().repository_token
2406
2423
            self.repository.unlock()
2407
2424
        err_context = {'token': token}
2408
 
        response = self._call(
2409
 
            'Branch.lock_write', self._remote_path(), branch_token,
2410
 
            repo_token or '', **err_context)
 
2425
        try:
 
2426
            response = self._call(
 
2427
                'Branch.lock_write', self._remote_path(), branch_token,
 
2428
                repo_token or '', **err_context)
 
2429
        except errors.LockContention, e:
 
2430
            # The LockContention from the server doesn't have any
 
2431
            # information about the lock_url. We re-raise LockContention
 
2432
            # with valid lock_url.
 
2433
            raise errors.LockContention('(remote lock)',
 
2434
                self.repository.base.split('.bzr/')[0])
2411
2435
        if response[0] != 'ok':
2412
2436
            raise errors.UnexpectedSmartServerResponse(response)
2413
2437
        ok, branch_token, repo_token = response
2434
2458
            self._lock_mode = 'w'
2435
2459
            self._lock_count = 1
2436
2460
        elif self._lock_mode == 'r':
2437
 
            raise errors.ReadOnlyTransaction
 
2461
            raise errors.ReadOnlyError(self)
2438
2462
        else:
2439
2463
            if token is not None:
2440
2464
                # A token was given to lock_write, and we're relocking, so
2445
2469
            self._lock_count += 1
2446
2470
            # Re-lock the repository too.
2447
2471
            self.repository.lock_write(self._repo_lock_token)
2448
 
        return self._lock_token or None
 
2472
        return BranchWriteLockResult(self.unlock, self._lock_token or None)
2449
2473
 
2450
2474
    def _unlock(self, branch_token, repo_token):
2451
2475
        err_context = {'token': str((branch_token, repo_token))}
2774
2798
        medium = self._branch._client._medium
2775
2799
        if medium._is_remote_before((1, 14)):
2776
2800
            return self._vfs_set_option(value, name, section)
 
2801
        if isinstance(value, dict):
 
2802
            if medium._is_remote_before((2, 2)):
 
2803
                return self._vfs_set_option(value, name, section)
 
2804
            return self._set_config_option_dict(value, name, section)
 
2805
        else:
 
2806
            return self._set_config_option(value, name, section)
 
2807
 
 
2808
    def _set_config_option(self, value, name, section):
2777
2809
        try:
2778
2810
            path = self._branch._remote_path()
2779
2811
            response = self._branch._client.call('Branch.set_config_option',
2780
2812
                path, self._branch._lock_token, self._branch._repo_lock_token,
2781
2813
                value.encode('utf8'), name, section or '')
2782
2814
        except errors.UnknownSmartMethod:
 
2815
            medium = self._branch._client._medium
2783
2816
            medium._remember_remote_is_before((1, 14))
2784
2817
            return self._vfs_set_option(value, name, section)
2785
2818
        if response != ():
2786
2819
            raise errors.UnexpectedSmartServerResponse(response)
2787
2820
 
 
2821
    def _serialize_option_dict(self, option_dict):
 
2822
        utf8_dict = {}
 
2823
        for key, value in option_dict.items():
 
2824
            if isinstance(key, unicode):
 
2825
                key = key.encode('utf8')
 
2826
            if isinstance(value, unicode):
 
2827
                value = value.encode('utf8')
 
2828
            utf8_dict[key] = value
 
2829
        return bencode.bencode(utf8_dict)
 
2830
 
 
2831
    def _set_config_option_dict(self, value, name, section):
 
2832
        try:
 
2833
            path = self._branch._remote_path()
 
2834
            serialised_dict = self._serialize_option_dict(value)
 
2835
            response = self._branch._client.call(
 
2836
                'Branch.set_config_option_dict',
 
2837
                path, self._branch._lock_token, self._branch._repo_lock_token,
 
2838
                serialised_dict, name, section or '')
 
2839
        except errors.UnknownSmartMethod:
 
2840
            medium = self._branch._client._medium
 
2841
            medium._remember_remote_is_before((2, 2))
 
2842
            return self._vfs_set_option(value, name, section)
 
2843
        if response != ():
 
2844
            raise errors.UnexpectedSmartServerResponse(response)
 
2845
 
2788
2846
    def _real_object(self):
2789
2847
        self._branch._ensure_real()
2790
2848
        return self._branch._real_branch