19
from inventory import Inventory, InventoryEntry
20
from branch import Branch, ScratchBranch
21
from osutils import format_date
23
from diff import diff_trees
24
from trace import mutter, warning
29
21
DEFAULT_IGNORE = ['.bzr.log',
30
22
'*~', '#*#', '*$', '.#*',
23
'.*.sw[nop]', '.*.tmp',
31
24
'*.tmp', '*.bak', '*.BAK', '*.orig',
32
25
'*.o', '*.obj', '*.a', '*.py[oc]', '*.so', '*.exe', '*.elc',
33
'{arch}', 'CVS', '.svn', '_darcs', 'SCCS', 'RCS',
26
'{arch}', 'CVS', 'CVS.adm', '.svn', '_darcs', 'SCCS', 'RCS',
35
'TAGS', '.make.state', '.sconsign', '.tmp*']
30
'TAGS', '.make.state', '.sconsign', '.tmp*',
37
34
IGNORE_FILENAME = ".bzrignore"
40
user_encoding = locale.getpreferredencoding()
38
user_encoding = locale.getpreferredencoding() or 'ascii'
42
41
__copyright__ = "Copyright 2005 Canonical Development Ltd."
43
__author__ = "Martin Pool <mbp@canonical.com>"
44
__version__ = '0.0.5pre'
42
__version__ = '0.6pre'
45
def get_bzr_revision():
46
"""If bzr is run from a branch, return (revno,revid) or None"""
48
from bzrlib.branch import Branch
51
branch = Branch.open(os.path.dirname(__path__[0]))
52
rh = branch.revision_history()
54
return len(rh), rh[-1]
57
except bzrlib.errors.BzrError:
62
return selftest.test_suite()