← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/remote.py

  • Committer: Martin Pool
  • Date: 2010-06-02 04:50:35 UTC
  • mto: This revision was merged to the branch mainline in revision 5279.
  • Revision ID: mbp@canonical.com-20100602045035-sccetnnwizmu01us
Don't say 'Linux' except when specifically talking about the kernel

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/remote.py
21
21
    branch,
22
22
    bzrdir,
23
23
    config,
24
 
    controldir,
25
24
    debug,
26
25
    errors,
27
26
    graph,
649
648
 
650
649
 
651
650
class RemoteRepository(_RpcHelper, lock._RelockDebugMixin,
652
 
    controldir.ControlComponent):
 
651
    bzrdir.ControlComponent):
653
652
    """Repository accessed over rpc.
654
653
 
655
654
    For the moment most operations are performed using local transport-backed
2421
2420
            repo_token = self.repository.lock_write().repository_token
2422
2421
            self.repository.unlock()
2423
2422
        err_context = {'token': token}
2424
 
        try:
2425
 
            response = self._call(
2426
 
                'Branch.lock_write', self._remote_path(), branch_token,
2427
 
                repo_token or '', **err_context)
2428
 
        except errors.LockContention, e:
2429
 
            # The LockContention from the server doesn't have any
2430
 
            # information about the lock_url. We re-raise LockContention
2431
 
            # with valid lock_url.
2432
 
            raise errors.LockContention('(remote lock)',
2433
 
                self.repository.base.split('.bzr/')[0])
 
2423
        response = self._call(
 
2424
            'Branch.lock_write', self._remote_path(), branch_token,
 
2425
            repo_token or '', **err_context)
2434
2426
        if response[0] != 'ok':
2435
2427
            raise errors.UnexpectedSmartServerResponse(response)
2436
2428
        ok, branch_token, repo_token = response