← 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: 2012-02-20 12:19:29 UTC
  • mfrom: (6437.23.11 2.5)
  • mto: (6581.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 6582.
  • Revision ID: jelmer@samba.org-20120220121929-7ni2psvjoatm1yp4
Merge bzr/2.5.

Show diffs side-by-side

added added

removed removed

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