← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/__init__.py

  • Committer: Martin Pool
  • Date: 2005-09-30 06:39:42 UTC
  • mfrom: (1185.10.11)
  • mto: (1185.14.2)
  • mto: This revision was merged to the branch mainline in revision 1396.
  • Revision ID: mbp@sourcefrog.net-20050930063942-3eab86500bffba49
- merge merge and export fixes from aaron
aaron.bentley@utoronto.ca-20050930040234-71c1a151f795e806

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/__init__.py
16
16
 
17
17
"""bzr library"""
18
18
 
19
 
from branch import Branch, ScratchBranch, find_branch
20
 
from errors import BzrError
21
 
 
22
19
BZRDIR = ".bzr"
23
20
 
24
21
DEFAULT_IGNORE = ['.bzr.log',
31
28
                  'BitKeeper',
32
29
                  '.git',
33
30
                  'TAGS', '.make.state', '.sconsign', '.tmp*',
34
 
                  '.del-*']
 
31
                  '.del-*',
 
32
                  '.DS_Store',]
35
33
 
36
34
IGNORE_FILENAME = ".bzrignore"
37
35
 
 
36
import os
38
37
import locale
39
38
user_encoding = locale.getpreferredencoding() or 'ascii'
40
39
del locale
41
40
 
42
41
__copyright__ = "Copyright 2005 Canonical Development Ltd."
43
 
__author__ = "Martin Pool <mbp@canonical.com>"
44
 
__version__ = '0.0.5'
 
42
__version__ = '0.10pre(newformat)'
45
43
 
46
44
 
47
45
def get_bzr_revision():
48
46
    """If bzr is run from a branch, return (revno,revid) or None"""
 
47
    import bzrlib.errors
 
48
    from bzrlib.branch import Branch
 
49
    
49
50
    try:
50
 
        branch = Branch(__path__[0])
 
51
        branch = Branch.open(os.path.dirname(__path__[0]))
51
52
        rh = branch.revision_history()
52
53
        if rh:
53
54
            return len(rh), rh[-1]
54
55
        else:
55
56
            return None
56
 
    except BzrError:
 
57
    except bzrlib.errors.BzrError:
57
58
        return None
58
59
    
 
60
def test_suite():
 
61
    import selftest
 
62
    return selftest.test_suite()