1
# Copyright (C) 2006-2010 Canonical Ltd
1
# Copyright (C) 2005, 2006 Canonical Ltd
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
30
from trace import warning
28
# This was the full ignore list for bzr 0.8
29
# please keep these sorted (in C locale order) to aid merging
51
# Our setup tests dump .python-eggs in the bzr source tree root
65
'.sw[nop]', # vim editing nameless file
32
88
# ~/.bazaar/ignore will be filled out using
33
89
# this ignore list, if it does not exist
48
103
def parse_ignore_file(f):
49
"""Read in all of the lines in the file and turn it into an ignore list
51
Continue in the case of utf8 decoding errors, and emit a warning when
52
such and error is found. Optimise for the common case -- no decoding
104
"""Read in all of the lines in the file and turn it into an ignore list"""
56
ignore_file = f.read()
58
# Try and parse whole ignore file at once.
59
unicode_lines = ignore_file.decode('utf8').split('\n')
60
except UnicodeDecodeError:
61
# Otherwise go though line by line and pick out the 'good'
63
lines = ignore_file.split('\n')
65
for line_number, line in enumerate(lines):
67
unicode_lines.append(line.decode('utf-8'))
68
except UnicodeDecodeError:
69
# report error about line (idx+1)
70
warning('.bzrignore: On Line #%d, malformed utf8 character. '
71
'Ignoring line.' % (line_number+1))
73
# Append each line to ignore list if it's not a comment line
74
for line in unicode_lines:
106
for line in f.read().decode('utf8').split('\n'):
75
107
line = line.rstrip('\r\n')
76
108
if not line or line.startswith('#'):
180
212
def tree_ignores_add_patterns(tree, name_pattern_list):
181
"""Add more ignore patterns to the ignore file in a tree.
182
If ignore file does not exist then it will be created.
183
The ignore file will be automatically added under version control.
213
"""Retrieve a list of ignores from the ignore file in a tree.
185
:param tree: Working tree to update the ignore list.
186
:param name_pattern_list: List of ignore patterns.
215
:param tree: Tree to retrieve the ignore list from.
189
# read in the existing ignores set
190
218
ifn = tree.abspath(bzrlib.IGNORE_FILENAME)
191
219
if tree.has_filename(ifn):
194
file_contents = f.read()
195
# figure out what kind of line endings are used
196
newline = getattr(f, 'newlines', None)
197
if type(newline) is tuple:
199
elif newline is None:
222
igns = f.read().decode('utf-8')
207
sio = StringIO(file_contents)
209
ignores = parse_ignore_file(sio)
213
# write out the updated ignores set
228
# TODO: If the file already uses crlf-style termination, maybe
229
# we should use that for the newly added lines?
231
if igns and igns[-1] != '\n':
233
for name_pattern in name_pattern_list:
234
igns += name_pattern + '\n'
214
236
f = atomicfile.AtomicFile(ifn, 'wb')
216
# write the original contents, preserving original line endings
217
f.write(newline.join(file_contents.split('\n')))
218
if len(file_contents) > 0 and not file_contents.endswith('\n'):
220
for pattern in name_pattern_list:
221
if not pattern in ignores:
222
f.write(pattern.encode('utf-8'))
238
f.write(igns.encode('utf-8'))
228
if not tree.path2id(bzrlib.IGNORE_FILENAME):
229
tree.add([bzrlib.IGNORE_FILENAME])
243
if not tree.path2id('.bzrignore'):
244
tree.add(['.bzrignore'])
added
removed
bzrlib/ignores.py
