19
from inventory import Inventory, InventoryEntry
20
from branch import Branch, ScratchBranch, find_branch
21
from osutils import format_date
23
from diff import compare_trees
24
from trace import mutter, warning, open_tracefile
25
from log import show_log
26
from plugin import load_plugins
21
# please keep these sorted (in C locale order) to aid merging
31
DEFAULT_IGNORE = ['.bzr.log',
32
'*~', '#*#', '*$', '.#*',
33
'.*.sw[nop]', '.*.tmp',
34
'*.tmp', '*.bak', '*.BAK', '*.orig',
35
'*.o', '*.obj', '*.a', '*.py[oc]', '*.so', '*.exe', '*.elc',
36
'{arch}', 'CVS', 'CVS.adm', '.svn', '_darcs', 'SCCS', 'RCS',
40
'TAGS', '.make.state', '.sconsign', '.tmp*',
79
43
IGNORE_FILENAME = ".bzrignore"
83
user_encoding = locale.getpreferredencoding() or 'ascii'
46
user_encoding = locale.getpreferredencoding()
86
49
__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)
50
__author__ = "Martin Pool <mbp@canonical.com>"
92
54
def get_bzr_revision():
93
55
"""If bzr is run from a branch, return (revno,revid) or None"""
95
from bzrlib.branch import Branch
56
from errors import BzrError
98
branch = Branch.open(os.path.dirname(__path__[0]))
58
branch = Branch(__path__[0])
99
59
rh = branch.revision_history()
101
61
return len(rh), rh[-1]
104
except bzrlib.errors.BzrError:
109
return selftest.test_suite()