/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
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
7067.12.1 by Jelmer Vernooij
Fix an ignore test. Make AtomicFile a contextmanager.
22
from io import BytesIO
5195.2.8 by Gordon Tyler
Fixed preservation of existing line endings and added tests for that and Unicode handling.
23
import os
1836.1.13 by John Arbash Meinel
Adding functions for getting user ignores.
24
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
25
import breezy
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
26
from .lazy_import import lazy_import
5745.2.1 by Jelmer Vernooij
Use lazy_import in bzrlib.ignores.
27
lazy_import(globals(), """
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
28
from breezy 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
53
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.
54
    """Read in all of the lines in the file and turn it into an ignore list
7067.12.1 by Jelmer Vernooij
Fix an ignore test. Make AtomicFile a contextmanager.
55
56
    Continue in the case of utf8 decoding errors, and emit a warning when
57
    such and error is found. Optimise for the common case -- no decoding
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.
58
    errors.
59
    """
1836.1.30 by John Arbash Meinel
Change ignore functions to use sets instead of lists.
60
    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.
61
    ignore_file = f.read()
62
    try:
63
        # Try and parse whole ignore file at once.
64
        unicode_lines = ignore_file.decode('utf8').split('\n')
65
    except UnicodeDecodeError:
66
        # Otherwise go though line by line and pick out the 'good'
67
        # decodable lines
6809.2.1 by Martin
Make most of test_ignores pass on Python 3
68
        lines = ignore_file.split(b'\n')
5184.1.1 by Vincent Ladeuil
Random cleanups to catch up with copyright updates in trunk.
69
        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.
70
        for line_number, line in enumerate(lines):
71
            try:
72
                unicode_lines.append(line.decode('utf-8'))
73
            except UnicodeDecodeError:
74
                # report error about line (idx+1)
6355.2.5 by Jelmer Vernooij
Fix another relative import.
75
                trace.warning(
7143.15.2 by Jelmer Vernooij
Run autopep8.
76
                    '.bzrignore: On Line #%d, malformed utf8 character. '
77
                    'Ignoring line.' % (line_number + 1))
5184.1.1 by Vincent Ladeuil
Random cleanups to catch up with copyright updates in trunk.
78
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.
79
    # Append each line to ignore list if it's not a comment line
80
    for line in unicode_lines:
5119.1.3 by Jason Spashett
Reverse merge 4670..4668
81
        line = line.rstrip('\r\n')
82
        if not line or line.startswith('#'):
83
            continue
84
        ignored.add(globbing.normalize_pattern(line))
1836.1.13 by John Arbash Meinel
Adding functions for getting user ignores.
85
    return ignored
86
87
88
def get_user_ignores():
89
    """Get the list of user ignored files, possibly creating it."""
90
    path = config.user_ignore_config_filename()
1836.1.30 by John Arbash Meinel
Change ignore functions to use sets instead of lists.
91
    patterns = set(USER_DEFAULTS)
1836.1.13 by John Arbash Meinel
Adding functions for getting user ignores.
92
    try:
7067.16.7 by Jelmer Vernooij
Remove unnecessary changes.
93
        f = open(path, 'rb')
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
94
    except (IOError, OSError) as e:
1836.1.25 by John Arbash Meinel
cleanups suggested by Martin.
95
        # open() shouldn't return an IOError without errno, but just in case
96
        err = getattr(e, 'errno', None)
97
        if err not in (errno.ENOENT,):
1836.1.13 by John Arbash Meinel
Adding functions for getting user ignores.
98
            raise
99
        # 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.
100
        # We want to ignore if we can't write to the file
101
        # since get_* should be a safe operation
102
        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.
103
            _set_user_ignores(USER_DEFAULTS)
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
104
        except (IOError, OSError) as e:
1836.1.15 by John Arbash Meinel
Updated WorkingTree to use the new user-level ignores.
105
            if e.errno not in (errno.EPERM,):
106
                raise
1836.1.13 by John Arbash Meinel
Adding functions for getting user ignores.
107
        return patterns
108
109
    try:
110
        return parse_ignore_file(f)
111
    finally:
112
        f.close()
1836.1.14 by John Arbash Meinel
Adding a helper function that will only add patterns if they are missing.
113
114
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
def _set_user_ignores(patterns):
1836.1.15 by John Arbash Meinel
Updated WorkingTree to use the new user-level ignores.
116
    """Fill out the user ignore file with the given patterns
117
118
    This may raise an error if it doesn't have permission to
119
    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.
120
    This is mostly used for testing, since it would be
121
    bad form to rewrite a user's ignore list.
6622.1.34 by Jelmer Vernooij
Rename brzlib => breezy.
122
    breezy 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.
123
    """
124
    ignore_path = config.user_ignore_config_filename()
125
    config.ensure_config_dir_exists()
126
127
    # Create an empty file
6809.2.1 by Martin
Make most of test_ignores pass on Python 3
128
    with open(ignore_path, 'wb') as f:
1836.1.15 by John Arbash Meinel
Updated WorkingTree to use the new user-level ignores.
129
        for pattern in patterns:
6809.2.1 by Martin
Make most of test_ignores pass on Python 3
130
            f.write(pattern.encode('utf8') + b'\n')
1836.1.15 by John Arbash Meinel
Updated WorkingTree to use the new user-level ignores.
131
132
1836.1.14 by John Arbash Meinel
Adding a helper function that will only add patterns if they are missing.
133
def add_unique_user_ignores(new_ignores):
134
    """Add entries to the user's ignore list if not present.
135
136
    :param new_ignores: A list of ignore patterns
137
    :return: The list of ignores that were added
138
    """
1836.1.30 by John Arbash Meinel
Change ignore functions to use sets instead of lists.
139
    ignored = get_user_ignores()
1836.1.14 by John Arbash Meinel
Adding a helper function that will only add patterns if they are missing.
140
    to_add = []
141
    for ignore in new_ignores:
2298.8.1 by Kent Gibson
Normalise ignore patterns to use '/' path separator.
142
        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.
143
        if ignore not in ignored:
144
            ignored.add(ignore)
145
            to_add.append(ignore)
146
147
    if not to_add:
148
        return []
149
6809.2.1 by Martin
Make most of test_ignores pass on Python 3
150
    with open(config.user_ignore_config_filename(), 'ab') as f:
1836.1.14 by John Arbash Meinel
Adding a helper function that will only add patterns if they are missing.
151
        for pattern in to_add:
6809.2.1 by Martin
Make most of test_ignores pass on Python 3
152
            f.write(pattern.encode('utf8') + b'\n')
1836.1.14 by John Arbash Meinel
Adding a helper function that will only add patterns if they are missing.
153
154
    return to_add
1836.1.28 by John Arbash Meinel
Add a function for adding runtime ignores.
155
156
157
_runtime_ignores = set()
158
159
160
def add_runtime_ignores(ignores):
161
    """Add some ignore patterns that only exists in memory.
162
163
    This is used by some plugins that want bzr to ignore files,
164
    but don't want to change a users ignore list.
1711.2.105 by John Arbash Meinel
Updated doc
165
    (Such as a conversion script that needs to ignore temporary files,
166
    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.
167
168
    :param ignores: A list or generator of ignore patterns.
169
    :return: None
170
    """
171
    global _runtime_ignores
172
    _runtime_ignores.update(set(ignores))
173
174
175
def get_runtime_ignores():
176
    """Get the current set of runtime ignores."""
177
    return _runtime_ignores
3528.2.1 by Jelmer Vernooij
Move functionality to add ignores to the ignore file into a separate function.
178
179
180
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.
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.
3528.2.1 by Jelmer Vernooij
Move functionality to add ignores to the ignore file into a separate function.
184
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.
185
    :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.
186
    :param name_pattern_list: List of ignore patterns.
187
    :return: None
3528.2.1 by Jelmer Vernooij
Move functionality to add ignores to the ignore file into a separate function.
188
    """
5195.2.1 by Gordon Tyler
Fixed tree_ignores_add_patterns to not duplicate existing patterns in the ignore file.
189
    # read in the existing ignores set
6876.4.1 by Jelmer Vernooij
Add format setting with ignore filename.
190
    ifn = tree.abspath(tree._format.ignore_filename)
3528.2.1 by Jelmer Vernooij
Move functionality to add ignores to the ignore file into a separate function.
191
    if tree.has_filename(ifn):
7067.12.2 by Jelmer Vernooij
Fix test on python 2.
192
        with open(ifn, 'rb') as f:
5195.2.8 by Gordon Tyler
Fixed preservation of existing line endings and added tests for that and Unicode handling.
193
            file_contents = f.read()
7067.12.3 by Jelmer Vernooij
Look for *any* occurence of \r\n, not just at the end.
194
            if file_contents.find(b'\r\n') != -1:
7067.12.1 by Jelmer Vernooij
Fix an ignore test. Make AtomicFile a contextmanager.
195
                newline = b'\r\n'
196
            else:
197
                newline = b'\n'
3528.2.1 by Jelmer Vernooij
Move functionality to add ignores to the ignore file into a separate function.
198
    else:
6809.2.1 by Martin
Make most of test_ignores pass on Python 3
199
        file_contents = b""
200
        newline = os.linesep.encode()
6876.4.1 by Jelmer Vernooij
Add format setting with ignore filename.
201
7067.12.1 by Jelmer Vernooij
Fix an ignore test. Make AtomicFile a contextmanager.
202
    with BytesIO(file_contents) as sio:
5195.2.8 by Gordon Tyler
Fixed preservation of existing line endings and added tests for that and Unicode handling.
203
        ignores = parse_ignore_file(sio)
6876.4.1 by Jelmer Vernooij
Add format setting with ignore filename.
204
5195.2.8 by Gordon Tyler
Fixed preservation of existing line endings and added tests for that and Unicode handling.
205
    # write out the updated ignores set
7067.12.1 by Jelmer Vernooij
Fix an ignore test. Make AtomicFile a contextmanager.
206
    with atomicfile.AtomicFile(ifn, 'wb') as f:
5195.2.8 by Gordon Tyler
Fixed preservation of existing line endings and added tests for that and Unicode handling.
207
        # write the original contents, preserving original line endings
7067.12.1 by Jelmer Vernooij
Fix an ignore test. Make AtomicFile a contextmanager.
208
        f.write(file_contents)
6809.2.1 by Martin
Make most of test_ignores pass on Python 3
209
        if len(file_contents) > 0 and not file_contents.endswith(b'\n'):
5195.2.8 by Gordon Tyler
Fixed preservation of existing line endings and added tests for that and Unicode handling.
210
            f.write(newline)
211
        for pattern in name_pattern_list:
7143.15.5 by Jelmer Vernooij
More PEP8 fixes.
212
            if pattern not in ignores:
5195.2.8 by Gordon Tyler
Fixed preservation of existing line endings and added tests for that and Unicode handling.
213
                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.
214
                f.write(newline)
3528.2.1 by Jelmer Vernooij
Move functionality to add ignores to the ignore file into a separate function.
215
6876.4.1 by Jelmer Vernooij
Add format setting with ignore filename.
216
    if not tree.is_versioned(tree._format.ignore_filename):
217
        tree.add([tree._format.ignore_filename])