~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/__init__.py

  • Committer: Robert Collins
  • Date: 2009-08-04 04:36:34 UTC
  • mfrom: (4583 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4593.
  • Revision ID: robertc@robertcollins.net-20090804043634-2iu9wpcgs273i97s
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
37
37
IGNORE_FILENAME = ".bzrignore"
38
38
 
39
39
 
40
 
# XXX: Compatibility. This should probably be deprecated
 
40
# XXX: Deprecated as of bzr-1.17 use osutils.get_user_encoding() directly
41
41
user_encoding = get_user_encoding()
42
42
 
43
43
 
50
50
# Python version 2.0 is (2, 0, 0, 'final', 0)."  Additionally we use a
51
51
# releaselevel of 'dev' for unreleased under-development code.
52
52
 
53
 
version_info = (1, 17, 0, 'dev', 0)
 
53
version_info = (1, 18, 0, 'dev', 0)
54
54
 
55
55
# API compatibility version: bzrlib is currently API compatible with 1.15.
56
 
api_minimum_version = (1, 15, 0)
 
56
api_minimum_version = (1, 17, 0)
57
57
 
58
58
def _format_version_tuple(version_info):
59
59
    """Turn a version number 2, 3 or 5-tuple into a short string.