← 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-05 02:35:02 UTC
  • mto: This revision was merged to the branch mainline in revision 5206.
  • Revision ID: robertc@robertcollins.net-20100505023502-fzybvhmxe9sv3b3g
Review feedback.

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