/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: Vincent Ladeuil
  • Date: 2010-06-17 14:58:20 UTC
  • mfrom: (5304 +trunk)
  • mto: (5247.1.9 first-try)
  • mto: This revision was merged to the branch mainline in revision 5326.
  • Revision ID: v.ladeuil+lp@free.fr-20100617145820-4c8abuj0e59w6pyz
Merge bzr.dev into cleanup

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/remote.py
2420
2420
            repo_token = self.repository.lock_write().repository_token
2421
2421
            self.repository.unlock()
2422
2422
        err_context = {'token': token}
2423
 
        response = self._call(
2424
 
            'Branch.lock_write', self._remote_path(), branch_token,
2425
 
            repo_token or '', **err_context)
 
2423
        try:
 
2424
            response = self._call(
 
2425
                'Branch.lock_write', self._remote_path(), branch_token,
 
2426
                repo_token or '', **err_context)
 
2427
        except errors.LockContention, e:
 
2428
            # The LockContention from the server doesn't have any
 
2429
            # information about the lock_url. We re-raise LockContention
 
2430
            # with valid lock_url.
 
2431
            raise errors.LockContention('(remote lock)',
 
2432
                self.repository.base.split('.bzr/')[0])
2426
2433
        if response[0] != 'ok':
2427
2434
            raise errors.UnexpectedSmartServerResponse(response)
2428
2435
        ok, branch_token, repo_token = response