~bzr-pqm/bzr/bzr.dev

5752.3.8 by John Arbash Meinel
Merge bzr.dev 5764 to resolve release-notes (aka NEWS) conflicts
1
# Copyright (C) 2006-2011 Canonical Ltd
1836.1.12 by John Arbash Meinel
Move ignores into a file of their own, make DEFAULT_IGNORE a deprecated list. Create deprecated_list in symbol versioning.
2
#
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
#
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
#
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
1836.1.12 by John Arbash Meinel
Move ignores into a file of their own, make DEFAULT_IGNORE a deprecated list. Create deprecated_list in symbol versioning.
16
6379.6.7 by Jelmer Vernooij
Move importing from future until after doc string, otherwise the doc string will disappear.
17
"""Lists of ignore files, etc."""
18
6379.6.3 by Jelmer Vernooij
Use absolute_import.
19
from __future__ import absolute_import
20
1836.1.13 by John Arbash Meinel
Adding functions for getting user ignores.
21
import errno
5195.2.8 by Gordon Tyler
Fixed preservation of existing line endings and added tests for that and Unicode handling.
22
import os
5195.2.7 by Gordon Tyler
Use cStringIO instead.
23
from cStringIO import StringIO
1836.1.13 by John Arbash Meinel
Adding functions for getting user ignores.
24
3528.2.3 by Jelmer Vernooij
use constant for ignore file filename.
25
import bzrlib
5745.2.1 by Jelmer Vernooij
Use lazy_import in bzrlib.ignores.
26
from bzrlib.lazy_import import lazy_import
27
lazy_import(globals(), """
2298.8.1 by Kent Gibson
Normalise ignore patterns to use '/' path separator.
28
from bzrlib import (
3528.2.1 by Jelmer Vernooij
Move functionality to add ignores to the ignore file into a separate function.
29
    atomicfile,
2298.8.1 by Kent Gibson
Normalise ignore patterns to use '/' path separator.
30
    config,
31
    globbing,
6355.2.5 by Jelmer Vernooij
Fix another relative import.
32
    trace,
2298.8.1 by Kent Gibson
Normalise ignore patterns to use '/' path separator.
33
    )
5745.2.1 by Jelmer Vernooij
Use lazy_import in bzrlib.ignores.
34
""")
5119.1.5 by Jason Spashett
Iff character decoding error occurs during processing of .bzrignore, parse line by line to fish out valid utf8 lines.
35
1836.1.12 by John Arbash Meinel
Move ignores into a file of their own, make DEFAULT_IGNORE a deprecated list. Create deprecated_list in symbol versioning.
36
# ~/.bazaar/ignore will be filled out using
37
# this ignore list, if it does not exist
38
# please keep these sorted (in C locale order) to aid merging
39
USER_DEFAULTS = [
40
    '*.a',
41
    '*.o',
42
    '*.py[co]',
43
    '*.so',
2135.2.2 by Kent Gibson
Ignore pattern matcher (glob.py) patches:
44
    '*.sw[nop]',
1836.1.12 by John Arbash Meinel
Move ignores into a file of their own, make DEFAULT_IGNORE a deprecated list. Create deprecated_list in symbol versioning.
45
    '*~',
46
    '.#*',
47
    '[#]*#',
5403.1.1 by Andrea Corbellini
Ignore __pycache__ directories.
48
    '__pycache__',
5409.1.21 by Vincent Ladeuil
Add 'bzr-orphans' to USER_DEFAULTS in bzrlib/ignores.py.
49
    'bzr-orphans',
1836.1.12 by John Arbash Meinel
Move ignores into a file of their own, make DEFAULT_IGNORE a deprecated list. Create deprecated_list in symbol versioning.
50
]
1836.1.13 by John Arbash Meinel
Adding functions for getting user ignores.
51
52
5119.1.5 by Jason Spashett
Iff character decoding error occurs during processing of .bzrignore, parse line by line to fish out valid utf8 lines.
53
1836.1.13 by John Arbash Meinel
Adding functions for getting user ignores.
54
def parse_ignore_file(f):
5119.1.5 by Jason Spashett
Iff character decoding error occurs during processing of .bzrignore, parse line by line to fish out valid utf8 lines.
55
    """Read in all of the lines in the file and turn it into an ignore list
56
    
57
    Continue in the case of utf8 decoding errors, and emit a warning when 
58
    such and error is found. Optimise for the common case -- no decoding 
59
    errors.
60
    """
