← 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-11-28 08:03:42 UTC
  • mto: (1185.33.61 bzr.dev)
  • mto: This revision was merged to the branch mainline in revision 1518.
  • Revision ID: mbp@sourcefrog.net-20051128080342-b7db3190dca90484
[broken] start converting basic_io to more rfc822-like format

Suggestions from mailing list:
 
  no double quotes
  no cute right-alignment
  no escaping
  just indent continuation lines

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 inventory import Inventory, InventoryEntry
20
 
from branch import Branch, ScratchBranch, find_branch
21
 
from osutils import format_date
22
 
from tree import Tree
23
 
from diff import compare_trees
24
 
from trace import mutter, warning, open_tracefile
25
 
from log import show_log
26
 
import add
27
 
 
28
19
BZRDIR = ".bzr"
29
20
 
30
 
DEFAULT_IGNORE = ['.bzr.log',
31
 
                  '*~', '#*#', '*$', '.#*',
32
 
                  '.*.sw[nop]', '.*.tmp',
33
 
                  '*.tmp', '*.bak', '*.BAK', '*.orig',
34
 
                  '*.o', '*.obj', '*.a', '*.py[oc]', '*.so', '*.exe', '*.elc', 
35
 
                  '{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
                  '*$',
36
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*',
37
56
                  'BitKeeper',
38
 
                  '.git',
39
 
                  'TAGS', '.make.state', '.sconsign', '.tmp*',
40
 
                  '.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
                  ]
41
78
 
42
79
IGNORE_FILENAME = ".bzrignore"
43
80
 
 
81
import os
44
82
import locale
45
 
user_encoding = locale.getpreferredencoding()
 
83
user_encoding = locale.getpreferredencoding() or 'ascii'
46
84
del locale
47
85
 
48
86
__copyright__ = "Copyright 2005 Canonical Development Ltd."
49
 
__author__ = "Martin Pool <mbp@canonical.com>"
50
 
__version__ = '0.0.5pre'
 
87
__version__ = version_string = '0.7pre'
 
88
# same format as sys.version_info
 
89
version_info = (0, 7, 0, 'pre', 0)
51
90
 
52
91
 
53
92
def get_bzr_revision():
54
93
    """If bzr is run from a branch, return (revno,revid) or None"""
55
 
    from errors import BzrError
 
94
    import bzrlib.errors
 
95
    from bzrlib.branch import Branch
 
96
    
56
97
    try:
57
 
        branch = Branch(__path__[0])
 
98
        branch = Branch.open(os.path.dirname(__path__[0]))
58
99
        rh = branch.revision_history()
59
100
        if rh:
60
101
            return len(rh), rh[-1]
61
102
        else:
62
103
            return None
63
 
    except BzrError:
 
104
    except bzrlib.errors.BzrError:
64
105
        return None
65
106
    
 
107
def test_suite():
 
108
    import tests
 
109
    return tests.test_suite()