~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/version.py

  • Committer: Patch Queue Manager
  • Date: 2011-10-14 11:14:25 UTC
  • mfrom: (6207.3.11 use-controldir)
  • Revision ID: pqm@pqm.ubuntu.com-20111014111425-c7nzqujggvlsd9zz
(jelmer) Move static/class methods from BzrDir to ControlDir. (Jelmer
 Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
21
21
 
22
22
import bzrlib
23
23
from bzrlib import (
24
 
    bzrdir,
25
24
    config,
 
25
    controldir,
26
26
    errors,
27
27
    osutils,
28
28
    trace,
98
98
    If bzr is not being run from its working tree, returns None.
99
99
    """
100
100
    try:
101
 
        control = bzrdir.BzrDir.open_containing(__file__)[0]
 
101
        control = controldir.ControlDir.open_containing(__file__)[0]
102
102
        return control.open_workingtree(recommend_upgrade=False)
103
103
    except (errors.NotBranchError, errors.UnknownFormatError,
104
104
            errors.NoWorkingTree):