← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/remote.py

  • Committer: Martin
  • Date: 2010-04-22 18:36:13 UTC
  • mto: (5177.1.1 integration2)
  • mto: This revision was merged to the branch mainline in revision 5179.
  • Revision ID: gzlist@googlemail.com-20100422183613-gruiwv2xsrjf0nhp
Fix more tests which were failing under -OO that had been missed earlier

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/remote.py
33
33
    static_tuple,
34
34
    symbol_versioning,
35
35
)
36
 
from bzrlib.branch import BranchReferenceFormat, BranchWriteLockResult
 
36
from bzrlib.branch import BranchReferenceFormat
37
37
from bzrlib.bzrdir import BzrDir, RemoteBzrDirFormat
38
38
from bzrlib.decorators import needs_read_lock, needs_write_lock, only_raises
39
39
from bzrlib.errors import (
43
43
from bzrlib.lockable_files import LockableFiles
44
44
from bzrlib.smart import client, vfs, repository as smart_repo
45
45
from bzrlib.revision import ensure_null, NULL_REVISION
46
 
from bzrlib.repository import RepositoryWriteLockResult
47
46
from bzrlib.trace import mutter, note, warning
48
47
 
49
48
 
644
643
        return self._custom_format._serializer
645
644
 
646
645
 
647
 
class RemoteRepository(_RpcHelper, lock._RelockDebugMixin,
648
 
    bzrdir.ControlComponent):
 
646
class RemoteRepository(_RpcHelper, lock._RelockDebugMixin):
649
647
    """Repository accessed over rpc.
650
648
 
651
649
    For the moment most operations are performed using local transport-backed
694
692
        # Additional places to query for data.
695
693
        self._fallback_repositories = []
696
694
 
697
 
    @property
698
 
    def user_transport(self):
699
 
        return self.bzrdir.user_transport
700
 
 
701
 
    @property
702
 
    def control_transport(self):
703
 
        # XXX: Normally you shouldn't directly get at the remote repository
704
 
        # transport, but I'm not sure it's worth making this method
705
 
        # optional -- mbp 2010-04-21
706
 
        return self.bzrdir.get_repository_transport(None)
707
 
        
708
695
    def __str__(self):
709
696
        return "%s(%s)" % (self.__class__.__name__, self.base)
710
697
 
998
985
        pass
999
986
 
1000
987
    def lock_read(self):
1001
 
        """Lock the repository for read operations.
1002
 
 
1003
 
        :return: An object with an unlock method which will release the lock
1004
 
            obtained.
1005
 
        """
1006
988
        # wrong eventually - want a local lock cache context
1007
989
        if not self._lock_mode:
1008
990
            self._note_lock('r')
1015
997
                repo.lock_read()
1016
998
        else:
1017
999
            self._lock_count += 1
1018
 
        return self
1019
1000
 
1020
1001
    def _remote_lock_write(self, token):
1021
1002
        path = self.bzrdir._path_for_remote_call(self._client)
1061
1042
            raise errors.ReadOnlyError(self)
1062
1043
        else:
1063
1044
            self._lock_count += 1
1064
 
        return RepositoryWriteLockResult(self.unlock, self._lock_token or None)
 
1045
        return self._lock_token or None
1065
1046
 
1066
1047
    def leave_lock_in_place(self):
1067
1048
        if not self._lock_token:
1253
1234
        # _real_branch had its get_stacked_on_url method called), then the
1254
1235
        # repository to be added may already be in the _real_repositories list.
1255
1236
        if self._real_repository is not None:
1256
 
            fallback_locations = [repo.user_url for repo in
 
1237
            fallback_locations = [repo.bzrdir.root_transport.base for repo in
1257
1238
                self._real_repository._fallback_repositories]
1258
 
            if repository.user_url not in fallback_locations:
 
1239
            if repository.bzrdir.root_transport.base not in fallback_locations:
1259
1240
                self._real_repository.add_fallback_repository(repository)
1260
1241
 
1261
1242
    def _check_fallback_repository(self, repository):
2200
2181
            self._real_branch = None
2201
2182
        # Fill out expected attributes of branch for bzrlib API users.
2202
2183
        self._clear_cached_state()
2203
 
        # TODO: deprecate self.base in favor of user_url
2204
 
        self.base = self.bzrdir.user_url
 
2184
        self.base = self.bzrdir.root_transport.base
2205
2185
        self._name = name
2206
2186
        self._control_files = None
2207
2187
        self._lock_mode = None
2394
2374
            self._vfs_set_tags_bytes(bytes)
2395
2375
 
2396
2376
    def lock_read(self):
2397
 
        """Lock the branch for read operations.
2398
 
 
2399
 
        :return: An object with an unlock method which will release the lock
2400
 
            obtained.
2401
 
        """
2402
2377
        self.repository.lock_read()
2403
2378
        if not self._lock_mode:
2404
2379
            self._note_lock('r')
2408
2383
                self._real_branch.lock_read()
2409
2384
        else:
2410
2385
            self._lock_count += 1
2411
 
        return self
2412
2386
 
2413
2387
    def _remote_lock_write(self, token):
2414
2388
        if token is None:
2415
2389
            branch_token = repo_token = ''
2416
2390
        else:
2417
2391
            branch_token = token
2418
 
            repo_token = self.repository.lock_write().repository_token
 
2392
            repo_token = self.repository.lock_write()
2419
2393
            self.repository.unlock()
2420
2394
        err_context = {'token': token}
2421
2395
        response = self._call(
2458
2432
            self._lock_count += 1
2459
2433
            # Re-lock the repository too.
2460
2434
            self.repository.lock_write(self._repo_lock_token)
2461
 
        return BranchWriteLockResult(self.unlock, self._lock_token or None)
 
2435
        return self._lock_token or None
2462
2436
 
2463
2437
    def _unlock(self, branch_token, repo_token):
2464
2438
        err_context = {'token': str((branch_token, repo_token))}