← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/version.py

  • Committer: v.ladeuil+lp at free
  • Date: 2006-12-01 15:06:29 UTC
  • mto: (2172.3.1 bzr.73948)
  • mto: This revision was merged to the branch mainline in revision 2181.
  • Revision ID: v.ladeuil+lp@free.fr-20061201150629-zjd2an87u0r7nhhw
The tests that would have help avoid bug #73948 and all that mess :)

* bzrlib/transport/http/response.py:
(handle_response): Translate a 416 http error code into a bzr
exception.

* bzrlib/transport/http/_urllib2_wrappers.py:
(HTTPDefaultErrorHandler.http_error_default): Translate a 416 http
error code into a bzr exception.

* bzrlib/transport/http/_pycurl.py:
(PyCurlTransport._curl_perform): It could happen that pycrul
itself detect a short read.

* bzrlib/transport/http/__init__.py:
(HttpTransportBase._retry_get): New method, factorizing the retry
logic.
(HttpTransportBase.readv): We can have exception during the
initial GET worth degrading the range requirements (i.e. retrying
the GET request with either single or not ranges).

* bzrlib/tests/test_transport_implementations.py:
(TransportTests.test_readv_short_read): InvalidRange can also be
raised.

* bzrlib/tests/test_http.py:
(TestRangeRequestServer.test_readv_invalid_ranges): Was named
test_readv_short_read, the new name make the intent
clearer. Depending of the code path used (urllib or pycurl), both
exceptions can be raised.

* bzrlib/tests/HttpServer.py:
(TestingHTTPRequestHandler.do_GET): If invalid ranges are
specified, returns a 416 instead of the whole file (both are valid
according to the RFC).

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/version.py
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2004, 2005, 2006 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
"""Report on version of bzrlib"""
18
18
 
20
20
import sys
21
21
 
22
22
import bzrlib
23
 
from bzrlib import (
24
 
    bzrdir,
25
 
    config,
26
 
    errors,
27
 
    osutils,
28
 
    trace,
29
 
    )
30
 
 
31
 
 
32
 
def show_version(show_config=True, show_copyright=True, to_file=None):
33
 
    import platform
34
 
 
35
 
    if to_file is None:
36
 
        to_file = sys.stdout
37
 
    to_file.write("Bazaar (bzr) %s\n" % bzrlib.__version__)
 
23
from bzrlib import errors, osutils
 
24
from bzrlib.branch import Branch
 
25
 
 
26
 
 
27
def show_version():
 
28
    print "Bazaar (bzr) %s" % bzrlib.__version__
38
29
    # is bzrlib itself in a branch?
39
30
    src_tree = _get_bzr_source_tree()
40
31
    if src_tree:
41
32
        src_revision_id = src_tree.last_revision()
42
33
        revno = src_tree.branch.revision_id_to_revno(src_revision_id)
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,))
47
 
 
48
 
    to_file.write("  Python interpreter: ")
49
 
    # show path to python interpreter
50
 
    # (bzr.exe use python interpreter from pythonXY.dll
51
 
    # but sys.executable point to bzr.exe itself)
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 + ' ')
56
 
    else:
57
 
        # pythonXY.dll
58
 
        basedir = os.path.dirname(sys.executable)
59
 
        python_dll = "python%d%d.dll" % sys.version_info[:2]
60
 
        to_file.write(os.path.join(basedir, python_dll) + ' ')
61
 
    # and now version of python interpreter
62
 
    to_file.write(bzrlib._format_version_tuple(sys.version_info))
63
 
    to_file.write('\n')
64
 
 
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: ")
 
34
        print "  from bzr checkout", src_tree.basedir
 
35
        print "    revision:", revno
 
36
        print "    revid:", src_revision_id
 
37
        print "    branch nick:", src_tree.branch.nick
 
38
    print "Using python interpreter:", sys.executable
 
39
    import site
 
40
    print "Using python standard library:", os.path.dirname(site.__file__)
 
41
    print "Using bzrlib:",
69
42
    if len(bzrlib.__path__) > 1:
70
43
        # print repr, which is a good enough way of making it clear it's
71
44
        # more than one element (eg ['/foo/bar', '/foo/bzr'])
72
 
        to_file.write(repr(bzrlib.__path__) + '\n')
 
45
        print repr(bzrlib.__path__)
73
46
    else:
74
 
        to_file.write(bzrlib.__path__[0] + '\n')
75
 
    if show_config:
76
 
        config_dir = os.path.normpath(config.config_dir())  # use native slashes
77
 
        if not isinstance(config_dir, unicode):
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')
82
 
    if show_copyright:
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')
 
47
        print bzrlib.__path__[0]
 
48
 
 
49
    print
 
50
    print bzrlib.__copyright__
 
51
    print "http://bazaar-vcs.org/"
 
52
    print
 
53
    print "bzr comes with ABSOLUTELY NO WARRANTY.  bzr is free software, and"
 
54
    print "you may use, modify and redistribute it under the terms of the GNU"
 
55
    print "General Public License version 2 or later."
93
56
 
94
57
 
95
58
def _get_bzr_source_tree():
98
61
    If bzr is not being run from its working tree, returns None.
99
62
    """
100
63
    try:
101
 
        control = bzrdir.BzrDir.open_containing(__file__)[0]
102
 
        return control.open_workingtree(recommend_upgrade=False)
103
 
    except (errors.NotBranchError, errors.UnknownFormatError,
104
 
            errors.NoWorkingTree):
 
64
        from bzrlib.workingtree import WorkingTree
 
65
        return WorkingTree.open_containing(__file__)[0]
 
66
    except (errors.NotBranchError, errors.UnknownFormatError):
105
67
        return None