~bzr-pqm/bzr/bzr.dev

4597.9.5 by Vincent Ladeuil
Merge bzr.dev into cleanup
1
# Copyright (C) 2006-2010 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
17
"""Lists of ignore files, etc."""
18
1836.1.13 by John Arbash Meinel
Adding functions for getting user ignores.
19
import errno
5195.2.8 by Gordon Tyler
Fixed preservation of existing line endings and added tests for that and Unicode handling.
20
import os
5195.2.7 by Gordon Tyler
Use cStringIO instead.
21
from cStringIO import StringIO
1836.1.13 by John Arbash Meinel
Adding functions for getting user ignores.
22
3528.2.3 by Jelmer Vernooij
use constant for ignore file filename.
23
import bzrlib
2298.8.1 by Kent Gibson
Normalise ignore patterns to use '/' path separator.
24
from bzrlib import (
3528.2.1 by Jelmer Vernooij
Move functionality to add ignores to the ignore file into a separate function.
25
    atomicfile,
2298.8.1 by Kent Gibson
Normalise ignore patterns to use '/' path separator.
26
    config,
27
    globbing,
28
    )
1836.1.13 by John Arbash Meinel
Adding functions for getting user ignores.
29
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.
30
from trace import warning
31
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.
32
# ~/.bazaar/ignore will be filled out using
33
# this ignore list, if it does not exist
34
# please keep these sorted (in C locale order) to aid merging
35
USER_DEFAULTS = [
36
    '*.a',
37
    '*.o',
38
    '*.py[co]',
39
    '*.so',
2135.2.2 by Kent Gibson
Ignore pattern matcher (glob.py) patches:
40
    '*.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.
41
    '*~',
42
    '.#*',
43
    '[#]*#',
5403.1.1 by Andrea Corbellini
Ignore __pycache__ directories.
44
    '__pycache__',
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
]
1836.1.13 by John Arbash Meinel
Adding functions for getting user ignores.
46
47
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.
48
1836.1.13 by John Arbash Meinel
Adding functions for getting user ignores.
49
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.
50
    """Read in all of the lines in the file and turn it into an ignore list
51
    
52
    Continue in the case of utf8 decoding errors, and emit a warning when 
53
    such and error is found. Optimise for the common case -- no decoding 
54
    errors.
55
    """
1836.1.30 by John Arbash Meinel
Change ignore functions to use sets instead of lists.
56
    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.
57
    ignore_file = f.read()
58
    try:
59
        # Try and parse whole ignore file at once.
60
        unicode_lines = ignore_file.decode('utf8').split('\n')
61
    except UnicodeDecodeError:
62
        # Otherwise go though line by line and pick out the 'good'
63
        # decodable lines
64
        lines = ignore_file.split('\n')
5184.1.1 by Vincent Ladeuil
Random cleanups to catch up with copyright updates in trunk.
65
        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.
66
        for line_number, line in enumerate(lines):
67
            try:
68
                unicode_lines.append(line.decode('utf-8'))
69
            except UnicodeDecodeError:
70
                # report error about line (idx+1)
71
                warning('.bzrignore: On Line #%d, malformed utf8 character. '
72
                        'Ignoring line.' % (line_number+1))
5184.1.1 by Vincent Ladeuil
Random cleanups to catch up with copyright updates in trunk.
73
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.
74
    # Append each line to ignore list if it's not a comment line
75
    for line in unicode_lines:
5119.1.3 by Jason Spashett
Reverse merge 4670..4668
76
        line = line.rstrip('\r\n')
77
        if not line or line.startswith('#'):
78
            continue
79
        ignored.add(globbing.normalize_pattern(line))
1836.1.13 by John Arbash Meinel
Adding functions for getting user ignores.
80
    return ignored
81
82
83
def get_user_ignores():
84
    """Get the list of user ignored files, possibly creating it."""
85
    path = config.user_ignore_config_filename()
1836.1.30 by John Arbash Meinel
Change ignore functions to use sets instead of lists.
86
    patterns = set(USER_DEFAULTS)
1836.1.13 by John Arbash Meinel
Adding functions for getting user ignores.
87
    try:
88
        f = open(path, 'rb')
89
    except (IOError, OSError), e:
1836.1.25 by John Arbash Meinel
cleanups suggested by Martin.
90
        # open() shouldn't return an IOError without errno, but just in case
91
        err = getattr(e, 'errno', None)
92
        if err not in (errno.ENOENT,):
1836.1.13 by John Arbash Meinel
Adding functions for getting user ignores.
93
            raise
94
        # 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.
95
        # We want to ignore if we can't write to the file
96
        # since get_* should be a safe operation
97
        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.
98
            _set_user_ignores(USER_DEFAULTS)
1836.1.15 by John Arbash Meinel
Updated WorkingTree to use the new user-level ignores.
99
        except (IOError, OSError), e:
100
            if e.errno not in (errno.EPERM,):
101
                raise
1836.1.13 by John Arbash Meinel
Adding functions for getting user ignores.
102
        return patterns
103
104
    try:
105
        return parse_ignore_file(f)
106
    finally:
107
        f.close()
1836.1.14 by John Arbash Meinel
Adding a helper function that will only add patterns if they are missing.
108
109
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.
110
def _set_user_ignores(patterns):
1836.1.15 by John Arbash Meinel
Updated WorkingTree to use the new user-level ignores.
111
    """Fill out the user ignore file with the given patterns
112
113
    This may raise an error if it doesn't have permission to
114
    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.
115
    This is mostly used for testing, since it would be
116
    bad form to rewrite a user's ignore list.
117
    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.
118
    """