1836.1.30 by John Arbash Meinel
Change ignore functions to use sets instead of lists.
61
    ignored = set()
5119.1.5 by Jason Spashett
Iff character decoding error occurs during processing of .bzrignore, parse line by line to fish out valid utf8 lines.
62
    ignore_file = f.read()
63
    try:
64
        # Try and parse whole ignore file at once.
65
        unicode_lines = ignore_file.decode('utf8').split('\n')
66
    except UnicodeDecodeError:
67
        # Otherwise go though line by line and pick out the 'good'
68
        # decodable lines
69
        lines = ignore_file.split('\n')
5184.1.1 by Vincent Ladeuil
Random cleanups to catch up with copyright updates in trunk.
70
        unicode_lines = []
5119.1.5 by Jason Spashett
Iff character decoding error occurs during processing of .bzrignore, parse line by line to fish out valid utf8 lines.
71
        for line_number, line in enumerate(lines):
72
            try:
73
                unicode_lines.append(line.decode('utf-8'))
74
            except UnicodeDecodeError:
75
                # report error about line (idx+1)
6355.2.5 by Jelmer Vernooij
Fix another relative import.
76
                trace.warning(
77
                        '.bzrignore: On Line #%d, malformed utf8 character. '
5119.1.5 by Jason Spashett
Iff character decoding error occurs during processing of .bzrignore, parse line by line to fish out valid utf8 lines.
78
                        'Ignoring line.' % (line_number+1))
5184.1.1 by Vincent Ladeuil
Random cleanups to catch up with copyright updates in trunk.
79
5119.1.5 by Jason Spashett
Iff character decoding error occurs during processing of .bzrignore, parse line by line to fish out valid utf8 lines.
80
    # Append each line to ignore list if it's not a comment line
81
    for line in unicode_lines:
5119.1.3 by Jason Spashett
Reverse merge 4670..4668
82
        line = line.rstrip('\r\n')
83
        if not line or line.startswith('#'):
84
            continue
85
        ignored.add(globbing.normalize_pattern(line))
1836.1.13 by John Arbash Meinel
Adding functions for getting user ignores.
86
    return ignored
87
88
89
def get_user_ignores():
90
    """Get the list of user ignored files, possibly creating it."""
91
    path = config.user_ignore_config_filename()
1836.1.30 by John Arbash Meinel
Change ignore functions to use sets instead of lists.
92
    patterns = set(USER_DEFAULTS)
1836.1.13 by John Arbash Meinel
Adding functions for getting user ignores.
93
    try:
94
        f = open(path, 'rb')
95
    except (IOError, OSError), e:
1836.1.25 by John Arbash Meinel
cleanups suggested by Martin.
96
        # open() shouldn't return an IOError without errno, but just in case
97
        err = getattr(e, 'errno', None)
98
        if err not in (errno.ENOENT,):
1836.1.13 by John Arbash Meinel
Adding functions for getting user ignores.
99
            raise
100
        # Create the ignore file, and just return the default
1836.1.15 by John Arbash Meinel
Updated WorkingTree to use the new user-level ignores.
101
        # We want to ignore if we can't write to the file
102
        # since get_* should be a safe operation
103
        try:
1836.1.31 by John Arbash Meinel
Make set_user_ignores a private function, and update the doc string to recommend it isn't used.
104
            _set_user_ignores(USER_DEFAULTS)
1836.1.15 by John Arbash Meinel
Updated WorkingTree to use the new user-level ignores.
105
        except (IOError, OSError), e:
106
            if e.errno not in (errno.EPERM,):
107
                raise
1836.1.13 by John Arbash Meinel
Adding functions for getting user ignores.
108
        return patterns
