← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/__init__.py

  • Committer: Aaron Bentley
  • Date: 2006-03-09 22:54:29 UTC
  • mto: (2027.1.2 revert-subpath-56549)
  • mto: This revision was merged to the branch mainline in revision 1647.
  • Revision ID: abentley@panoramicfeedback.com-20060309225429-9b81ae72b0f23221
Implemented conflict serialization

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/__init__.py
16
16
 
17
17
"""bzr library"""
18
18
 
19
 
BZRDIR = ".bzr"
20
19
 
21
 
DEFAULT_IGNORE = ['.bzr.log',
22
 
                  '*~', '#*#', '*$', '.#*',
23
 
                  '.*.sw[nop]', '.*.tmp',
24
 
                  '*.tmp', '*.bak', '*.BAK', '*.orig',
25
 
                  '*.o', '*.obj', '*.a', '*.py[oc]', '*.so', '*.exe', '*.elc', 
26
 
                  '{arch}', 'CVS', 'CVS.adm', '.svn', '_darcs', 'SCCS', 'RCS',
 
20
# please keep these sorted (in C locale order) to aid merging
 
21
DEFAULT_IGNORE = [
 
22
                  '#*#',
 
23
                  '*$',
27
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
                  '.git',
 
50
                  '.jamdeps'
 
51
                  '.libs',
 
52
                  '.make.state',
 
53
                  '.sconsign*',
 
54
                  '.svn',
 
55
                  '.tmp*',
28
56
                  'BitKeeper',
29
 
                  '.git',
30
 
                  'TAGS', '.make.state', '.sconsign', '.tmp*',
31
 
                  '.del-*',
32
 
                  '.DS_Store',]
 
57
                  'CVS',
 
58
                  'CVS.adm',
 
59
                  'RCS',
 
60
                  'SCCS',
 
61
                  'TAGS',
 
62
                  '_darcs',
 
63
                  'aclocal.m4',
 
64
                  'autom4te*',
 
65
                  'config.h',
 
66
                  'config.h.in',
 
67
                  'config.log',
 
68
                  'config.status',
 
69
                  'config.sub',
 
70
                  'stamp-h',
 
71
                  'stamp-h.in',
 
72
                  'stamp-h1',
 
73
                  '{arch}',
 
74
                  ]
33
75
 
34
76
IGNORE_FILENAME = ".bzrignore"
35
77
 
36
78
import os
37
 
import locale
 
79
import sys
 
80
if sys.platform == 'darwin':
 
81
    # work around egregious python 2.4 bug
 
82
    sys.platform = 'posix'
 
83
    import locale
 
84
    sys.platform = 'darwin'
 
85
else:
 
86
    import locale
38
87
user_encoding = locale.getpreferredencoding() or 'ascii'
39
88
del locale
40
89
 
41
 
__copyright__ = "Copyright 2005 Canonical Development Ltd."
42
 
__version__ = '0.6pre'
43
 
 
44
 
 
 
90
__copyright__ = "Copyright 2005,06 Canonical Development Ltd."
 
91
__version__ = version_string = '0.8pre'
 
92
# same format as sys.version_info
 
93
version_info = (0, 8, 0, 'pre', 0)
 
94
 
 
95
 
 
96
from bzrlib.symbol_versioning import deprecated_function, zero_seven
 
97
 
 
98
@deprecated_function(zero_seven)
45
99
def get_bzr_revision():
46
 
    """If bzr is run from a branch, return (revno,revid) or None"""
 
100
    """If bzr is run from a branch, return (revno,revid) or None."""
47
101
    import bzrlib.errors
48
102
    from bzrlib.branch import Branch
49
103
    
58
112
        return None
59
113
    
60
114
def test_suite():
61
 
    import selftest
62
 
    return selftest.test_suite()
 
115
    import tests
 
116
    return tests.test_suite()