119
    ignore_path = config.user_ignore_config_filename()
120
    config.ensure_config_dir_exists()
121
122
    # Create an empty file
123
    f = open(ignore_path, 'wb')
124
    try:
125
        for pattern in patterns:
126
            f.write(pattern.encode('utf8') + '\n')
127
    finally:
128
        f.close()
129
130
1836.1.14 by John Arbash Meinel
Adding a helper function that will only add patterns if they are missing.
131
def add_unique_user_ignores(new_ignores):
132
    """Add entries to the user's ignore list if not present.
133
134
    :param new_ignores: A list of ignore patterns
135
    :return: The list of ignores that were added
136
    """
1836.1.30 by John Arbash Meinel
Change ignore functions to use sets instead of lists.
137
    ignored = get_user_ignores()
1836.1.14 by John Arbash Meinel
Adding a helper function that will only add patterns if they are missing.
138
    to_add = []
139
    for ignore in new_ignores:
2298.8.1 by Kent Gibson
Normalise ignore patterns to use '/' path separator.
140
        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.
141
        if ignore not in ignored:
142
            ignored.add(ignore)
143
            to_add.append(ignore)
144
145
    if not to_add:
146
        return []
147
148
    f = open(config.user_ignore_config_filename(), 'ab')
149
    try:
150
        for pattern in to_add:
151
            f.write(pattern.encode('utf8') + '\n')
152
    finally:
153
        f.close()
154
155
    return to_add
1836.1.28 by John Arbash Meinel
Add a function for adding runtime ignores.
156
157
158
_runtime_ignores = set()
159
160
161
def add_runtime_ignores(ignores):
162
    """Add some ignore patterns that only exists in memory.
163
164
    This is used by some plugins that want bzr to ignore files,
165
    but don't want to change a users ignore list.
1711.2.105 by John Arbash Meinel
Updated doc
166
    (Such as a conversion script that needs to ignore temporary files,
167
    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.
168
169
    :param ignores: A list or generator of ignore patterns.
170
    :return: None
171
    """
172
    global _runtime_ignores
173
    _runtime_ignores.update(set(ignores))
174
175
176
def get_runtime_ignores():
177
    """Get the current set of runtime ignores."""
178
    return _runtime_ignores
3528.2.1 by Jelmer Vernooij
Move functionality to add ignores to the ignore file into a separate function.
179
180
181
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.
182
    """Add more ignore patterns to the ignore file in a tree.
183
    If ignore file does not exist then it will be created.
184
    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.
185
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.
186
    :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.
187
    :param name_pattern_list: List of ignore patterns.
188
    :return: None
3528.2.1 by Jelmer Vernooij
Move functionality to add ignores to the ignore file into a separate function.
189
    """
5195.2.1 by Gordon Tyler
Fixed tree_ignores_add_patterns to not duplicate existing patterns in the ignore file.
190
    # read in the existing ignores set
3528.2.3 by Jelmer Vernooij
use constant for ignore file filename.
191
    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.
192
    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.
193
        f = open(ifn, 'rU')
3528.2.1 by Jelmer Vernooij
Move functionality to add ignores to the ignore file into a separate function.
194
        try:
5195.2.8 by Gordon Tyler
Fixed preservation of existing line endings and added tests for that and Unicode handling.
195
            file_contents = f.read()
5195.2.1 by Gordon Tyler
Fixed tree_ignores_add_patterns to not duplicate existing patterns in the ignore file.
196
            # figure out what kind of line endings are used
197
            newline = getattr(f, 'newlines', None)
198
            if type(newline) is tuple:
199
                newline = newline[0]
200
            elif newline is None:
5195.2.8 by Gordon Tyler
Fixed preservation of existing line endings and added tests for that and Unicode handling.
201
                newline = os.linesep
3528.2.1 by Jelmer Vernooij
Move functionality to add ignores to the ignore file into a separate function.
202
        finally:
203
            f.close()
204
    else:
5195.2.8 by Gordon Tyler
Fixed preservation of existing line endings and added tests for that and Unicode handling.
205
        file_contents = ""
206
        newline = os.linesep
207
    
208
    sio = StringIO(file_contents)
209
    try:
210
        ignores = parse_ignore_file(sio)
211
    finally:
212
        sio.close()
213
    
214
    # write out the updated ignores set
215
    f = atomicfile.AtomicFile(ifn, 'wb')
216
    try:
217
        # write the original contents, preserving original line endings
218
        f.write(newline.join(file_contents.split('\n')))
219
        if len(file_contents) > 0 and not file_contents.endswith('\n'):
220
            f.write(newline)
221
        for pattern in name_pattern_list:
222
            if not pattern in ignores:
223
                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.
224
                f.write(newline)
5195.2.8 by Gordon Tyler
Fixed preservation of existing line endings and added tests for that and Unicode handling.
225
        f.commit()
3528.2.1 by Jelmer Vernooij
Move functionality to add ignores to the ignore file into a separate function.
226
    finally:
5195.2.8 by Gordon Tyler
Fixed preservation of existing line endings and added tests for that and Unicode handling.
227
        f.close()
3528.2.1 by Jelmer Vernooij
Move functionality to add ignores to the ignore file into a separate function.
228
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.
229
    if not tree.path2id(bzrlib.IGNORE_FILENAME):
230
        tree.add([bzrlib.IGNORE_FILENAME])