← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/__init__.py

  • Committer: Martin Pool
  • Date: 2005-07-07 10:22:02 UTC
  • Revision ID: mbp@sourcefrog.net-20050707102201-2d2a13a25098b101
- rearrange and clear up merged weave

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/__init__.py
16
16
 
17
17
"""bzr library"""
18
18
 
 
19
from branch import Branch, ScratchBranch, find_branch
 
20
from errors import BzrError
 
21
 
19
22
BZRDIR = ".bzr"
20
23
 
21
 
# please keep these sorted (in C locale order) to aid merging
22
 
DEFAULT_IGNORE = [
23
 
                  '#*#',
24
 
                  '*$',
 
24
DEFAULT_IGNORE = ['.bzr.log',
 
25
                  '*~', '#*#', '*$', '.#*',
 
26
                  '.*.sw[nop]', '.*.tmp',
 
27
                  '*.tmp', '*.bak', '*.BAK', '*.orig',
 
28
                  '*.o', '*.obj', '*.a', '*.py[oc]', '*.so', '*.exe', '*.elc', 
 
29
                  '{arch}', 'CVS', 'CVS.adm', '.svn', '_darcs', 'SCCS', 'RCS',
25
30
                  '*,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-*',
 
31
                  'BitKeeper',
49
32
                  '.git',
50
 
                  '.jamdeps'
51
 
                  '.libs',
52
 
                  '.make.state',
53
 
                  '.sconsign*',
54
 
                  '.svn',
55
 
                  '.tmp*',
56
 
                  'BitKeeper',
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
 
                  ]
 
33
                  'TAGS', '.make.state', '.sconsign', '.tmp*',
 
34
                  '.del-*']
78
35
 
79
36
IGNORE_FILENAME = ".bzrignore"
80
37
 
81
 
import os
82
38
import locale
83
39
user_encoding = locale.getpreferredencoding() or 'ascii'
84
40
del locale
85
41
 
86
42
__copyright__ = "Copyright 2005 Canonical Development Ltd."
87
 
__version__ = version_string = '0.6rc1'
88
 
# same format as sys.version_info
89
 
version_info = (0, 6, 0, 'rc', 1)
 
43
__author__ = "Martin Pool <mbp@canonical.com>"
 
44
__version__ = '0.0.5'
90
45
 
91
46
 
92
47
def get_bzr_revision():
93
48
    """If bzr is run from a branch, return (revno,revid) or None"""
94
 
    import bzrlib.errors
95
 
    from bzrlib.branch import Branch
96
 
    
97
49
    try:
98
 
        branch = Branch.open(os.path.dirname(__path__[0]))
 
50
        branch = Branch(__path__[0])
99
51
        rh = branch.revision_history()
100
52
        if rh:
101
53
            return len(rh), rh[-1]
102
54
        else:
103
55
            return None
104
 
    except bzrlib.errors.BzrError:
 
56
    except BzrError:
105
57
        return None
106
58
    
107
 
def test_suite():
108
 
    import selftest
109
 
    return selftest.test_suite()