/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: Robert Collins
  • Date: 2010-05-06 11:08:10 UTC
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100506110810-h3j07fh5gmw54s25
Cleaner matcher matching revised unlocking protocol.

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
 
998
997
        pass
999
998
 
1000
999
    def lock_read(self):
1001
 
        """Lock the repository for read operations.
1002
 
 
1003
 
        :return: A bzrlib.lock.LogicalLockResult.
1004
 
        """
1005
1000
        # wrong eventually - want a local lock cache context
1006
1001
        if not self._lock_mode:
1007
1002
            self._note_lock('r')
1014
1009
                repo.lock_read()
1015
1010
        else:
1016
1011
            self._lock_count += 1
1017
 
        return lock.LogicalLockResult(self.unlock)
1018
1012
 
1019
1013
    def _remote_lock_write(self, token):
1020
1014
        path = self.bzrdir._path_for_remote_call(self._client)
1060
1054
            raise errors.ReadOnlyError(self)
1061
1055
        else:
1062
1056
            self._lock_count += 1
1063
 
        return RepositoryWriteLockResult(self.unlock, self._lock_token or None)
 
1057
        return self._lock_token or None
1064
1058
 
1065
1059
    def leave_lock_in_place(self):
1066
1060
        if not self._lock_token:
2393
2387
            self._vfs_set_tags_bytes(bytes)
2394
2388
 
2395
2389
    def lock_read(self):
2396
 
        """Lock the branch for read operations.
2397
 
 
2398
 
        :return: A bzrlib.lock.LogicalLockResult.
2399
 
        """
2400
2390
        self.repository.lock_read()
2401
2391
        if not self._lock_mode:
2402
2392
            self._note_lock('r')
2406
2396
                self._real_branch.lock_read()
2407
2397
        else:
2408
2398
            self._lock_count += 1
2409
 
        return lock.LogicalLockResult(self.unlock)
2410
2399
 
2411
2400
    def _remote_lock_write(self, token):
2412
2401
        if token is None:
2413
2402
            branch_token = repo_token = ''
2414
2403
        else:
2415
2404
            branch_token = token
2416
 
            repo_token = self.repository.lock_write().repository_token
 
2405
            repo_token = self.repository.lock_write()
2417
2406
            self.repository.unlock()
2418
2407
        err_context = {'token': token}
2419
2408
        response = self._call(
2456
2445
            self._lock_count += 1
2457
2446
            # Re-lock the repository too.
2458
2447
            self.repository.lock_write(self._repo_lock_token)
2459
 
        return BranchWriteLockResult(self.unlock, self._lock_token or None)
 
2448
        return self._lock_token or None
2460
2449
 
2461
2450
    def _unlock(self, branch_token, repo_token):
2462
2451
        err_context = {'token': str((branch_token, repo_token))}