/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: Martin Pool
  • Date: 2010-04-16 07:56:51 UTC
  • mfrom: (5160 +trunk)
  • mto: (5050.3.4 2.2)
  • mto: This revision was merged to the branch mainline in revision 5173.
  • Revision ID: mbp@sourcefrog.net-20100416075651-bf23hr9hlof64gpj
merge trunk to 2.2 preparing for 2.2b2

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: A bzrlib.lock.LogicalLockResult.
1004
 
        """
1005
987
        # wrong eventually - want a local lock cache context
1006
988
        if not self._lock_mode:
1007
989
            self._note_lock('r')
1014
996
                repo.lock_read()
1015
997
        else:
1016
998
            self._lock_count += 1
1017
 
        return lock.LogicalLockResult(self.unlock)
1018
999
 
1019
1000
    def _remote_lock_write(self, token):
1020
1001
        path = self.bzrdir._path_for_remote_call(self._client)
1060
1041
            raise errors.ReadOnlyError(self)
1061
1042
        else:
1062
1043
            self._lock_count += 1
1063
 
        return RepositoryWriteLockResult(self.unlock, self._lock_token or None)
 
1044
        return self._lock_token or None
1064
1045
 
1065
1046
    def leave_lock_in_place(self):
1066
1047
        if not self._lock_token:
1246
1227
            # state, so always add a lock here. If a caller passes us a locked
1247
1228
            # repository, they are responsible for unlocking it later.
1248
1229
            repository.lock_read()
1249
 
        self._check_fallback_repository(repository)
1250
1230
        self._fallback_repositories.append(repository)
1251
1231
        # If self._real_repository was parameterised already (e.g. because a
1252
1232
        # _real_branch had its get_stacked_on_url method called), then the
1253
1233
        # repository to be added may already be in the _real_repositories list.
1254
1234
        if self._real_repository is not None:
1255
 
            fallback_locations = [repo.user_url for repo in
 
1235
            fallback_locations = [repo.bzrdir.root_transport.base for repo in
1256
1236
                self._real_repository._fallback_repositories]
1257
 
            if repository.user_url not in fallback_locations:
 
1237
            if repository.bzrdir.root_transport.base not in fallback_locations:
1258
1238
                self._real_repository.add_fallback_repository(repository)
1259
1239
 
1260
 
    def _check_fallback_repository(self, repository):
1261
 
        """Check that this repository can fallback to repository safely.
1262
 
 
1263
 
        Raise an error if not.
1264
 
 
1265
 
        :param repository: A repository to fallback to.
1266
 
        """
1267
 
        return _mod_repository.InterRepository._assert_same_model(
1268
 
            self, repository)
1269
 
 
1270
1240
    def add_inventory(self, revid, inv, parents):
1271
1241
        self._ensure_real()
1272
1242
        return self._real_repository.add_inventory(revid, inv, parents)
1625
1595
        return self._real_repository.inventories
1626
1596
 
1627
1597
    @needs_write_lock
1628
 
    def pack(self, hint=None, clean_obsolete_packs=False):
 
1598
    def pack(self, hint=None):
1629
1599
        """Compress the data within the repository.
1630
1600
 
1631
1601
        This is not currently implemented within the smart server.
1632
1602
        """
1633
1603
        self._ensure_real()
1634
 
        return self._real_repository.pack(hint=hint, clean_obsolete_packs=clean_obsolete_packs)
 
1604
        return self._real_repository.pack(hint=hint)
1635
1605
 
1636
1606
    @property
1637
1607
    def revisions(self):
2199
2169
            self._real_branch = None
2200
2170
        # Fill out expected attributes of branch for bzrlib API users.
2201
2171
        self._clear_cached_state()
2202
 
        # TODO: deprecate self.base in favor of user_url
2203
 
        self.base = self.bzrdir.user_url
 
2172
        self.base = self.bzrdir.root_transport.base
2204
2173
        self._name = name
2205
2174
        self._control_files = None
2206
2175
        self._lock_mode = None
2393
2362
            self._vfs_set_tags_bytes(bytes)
2394
2363
 
2395
2364
    def lock_read(self):
2396
 
        """Lock the branch for read operations.
2397
 
 
2398
 
        :return: A bzrlib.lock.LogicalLockResult.
2399
 
        """
2400
2365
        self.repository.lock_read()
2401
2366
        if not self._lock_mode:
2402
2367
            self._note_lock('r')
2406
2371
                self._real_branch.lock_read()
2407
2372
        else:
2408
2373
            self._lock_count += 1
2409
 
        return lock.LogicalLockResult(self.unlock)
2410
2374
 
2411
2375
    def _remote_lock_write(self, token):
2412
2376
        if token is None:
2413
2377
            branch_token = repo_token = ''
2414
2378
        else:
2415
2379
            branch_token = token
2416
 
            repo_token = self.repository.lock_write().repository_token
 
2380
            repo_token = self.repository.lock_write()
2417
2381
            self.repository.unlock()
2418
2382
        err_context = {'token': token}
2419
2383
        response = self._call(
2456
2420
            self._lock_count += 1
2457
2421
            # Re-lock the repository too.
2458
2422
            self.repository.lock_write(self._repo_lock_token)
2459
 
        return BranchWriteLockResult(self.unlock, self._lock_token or None)
 
2423
        return self._lock_token or None
2460
2424
 
2461
2425
    def _unlock(self, branch_token, repo_token):
2462
2426
        err_context = {'token': str((branch_token, repo_token))}