/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/smart/branch.py

  • Committer: John Arbash Meinel
  • Date: 2010-04-22 19:05:14 UTC
  • mfrom: (4634.139.10 2.0.6-peak-commit-mem)
  • mto: This revision was merged to the branch mainline in revision 5175.
  • Revision ID: john@arbash-meinel.com-20100422190514-udvjsm6n2a6sh0jv
Bring into bzr.dev, and update NEWS.

I can't land in 2.0 right now because PQM is broken.
But at least I can land in trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/branch.py
292
292
        if repo_token == '':
293
293
            repo_token = None
294
294
        try:
295
 
            repo_token = branch.repository.lock_write(
296
 
                token=repo_token).repository_token
 
295
            repo_token = branch.repository.lock_write(token=repo_token)
297
296
            try:
298
 
                branch_token = branch.lock_write(
299
 
                    token=branch_token).branch_token
 
297
                branch_token = branch.lock_write(token=branch_token)
300
298
            finally:
301
299
                # this leaves the repository with 1 lock
302
300
                branch.repository.unlock()