← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/remote.py

  • Committer: Robert Collins
  • Date: 2010-05-11 08:36:16 UTC
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100511083616-b8fjb19zomwupid0
Make all lock methods return Result objects, rather than lock_read returning self, as per John's review.

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