← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/__init__.py

Merge from integration.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/__init__.py
37
37
                  '*.py[oc]',
38
38
                  '*.so',
39
39
                  '*.tmp',
 
40
                  '.*.tmp',
40
41
                  '*~',
41
42
                  '.#*',
42
43
                  '.*.sw[nop]',
43
 
                  '.*.tmp',
 
44
                  '.sw[nop]',    # vim editing nameless file
44
45
                  '.DS_Store',
45
46
                  '.arch-ids',
46
47
                  '.arch-inventory',
56
57
                  'BitKeeper',
57
58
                  'CVS',
58
59
                  'CVS.adm',
59
 
                  'Makefile.in',
60
60
                  'RCS',
61
61
                  'SCCS',
62
62
                  'TAGS',
88
88
user_encoding = locale.getpreferredencoding() or 'ascii'
89
89
del locale
90
90
 
91
 
__copyright__ = "Copyright 2005 Canonical Development Ltd."
92
 
__version__ = version_string = '0.7pre'
 
91
__copyright__ = "Copyright 2005,06 Canonical Development Ltd."
 
92
__version__ = version_string = '0.7rc1'
93
93
# same format as sys.version_info
94
 
version_info = (0, 7, 0, 'pre', 0)
95
 
 
96
 
 
 
94
version_info = (0, 7, 0, 'rc', 1)
 
95
 
 
96
 
 
97
from bzrlib.symbol_versioning import deprecated_function, zero_seven
 
98
 
 
99
@deprecated_function(zero_seven)
97
100
def get_bzr_revision():
98
 
    """If bzr is run from a branch, return (revno,revid) or None"""
 
101
    """If bzr is run from a branch, return (revno,revid) or None."""
99
102
    import bzrlib.errors
100
103
    from bzrlib.branch import Branch
101
104