← 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: 2005-08-25 13:10:25 UTC
  • mfrom: (974.1.38)
  • mto: (1092.1.42) (1185.3.4)
  • mto: This revision was merged to the branch mainline in revision 1178.
  • Revision ID: abentley@panoramicfeedback.com-20050825131025-2aa94bcbbd646a00
Fixed return value when not an ImmutableStore

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
 
19
# TODO: Do less imports here
20
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
 
21
from errors import BzrError
27
22
 
28
23
BZRDIR = ".bzr"
29
24
 
30
25
DEFAULT_IGNORE = ['.bzr.log',
31
26
                  '*~', '#*#', '*$', '.#*',
32
 
                  '.*.swp', '.*.tmp',
 
27
                  '.*.sw[nop]', '.*.tmp',
33
28
                  '*.tmp', '*.bak', '*.BAK', '*.orig',
34
29
                  '*.o', '*.obj', '*.a', '*.py[oc]', '*.so', '*.exe', '*.elc', 
35
30
                  '{arch}', 'CVS', 'CVS.adm', '.svn', '_darcs', 'SCCS', 'RCS',
36
31
                  '*,v',
37
32
                  'BitKeeper',
 
33
                  '.git',
38
34
                  'TAGS', '.make.state', '.sconsign', '.tmp*',
39
35
                  '.del-*']
40
36
 
41
37
IGNORE_FILENAME = ".bzrignore"
42
38
 
43
39
import locale
44
 
user_encoding = locale.getpreferredencoding()
 
40
user_encoding = locale.getpreferredencoding() or 'ascii'
45
41
del locale
46
42
 
47
43
__copyright__ = "Copyright 2005 Canonical Development Ltd."
48
44
__author__ = "Martin Pool <mbp@canonical.com>"
49
 
__version__ = '0.0.5pre'
 
45
__version__ = '0.0.5'
50
46
 
51
47
 
52
48
def get_bzr_revision():
53
49
    """If bzr is run from a branch, return (revno,revid) or None"""
54
 
    from errors import BzrError
55
50
    try:
56
51
        branch = Branch(__path__[0])
57
52
        rh = branch.revision_history()