← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/version.py

  • Committer: Vincent Ladeuil
  • Date: 2011-12-21 14:25:26 UTC
  • mto: This revision was merged to the branch mainline in revision 6397.
  • Revision ID: v.ladeuil+lp@free.fr-20111221142526-pnwau0xnalimujts
Provides MemoryStack to simplify configuration setup in tests

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,
29
31
    )
30
 
from bzrlib.branch import Branch
31
32
 
32
33
 
33
34
def show_version(show_config=True, show_copyright=True, to_file=None):
74
75
    else:
75
76
        to_file.write(bzrlib.__path__[0] + '\n')
76
77
    if show_config:
77
 
        config_dir = os.path.normpath(config.config_dir())  # use native slashes
 
78
        config_dir = osutils.normpath(config.config_dir())  # use native slashes
78
79
        if not isinstance(config_dir, unicode):
79
80
            config_dir = config_dir.decode(osutils.get_user_encoding())
80
81
        to_file.write("  Bazaar configuration: %s\n" % (config_dir,))
99
100
    If bzr is not being run from its working tree, returns None.
100
101
    """
101
102
    try:
102
 
        control = bzrdir.BzrDir.open_containing(__file__)[0]
 
103
        control = controldir.ControlDir.open_containing(__file__)[0]
103
104
        return control.open_workingtree(recommend_upgrade=False)
104
105
    except (errors.NotBranchError, errors.UnknownFormatError,
105
106
            errors.NoWorkingTree):