109
110
    try:
111
        return parse_ignore_file(f)
112
    finally:
113
        f.close()
1836.1.14 by John Arbash Meinel
Adding a helper function that will only add patterns if they are missing.
114
115
1836.1.31 by John Arbash Meinel
Make set_user_ignores a private function, and update the doc string to recommend it isn't used.
116
def _set_user_ignores(patterns):
1836.1.15 by John Arbash Meinel
Updated WorkingTree to use the new user-level ignores.
117
    """Fill out the user ignore file with the given patterns
118
119
    This may raise an error if it doesn't have permission to
120
    write to the user ignore file.
1836.1.31 by John Arbash Meinel
Make set_user_ignores a private function, and update the doc string to recommend it isn't used.
121
    This is mostly used for testing, since it would be
122
    bad form to rewrite a user's ignore list.
123
    bzrlib only writes this file if it does not exist.
1836.1.15 by John Arbash Meinel
Updated WorkingTree to use the new user-level ignores.
124
    """
125
    ignore_path = config.user_ignore_config_filename()
126
    config.ensure_config_dir_exists()
127
128
    # Create an empty file
129
    f = open(ignore_path, 'wb')
130
    try:
131
        for pattern in patterns:
132
            f.write(pattern.encode('utf8') + '\n')
133
    finally:
134
        f.close()
135
136
1836.1.14 by John Arbash Meinel
Adding a helper function that will only add patterns if they are missing.
137
def add_unique_user_ignores(new_ignores):
138
    """Add entries to the user's ignore list if not present.
139
140
    :param new_ignores: A list of ignore patterns
141
    :return: The list of ignores that were added
142
    """
1836.1.30 by John Arbash Meinel
Change ignore functions to use sets instead of lists.
143
    ignored = get_user_ignores()
1836.1.14 by John Arbash Meinel
Adding a helper function that will only add patterns if they are missing.
144
    to_add = []
145
    for ignore in new_ignores:
2298.8.1 by Kent Gibson
Normalise ignore patterns to use '/' path separator.
146
        ignore = globbing.normalize_pattern(ignore)
1836.1.14 by John Arbash Meinel
Adding a helper function that will only add patterns if they are missing.
147
        if ignore not in ignored:
148
            ignored.add(ignore)
149
            to_add.append(ignore)
150
151
    if not to_add:
152
        return []
153
154
    f = open(config.user_ignore_config_filename(), 'ab')
155
    try:
156
        for pattern in to_add:
157
            f.write(pattern.encode('utf8') + '\n')
158
    finally:
159
        f.close()
160
161
    return to_add
1836.1.28 by John Arbash Meinel
Add a function for adding runtime ignores.
162
163
164
_runtime_ignores = set()
165
166
167
def add_runtime_ignores(ignores):
168
    """Add some ignore patterns that only exists in memory.
169
170
    This is used by some plugins that want bzr to ignore files,
171
    but don't want to change a users ignore list.
1711.2.105 by John Arbash Meinel
Updated doc
172
    (Such as a conversion script that needs to ignore temporary files,
173
    but does not want to modify the project's ignore list.)
1836.1.28 by John Arbash Meinel
Add a function for adding runtime ignores.
174
175
    :param ignores: A list or generator of ignore patterns.
176
    :return: None
177
    """
178
    global _runtime_ignores
179
    _runtime_ignores.update(set(ignores))
180
181
182
def get_runtime_ignores():
183
    """Get the current set of runtime ignores."""
184
    return _runtime_ignores
