← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/version.py

  • Committer: Jelmer Vernooij
  • Date: 2011-04-09 22:14:24 UTC
  • mfrom: (5777.4.2 mutableinventorytree)
  • mto: This revision was merged to the branch mainline in revision 5787.
  • Revision ID: jelmer@samba.org-20110409221424-a2air35exbz50hi8
Mergemutableinventorytree.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/version.py
21
21
 
22
22
import bzrlib
23
23
from bzrlib import (
 
24
    bzrdir,
24
25
    config,
25
 
    controldir,
26
26
    errors,
27
27
    osutils,
28
28
    trace,
73
73
    else:
74
74
        to_file.write(bzrlib.__path__[0] + '\n')
75
75
    if show_config:
76
 
        config_dir = osutils.normpath(config.config_dir())  # use native slashes
 
76
        config_dir = os.path.normpath(config.config_dir())  # use native slashes
77
77
        if not isinstance(config_dir, unicode):
78
78
            config_dir = config_dir.decode(osutils.get_user_encoding())
79
79
        to_file.write("  Bazaar configuration: %s\n" % (config_dir,))
98
98
    If bzr is not being run from its working tree, returns None.
99
99
    """
100
100
    try:
101
 
        control = controldir.ControlDir.open_containing(__file__)[0]
 
101
        control = bzrdir.BzrDir.open_containing(__file__)[0]
102
102
        return control.open_workingtree(recommend_upgrade=False)
103
103
    except (errors.NotBranchError, errors.UnknownFormatError,
104
104
            errors.NoWorkingTree):