← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/version.py

  • Committer: Robert Collins
  • Date: 2010-05-06 23:41:35 UTC
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100506234135-yivbzczw1sejxnxc
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
expected to return an object which can be used to unlock them. This reduces
duplicate code when using cleanups. The previous 'tokens's returned by
``Branch.lock_write`` and ``Repository.lock_write`` are now attributes
on the result of the lock_write. ``repository.RepositoryWriteLockResult``
and ``branch.BranchWriteLockResult`` document this. (Robert Collins)

``log._get_info_for_log_files`` now takes an add_cleanup callable.
(Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/version.py
1
 
# Copyright (C) 2004, 2005, 2006, 2007 Canonical Ltd
 
1
# Copyright (C) 2006-2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
"""Report on version of bzrlib"""
18
18
 
27
27
    osutils,
28
28
    trace,
29
29
    )
30
 
from bzrlib.branch import Branch
31
30
 
32
31
 
33
32
def show_version(show_config=True, show_copyright=True, to_file=None):
 
33
    import platform
 
34
 
34
35
    if to_file is None:
35
36
        to_file = sys.stdout
36
 
    print >>to_file, "Bazaar (bzr) %s" % bzrlib.__version__
 
37
    to_file.write("Bazaar (bzr) %s\n" % bzrlib.__version__)
37
38
    # is bzrlib itself in a branch?
38
39
    src_tree = _get_bzr_source_tree()
39
40
    if src_tree:
40
41
        src_revision_id = src_tree.last_revision()
41
42
        revno = src_tree.branch.revision_id_to_revno(src_revision_id)
42
 
        print >>to_file, "  from bzr checkout", src_tree.basedir
43
 
        print >>to_file, "    revision:", revno
44
 
        print >>to_file, "    revid:", src_revision_id
45
 
        print >>to_file, "    branch nick:", src_tree.branch.nick
 
43
        to_file.write("  from bzr checkout %s\n" % (src_tree.basedir,))
 
44
        to_file.write("    revision: %s\n" % (revno,))
 
45
        to_file.write("    revid: %s\n" % (src_revision_id,))
 
46
        to_file.write("    branch nick: %s\n" % (src_tree.branch.nick,))
46
47
 
47
 
    print >>to_file, "  Python interpreter:",
 
48
    to_file.write("  Python interpreter: ")
48
49
    # show path to python interpreter
49
50
    # (bzr.exe use python interpreter from pythonXY.dll
50
51
    # but sys.executable point to bzr.exe itself)
51
 
    if not hasattr(sys, 'frozen'):  # check for bzr.exe
52
 
        # python executable
53
 
        print >>to_file, sys.executable,
 
52
    # however, sys.frozen exists if running from bzr.exe
 
53
    # see http://www.py2exe.org/index.cgi/Py2exeEnvironment
 
54
    if getattr(sys, 'frozen', None) is None: # if not bzr.exe
 
55
        to_file.write(sys.executable + ' ')
54
56
    else:
55
57
        # pythonXY.dll
56
58
        basedir = os.path.dirname(sys.executable)
57
59
        python_dll = "python%d%d.dll" % sys.version_info[:2]
58
 
        print >>to_file, os.path.join(basedir, python_dll),
 
60
        to_file.write(os.path.join(basedir, python_dll) + ' ')
59
61
    # and now version of python interpreter
60
 
    print >>to_file, '.'.join(map(str, sys.version_info))
 
62
    to_file.write(bzrlib._format_version_tuple(sys.version_info))
 
63
    to_file.write('\n')
61
64
 
62
 
    print >>to_file, "  Python standard library:", os.path.dirname(os.__file__)
63
 
    print >>to_file, "  bzrlib:",
 
65
    to_file.write("  Python standard library:" + ' ')
 
66
    to_file.write(os.path.dirname(os.__file__) + '\n')
 
67
    to_file.write("  Platform: %s\n" % platform.platform(aliased=1))
 
68
    to_file.write("  bzrlib: ")
64
69
    if len(bzrlib.__path__) > 1:
65
70
        # print repr, which is a good enough way of making it clear it's
66
71
        # more than one element (eg ['/foo/bar', '/foo/bzr'])
67
 
        print >>to_file, repr(bzrlib.__path__)
 
72
        to_file.write(repr(bzrlib.__path__) + '\n')
68
73
    else:
69
 
        print >>to_file, bzrlib.__path__[0]
 
74
        to_file.write(bzrlib.__path__[0] + '\n')
70
75
    if show_config:
71
76
        config_dir = os.path.normpath(config.config_dir())  # use native slashes
72
77
        if not isinstance(config_dir, unicode):
73
 
            config_dir = config_dir.decode(bzrlib.user_encoding)
74
 
        print >>to_file, "  Bazaar configuration:", config_dir
75
 
        print >>to_file, "  Bazaar log file:", trace._bzr_log_filename
 
78
            config_dir = config_dir.decode(osutils.get_user_encoding())
 
79
        to_file.write("  Bazaar configuration: %s\n" % (config_dir,))
 
80
        to_file.write("  Bazaar log file: ")
 
81
        to_file.write(trace._bzr_log_filename + '\n')
76
82
    if show_copyright:
77
 
        print >>to_file
78
 
        print >>to_file, bzrlib.__copyright__
79
 
        print >>to_file, "http://bazaar-vcs.org/"
80
 
        print >>to_file
81
 
        print >>to_file, "bzr comes with ABSOLUTELY NO WARRANTY.  bzr is free software, and"
82
 
        print >>to_file, "you may use, modify and redistribute it under the terms of the GNU"
83
 
        print >>to_file, "General Public License version 2 or later."
84
 
    print >>to_file
 
83
        to_file.write('\n')
 
84
        to_file.write(bzrlib.__copyright__ + '\n')
 
85
        to_file.write("http://bazaar.canonical.com/\n")
 
86
        to_file.write('\n')
 
87
        to_file.write("bzr comes with ABSOLUTELY NO WARRANTY.  bzr is free software, and\n")
 
88
        to_file.write("you may use, modify and redistribute it under the terms of the GNU\n")
 
89
        to_file.write("General Public License version 2 or later.\n")
 
90
        to_file.write("\nBazaar is part of the GNU Project to produce a free operating "
 
91
                "system.\n")
 
92
    to_file.write('\n')
85
93
 
86
94
 
87
95
def _get_bzr_source_tree():