3528.2.1 by Jelmer Vernooij
Move functionality to add ignores to the ignore file into a separate function.
185
186
187
def tree_ignores_add_patterns(tree, name_pattern_list):
5195.1.1 by Alexander Belchenko
rewrited docstring for tree_ignores_add_patterns function to reflect the reality. also changed literal .bzrignore to bzrlib.IGNORE_FILENAME to keep consistency within that function.
188
    """Add more ignore patterns to the ignore file in a tree.
189
    If ignore file does not exist then it will be created.
190
    The ignore file will be automatically added under version control.
3528.2.1 by Jelmer Vernooij
Move functionality to add ignores to the ignore file into a separate function.
191
5195.1.1 by Alexander Belchenko
rewrited docstring for tree_ignores_add_patterns function to reflect the reality. also changed literal .bzrignore to bzrlib.IGNORE_FILENAME to keep consistency within that function.
192
    :param tree: Working tree to update the ignore list.
5195.2.1 by Gordon Tyler
Fixed tree_ignores_add_patterns to not duplicate existing patterns in the ignore file.
193
    :param name_pattern_list: List of ignore patterns.
194
    :return: None
3528.2.1 by Jelmer Vernooij
Move functionality to add ignores to the ignore file into a separate function.
195
    """
5195.2.1 by Gordon Tyler
Fixed tree_ignores_add_patterns to not duplicate existing patterns in the ignore file.
196
    # read in the existing ignores set
3528.2.3 by Jelmer Vernooij
use constant for ignore file filename.
197
    ifn = tree.abspath(bzrlib.IGNORE_FILENAME)
3528.2.1 by Jelmer Vernooij
Move functionality to add ignores to the ignore file into a separate function.
198
    if tree.has_filename(ifn):
5195.2.8 by Gordon Tyler
Fixed preservation of existing line endings and added tests for that and Unicode handling.
199
        f = open(ifn, 'rU')
3528.2.1 by Jelmer Vernooij
Move functionality to add ignores to the ignore file into a separate function.
200
        try:
5195.2.8 by Gordon Tyler
Fixed preservation of existing line endings and added tests for that and Unicode handling.
201
            file_contents = f.read()
5195.2.1 by Gordon Tyler
Fixed tree_ignores_add_patterns to not duplicate existing patterns in the ignore file.
202
            # figure out what kind of line endings are used
203
            newline = getattr(f, 'newlines', None)
204
            if type(newline) is tuple:
205
                newline = newline[0]
206
            elif newline is None:
5195.2.8 by Gordon Tyler
Fixed preservation of existing line endings and added tests for that and Unicode handling.
207
                newline = os.linesep
3528.2.1 by Jelmer Vernooij
Move functionality to add ignores to the ignore file into a separate function.
208
        finally:
209
            f.close()
210
    else:
5195.2.8 by Gordon Tyler
Fixed preservation of existing line endings and added tests for that and Unicode handling.
211
        file_contents = ""
212
        newline = os.linesep
213
    
214
    sio = StringIO(file_contents)
215
    try:
216
        ignores = parse_ignore_file(sio)
217
    finally:
218
        sio.close()
219
    
220
    # write out the updated ignores set
221
    f = atomicfile.AtomicFile(ifn, 'wb')
222
    try:
223
        # write the original contents, preserving original line endings
224
        f.write(newline.join(file_contents.split('\n')))
225
        if len(file_contents) > 0 and not file_contents.endswith('\n'):
226
            f.write(newline)
227
        for pattern in name_pattern_list:
228
            if not pattern in ignores:
229
                f.write(pattern.encode('utf-8'))
5195.2.1 by Gordon Tyler
Fixed tree_ignores_add_patterns to not duplicate existing patterns in the ignore file.
230
                f.write(newline)
5195.2.8 by Gordon Tyler
Fixed preservation of existing line endings and added tests for that and Unicode handling.
231
        f.commit()
3528.2.1 by Jelmer Vernooij
Move functionality to add ignores to the ignore file into a separate function.
232
    finally:
5195.2.8 by Gordon Tyler
Fixed preservation of existing line endings and added tests for that and Unicode handling.
233
        f.close()
3528.2.1 by Jelmer Vernooij
Move functionality to add ignores to the ignore file into a separate function.
234
5195.1.1 by Alexander Belchenko
rewrited docstring for tree_ignores_add_patterns function to reflect the reality. also changed literal .bzrignore to bzrlib.IGNORE_FILENAME to keep consistency within that function.
235
    if not tree.path2id(bzrlib.IGNORE_FILENAME):
236
        tree.add([bzrlib.IGNORE_FILENAME])