← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/__init__.py

Merge Tree.changes_from work.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/__init__.py
17
17
"""bzr library"""
18
18
 
19
19
 
20
 
# please keep these sorted (in C locale order) to aid merging
21
 
DEFAULT_IGNORE = [
22
 
                  '#*#',
23
 
                  '*$',
24
 
                  '*,v',
25
 
                  '*.BAK',
26
 
                  '*.a',
27
 
                  '*.bak',
28
 
                  '*.elc',
29
 
                  '*.exe',
30
 
                  '*.la',
31
 
                  '*.lo',
32
 
                  '*.o',
33
 
                  '*.o',
34
 
                  '*.obj',
35
 
                  '*.orig',
36
 
                  '*.py[oc]',
37
 
                  '*.so',
38
 
                  '*.tmp',
39
 
                  '.*.tmp',
40
 
                  '*~',
41
 
                  '.#*',
42
 
                  '.*.sw[nop]',
43
 
                  '.sw[nop]',    # vim editing nameless file
44
 
                  '.DS_Store',
45
 
                  '.arch-ids',
46
 
                  '.arch-inventory',
47
 
                  '.bzr.log',
48
 
                  '.del-*',
49
 
                  '.hg',
50
 
                  '.git',
51
 
                  '.jamdeps'
52
 
                  '.libs',
53
 
                  '.make.state',
54
 
                  '.sconsign*',
55
 
                  '.svn',
56
 
                  '.tmp*',
57
 
                  'BitKeeper',
58
 
                  'CVS',
59
 
                  'CVS.adm',
60
 
                  'RCS',
61
 
                  'SCCS',
62
 
                  'TAGS',
63
 
                  '_darcs',
64
 
                  'aclocal.m4',
65
 
                  'autom4te*',
66
 
                  'config.h',
67
 
                  'config.h.in',
68
 
                  'config.log',
69
 
                  'config.status',
70
 
                  'config.sub',
71
 
                  'stamp-h',
72
 
                  'stamp-h.in',
73
 
                  'stamp-h1',
74
 
                  '{arch}',
75
 
                  # Our setup tests dump .python-eggs in the bzr source tree
76
 
                  # root
77
 
                  './.python-eggs',
78
 
                  ]
79
 
 
80
20
IGNORE_FILENAME = ".bzrignore"
81
21
 
82
22
import os
108
48
    version_string = '%d.%d.%d' % version_info[:3]
109
49
else:
110
50
    version_string = '%d.%d.%d%s%d' % version_info
111
 
__version__ = version_string 
112
 
 
113
 
from bzrlib.symbol_versioning import deprecated_function, zero_seven
 
51
__version__ = version_string
 
52
 
 
53
from bzrlib.symbol_versioning import (deprecated_function,
 
54
                                      zero_seven,
 
55
                                      zero_nine,
 
56
                                      deprecated_list,
 
57
                                     )
 
58
 
 
59
# Kept for compatibility with 0.8, it is considered deprecated to modify it
 
60
DEFAULT_IGNORE = deprecated_list(zero_nine, 'DEFAULT_IGNORE', [],
 
61
                    'Consider using bzrlib.ignores.add_unique_user_ignores'
 
62
                    ' or bzrlib.ignores.add_runtime_ignores')
 
63
 
114
64
 
115
65
@deprecated_function(zero_seven)
116
66
def get_bzr_revision():