20
19
from inventory import Inventory, InventoryEntry
21
from branch import Branch, ScratchBranch
20
from branch import Branch, ScratchBranch, find_branch
22
21
from osutils import format_date
23
22
from tree import Tree
24
from diff import diff_trees
23
from diff import compare_trees
24
from trace import mutter, warning, open_tracefile
25
from log import show_log
28
DEFAULT_IGNORE = ['.*', '*~', '#*#', '*.tmp', '*.o', '*.a', '*.py[oc]',
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',
39
'TAGS', '.make.state', '.sconsign', '.tmp*',
31
42
IGNORE_FILENAME = ".bzrignore"
45
user_encoding = locale.getpreferredencoding()
48
__copyright__ = "Copyright 2005 Canonical Development Ltd."
49
__author__ = "Martin Pool <mbp@canonical.com>"
53
def get_bzr_revision():
54
"""If bzr is run from a branch, return (revno,revid) or None"""
55
from errors import BzrError
57
branch = Branch(__path__[0])
58
rh = branch.revision_history()
60
return len(rh), rh[-1]