/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: Martin von Gagern
  • Date: 2010-05-02 20:10:25 UTC
  • mto: This revision was merged to the branch mainline in revision 5203.
  • Revision ID: martin.vgagern@gmx.net-20100502201025-ssuldxi8i98desfh
Added blackbox tests for --directory option.

Added tests for the new --directory (-d) option to these commands: added,
annotate, bind, cat, clean-tree, deleted, export, ignore, ignored,
lookup-revision, ls, modified, nick, re-sign, unbind, unknowns.

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()