/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: Parth Malwankar
  • Date: 2010-06-11 07:56:46 UTC
  • mto: This revision was merged to the branch mainline in revision 5303.
  • Revision ID: parth.malwankar@gmail.com-20100611075646-9yyeih46ken6yagd
fixed tests. closed review comments by mgz.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/remote.py
2425
2425
                'Branch.lock_write', self._remote_path(), branch_token,
2426
2426
                repo_token or '', **err_context)
2427
2427
        except errors.LockContention, e:
2428
 
            # set msg to lock url so user can use 'break-lock'
2429
 
            e.msg = self.repository.base.rstrip('.bzr/')
2430
 
            raise 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])
2431
2433
        if response[0] != 'ok':
2432
2434
            raise errors.UnexpectedSmartServerResponse(response)
2433
2435
        ok, branch_token, repo_token = response