← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/remote.py

  • Committer: Jelmer Vernooij
  • Date: 2010-03-21 21:39:33 UTC
  • mfrom: (5102 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5143.
  • Revision ID: jelmer@samba.org-20100321213933-fexeh9zcoz8oaju2
merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/remote.py
27
27
    lock,
28
28
    lockdir,
29
29
    repository,
30
 
    repository as _mod_repository,
31
30
    revision,
32
31
    revision as _mod_revision,
33
32
    static_tuple,
34
33
    symbol_versioning,
35
34
)
36
 
from bzrlib.branch import BranchReferenceFormat, BranchWriteLockResult
 
35
from bzrlib.branch import BranchReferenceFormat
37
36
from bzrlib.bzrdir import BzrDir, RemoteBzrDirFormat
38
37
from bzrlib.decorators import needs_read_lock, needs_write_lock, only_raises
39
38
from bzrlib.errors import (
43
42
from bzrlib.lockable_files import LockableFiles
44
43
from bzrlib.smart import client, vfs, repository as smart_repo
45
44
from bzrlib.revision import ensure_null, NULL_REVISION
46
 
from bzrlib.repository import RepositoryWriteLockResult
47
45
from bzrlib.trace import mutter, note, warning
48
46
 
49
47
 
644
642
        return self._custom_format._serializer
645
643
 
646
644
 
647
 
class RemoteRepository(_RpcHelper, lock._RelockDebugMixin,
648
 
    bzrdir.ControlComponent):
 
645
class RemoteRepository(_RpcHelper, lock._RelockDebugMixin):
649
646
    """Repository accessed over rpc.
650
647
 
651
648
    For the moment most operations are performed using local transport-backed
694
691
        # Additional places to query for data.
695
692
        self._fallback_repositories = []
696
693
 
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
694
    def __str__(self):
709
695
        return "%s(%s)" % (self.__class__.__name__, self.base)
710
696
 
998
984
        pass
999
985
 
1000
986
    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
987
        # wrong eventually - want a local lock cache context
1007
988
        if not self._lock_mode:
1008
989
            self._note_lock('r')
1015
996
                repo.lock_read()
1016
997
        else:
1017
998
            self._lock_count += 1
1018
 
        return self
1019
999
 
1020
1000
    def _remote_lock_write(self, token):
1021
1001
        path = self.bzrdir._path_for_remote_call(self._client)
1061
1041
            raise errors.ReadOnlyError(self)
1062
1042
        else:
1063
1043
            self._lock_count += 1
1064
 
        return RepositoryWriteLockResult(self.unlock, self._lock_token or None)
 
1044
        return self._lock_token or None
1065
1045
 
1066
1046
    def leave_lock_in_place(self):
1067
1047
        if not self._lock_token:
1247
1227
            # state, so always add a lock here. If a caller passes us a locked
1248
1228
            # repository, they are responsible for unlocking it later.
1249
1229
            repository.lock_read()
1250
 
        self._check_fallback_repository(repository)
1251
1230
        self._fallback_repositories.append(repository)
1252
1231
        # If self._real_repository was parameterised already (e.g. because a
1253
1232
        # _real_branch had its get_stacked_on_url method called), then the
1254
1233
        # repository to be added may already be in the _real_repositories list.
1255
1234
        if self._real_repository is not None:
1256
 
            fallback_locations = [repo.user_url for repo in
 
1235
            fallback_locations = [repo.bzrdir.root_transport.base for repo in
1257
1236
                self._real_repository._fallback_repositories]
1258
 
            if repository.user_url not in fallback_locations:
 
1237
            if repository.bzrdir.root_transport.base not in fallback_locations:
1259
1238
                self._real_repository.add_fallback_repository(repository)
1260
1239
 
1261
 
    def _check_fallback_repository(self, repository):
1262
 
        """Check that this repository can fallback to repository safely.
1263
 
 
1264
 
        Raise an error if not.
1265
 
 
1266
 
        :param repository: A repository to fallback to.
1267
 
        """
1268
 
        return _mod_repository.InterRepository._assert_same_model(
1269
 
            self, repository)
1270
 
 
1271
1240
    def add_inventory(self, revid, inv, parents):
1272
1241
        self._ensure_real()
1273
1242
        return self._real_repository.add_inventory(revid, inv, parents)
1626
1595
        return self._real_repository.inventories
1627
1596
 
1628
1597
    @needs_write_lock
1629
 
    def pack(self, hint=None, clean_obsolete_packs=False):
 
1598
    def pack(self, hint=None):
1630
1599
        """Compress the data within the repository.
1631
1600
 
1632
1601
        This is not currently implemented within the smart server.
1633
1602
        """
1634
1603
        self._ensure_real()
1635
 
        return self._real_repository.pack(hint=hint, clean_obsolete_packs=clean_obsolete_packs)
 
1604
        return self._real_repository.pack(hint=hint)
1636
1605
 
1637
1606
    @property
1638
1607
    def revisions(self):
2200
2169
            self._real_branch = None
2201
2170
        # Fill out expected attributes of branch for bzrlib API users.
2202
2171
        self._clear_cached_state()
2203
 
        # TODO: deprecate self.base in favor of user_url
2204
 
        self.base = self.bzrdir.user_url
 
2172
        self.base = self.bzrdir.root_transport.base
2205
2173
        self._name = name
2206
2174
        self._control_files = None
2207
2175
        self._lock_mode = None
2394
2362
            self._vfs_set_tags_bytes(bytes)
2395
2363
 
2396
2364
    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
2365
        self.repository.lock_read()
2403
2366
        if not self._lock_mode:
2404
2367
            self._note_lock('r')
2408
2371
                self._real_branch.lock_read()
2409
2372
        else:
2410
2373
            self._lock_count += 1
2411
 
        return self
2412
2374
 
2413
2375
    def _remote_lock_write(self, token):
2414
2376
        if token is None:
2415
2377
            branch_token = repo_token = ''
2416
2378
        else:
2417
2379
            branch_token = token
2418
 
            repo_token = self.repository.lock_write().repository_token
 
2380
            repo_token = self.repository.lock_write()
2419
2381
            self.repository.unlock()
2420
2382
        err_context = {'token': token}
2421
2383
        response = self._call(
2458
2420
            self._lock_count += 1
2459
2421
            # Re-lock the repository too.
2460
2422
            self.repository.lock_write(self._repo_lock_token)
2461
 
        return BranchWriteLockResult(self.unlock, self._lock_token or None)
 
2423
        return self._lock_token or None
2462
2424
 
2463
2425
    def _unlock(self, branch_token, repo_token):
2464
2426
        err_context = {'token': str((branch_token, repo_token))}