/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/bzrdir.py

  • Committer: Daniel Knittl-Frank
  • Date: 2010-09-15 21:06:23 UTC
  • mto: This revision was merged to the branch mainline in revision 5427.
  • Revision ID: knittl89+bzr@googlemail.com-20100915210623-3jr0ltga8z9l7jd4
fix whitespace (only use spaces)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/bzrdir.py
22
22
    BzrDir,
23
23
    BzrDirFormat,
24
24
    BzrDirMetaFormat1,
 
25
    BzrProber,
25
26
    network_format_registry,
26
27
    )
27
28
from bzrlib.smart.request import (
44
45
            # clients that don't anticipate errors from this method.
45
46
            answer = 'no'
46
47
        else:
47
 
            default_format = BzrDirFormat.get_default_format()
48
 
            real_bzrdir = default_format.open(t, _found=True)
 
48
            bzr_prober = BzrProber()
49
49
            try:
50
 
                real_bzrdir._format.probe_transport(t)
 
50
                bzr_prober.probe_transport(t)
51
51
            except (errors.NotBranchError, errors.UnknownFormatError):
52
52
                answer = 'no'
53
53
            else:
429
429
            # It is returned locked, but we need to do the lock to get the lock
430
430
            # token.
431
431
            repo.unlock()
432
 
            repo_lock_token = repo.lock_write() or ''
 
432
            repo_lock_token = repo.lock_write().repository_token or ''
433
433
            if repo_lock_token:
434
434
                repo.leave_lock_in_place()
435
435
            repo.unlock()