/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/ignores.py

  • Committer: John Arbash Meinel
  • Date: 2011-04-22 14:12:22 UTC
  • mfrom: (5809 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5836.
  • Revision ID: john@arbash-meinel.com-20110422141222-nx2j0hbkihcb8j16
Merge newer bzr.dev and resolve conflicts.
Try to write some documentation about how the _dirblock_state works.
Fix up the tests so that they pass again.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/ignores.py
1
 
# Copyright (C) 2006-2010 Canonical Ltd
 
1
# Copyright (C) 2006-2011 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
21
21
from cStringIO import StringIO
22
22
 
23
23
import bzrlib
 
24
from bzrlib.lazy_import import lazy_import
 
25
lazy_import(globals(), """
24
26
from bzrlib import (
25
27
    atomicfile,
26
28
    config,
28
30
    )
29
31
 
30
32
from trace import warning
 
33
""")
31
34
 
32
35
# ~/.bazaar/ignore will be filled out using
33
36
# this ignore list, if it does not exist
41
44
    '*~',
42
45
    '.#*',
43
46
    '[#]*#',
 
47
    '__pycache__',
 
48
    'bzr-orphans',
44
49
]
45
50
 
46
51