← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/ignores.py

  • Committer: Vincent Ladeuil
  • Date: 2011-09-29 15:50:58 UTC
  • mfrom: (6177 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6178.
  • Revision ID: v.ladeuil+lp@free.fr-20110929155058-zgbecmx1huzktegm
Merge trunk and resolve conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/ignores.py
16
16
 
17
17
"""Lists of ignore files, etc."""
18
18
 
19
 
from __future__ import absolute_import
20
 
 
21
19
import errno
22
20
import os
23
21
from cStringIO import StringIO
29
27
    atomicfile,
30
28
    config,
31
29
    globbing,
32
 
    trace,
33
30
    )
 
31
 
 
32
from trace import warning
34
33
""")
35
34
 
36
35
# ~/.bazaar/ignore will be filled out using
73
72
                unicode_lines.append(line.decode('utf-8'))
74
73
            except UnicodeDecodeError:
75
74
                # report error about line (idx+1)
76
 
                trace.warning(
77
 
                        '.bzrignore: On Line #%d, malformed utf8 character. '
 
75
                warning('.bzrignore: On Line #%d, malformed utf8 character. '
78
76
                        'Ignoring line.' % (line_number+1))
79
77
 
80
78
    # Append each line to ignore list if it's not a comment line