~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/__init__.py

  • Committer: Martin Pool
  • Date: 2005-06-06 04:47:33 UTC
  • Revision ID: mbp@sourcefrog.net-20050606044733-e902b05ac1747cd2
- fix invocation of testbzr when giving explicit bzr location

Show diffs side-by-side

added added

removed removed

Lines of Context:
16
16
 
17
17
"""bzr library"""
18
18
 
 
19
from inventory import Inventory, InventoryEntry
19
20
from branch import Branch, ScratchBranch, find_branch
20
 
from errors import BzrError
 
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
27
 
22
28
BZRDIR = ".bzr"
23
29
 
36
42
IGNORE_FILENAME = ".bzrignore"
37
43
 
38
44
import locale
39
 
user_encoding = locale.getpreferredencoding() or 'ascii'
 
45
user_encoding = locale.getpreferredencoding()
40
46
del locale
41
47
 
42
48
__copyright__ = "Copyright 2005 Canonical Development Ltd."
43
49
__author__ = "Martin Pool <mbp@canonical.com>"
44
 
__version__ = '0.0.5'
 
50
__version__ = '0.0.5pre'
45
51
 
46
52
 
47
53
def get_bzr_revision():
48
54
    """If bzr is run from a branch, return (revno,revid) or None"""
 
55
    from errors import BzrError
49
56
    try:
50
57
        branch = Branch(__path__[0])
51
58
        rh = branch.revision_history()