19
19
from inventory import Inventory, InventoryEntry
20
from branch import Branch, ScratchBranch, find_branch
20
from branch import Branch, ScratchBranch
21
21
from osutils import format_date
22
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
23
from diff import diff_trees
24
from trace import mutter, warning
30
29
DEFAULT_IGNORE = ['.bzr.log',
31
30
'*~', '#*#', '*$', '.#*',
32
'.*.sw[nop]', '.*.tmp',
33
31
'*.tmp', '*.bak', '*.BAK', '*.orig',
34
32
'*.o', '*.obj', '*.a', '*.py[oc]', '*.so', '*.exe', '*.elc',
35
'{arch}', 'CVS', 'CVS.adm', '.svn', '_darcs', 'SCCS', 'RCS',
33
'{arch}', 'CVS', '.svn', '_darcs', 'SCCS', 'RCS',
39
'TAGS', '.make.state', '.sconsign', '.tmp*',
35
'TAGS', '.make.state', '.sconsign', '.tmp*']
42
37
IGNORE_FILENAME = ".bzrignore"
45
40
user_encoding = locale.getpreferredencoding()
48
42
__copyright__ = "Copyright 2005 Canonical Development Ltd."
49
43
__author__ = "Martin Pool <mbp@canonical.com>"
50
44
__version__ = '0.0.5pre'
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]
added
removed
bzrlib/__init__.py
