← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/__init__.py

[merge] fix \t in commit messages

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/__init__.py
18
18
 
19
19
BZRDIR = ".bzr"
20
20
 
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',
 
21
# please keep these sorted (in C locale order) to aid merging
 
22
DEFAULT_IGNORE = [
 
23
                  '#*#',
 
24
                  '*$',
27
25
                  '*,v',
 
26
                  '*.BAK',
 
27
                  '*.a',
 
28
                  '*.bak',
 
29
                  '*.elc',
 
30
                  '*.exe',
 
31
                  '*.la',
 
32
                  '*.lo',
 
33
                  '*.o',
 
34
                  '*.o',
 
35
                  '*.obj',
 
36
                  '*.orig',
 
37
                  '*.py[oc]',
 
38
                  '*.so',
 
39
                  '*.tmp',
 
40
                  '*~',
 
41
                  '.#*',
 
42
                  '.*.sw[nop]',
 
43
                  '.*.tmp',
 
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-*']
 
57
                  'CVS',
 
58
                  'CVS.adm',
 
59
                  'Makefile.in',
 
60
                  'RCS',
 
61
                  'SCCS',
 
62
                  'TAGS',
 
63
                  '_darcs',
 
64
                  'aclocal.m4',
 
65
                  'autom4te*',
 
66
                  'config.guess',
 
67
                  'config.h',
 
68
                  'config.h.in',
 
69
                  'config.log',
 
70
                  'config.status',
 
71
                  'config.sub',
 
72
                  'configure.in',
 
73
                  'stamp-h',
 
74
                  'stamp-h.in',
 
75
                  'stamp-h1',
 
76
                  '{arch}',
 
77
                  ]
32
78
 
33
79
IGNORE_FILENAME = ".bzrignore"
34
80
 
 
81
import os
35
82
import locale
36
83
user_encoding = locale.getpreferredencoding() or 'ascii'
37
84
del locale
38
85
 
39
86
__copyright__ = "Copyright 2005 Canonical Development Ltd."
40
 
__author__ = "Martin Pool <mbp@canonical.com>"
41
 
__version__ = '0.1pre'
 
87
__version__ = version_string = '0.7pre'
 
88
# same format as sys.version_info
 
89
version_info = (0, 7, 0, 'pre', 0)
42
90
 
43
91
 
44
92
def get_bzr_revision():
47
95
    from bzrlib.branch import Branch
48
96
    
49
97
    try:
50
 
        branch = Branch(__path__[0])
 
98
        branch = Branch.open(os.path.dirname(__path__[0]))
51
99
        rh = branch.revision_history()
52
100
        if rh:
53
101
            return len(rh), rh[-1]