/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/ignores.py

  • Committer: Jelmer Vernooij
  • Date: 2019-06-02 02:35:46 UTC
  • mfrom: (7309 work)
  • mto: This revision was merged to the branch mainline in revision 7319.
  • Revision ID: jelmer@jelmer.uk-20190602023546-lqco868tnv26d8ow
merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/ignores.py
33
33
    )
34
34
""")
35
35
 
36
 
# ~/.bazaar/ignore will be filled out using
 
36
# ~/.config/breezy/ignore will be filled out using
37
37
# this ignore list, if it does not exist
38
38
# please keep these sorted (in C locale order) to aid merging
39
39
USER_DEFAULTS = [
73
73
            except UnicodeDecodeError:
74
74
                # report error about line (idx+1)
75
75
                trace.warning(
76
 
                        '.bzrignore: On Line #%d, malformed utf8 character. '
77
 
                        'Ignoring line.' % (line_number+1))
 
76
                    '.bzrignore: On Line #%d, malformed utf8 character. '
 
77
                    'Ignoring line.' % (line_number + 1))
78
78
 
79
79
    # Append each line to ignore list if it's not a comment line
80
80
    for line in unicode_lines:
209
209
        if len(file_contents) > 0 and not file_contents.endswith(b'\n'):
210
210
            f.write(newline)
211
211
        for pattern in name_pattern_list:
212
 
            if not pattern in ignores:
 
212
            if pattern not in ignores:
213
213
                f.write(pattern.encode('utf-8'))
214
214
                f.write(newline)
215
215