blob: 62066b423331ea4a4edc67937e2c1c9cb9637a87 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
|
""" Checks that the file does not contain SVN conflict markers """
type_list = ["*"]
from sys import stderr
import re
regex = re.compile ("^<<<<<<< \.|>>>>>>> \.r|^=======$", re.MULTILINE)
begin_exclude = re.compile ("FUZZ\: disable conflict_marker_check")
end_exclude = re.compile ("FUZZ\: enable conflict_marker_check")
error_message = ": error: contains a SVN conflict marker. Please resolve the conflict before committing.\n"
from _generic_handler import generic_handler
def handler (file_name, file_content):
return generic_handler (regex, begin_exclude, end_exclude, error_message, file_name, file_content)
|
