pre-commit/pre-commit-hooks
1
0
Fork 0
mirror of https://github.com/pre-commit/pre-commit-hooks.git synced 2026-04-05 19:46:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix _process_fix_auto to return the right value

Browse source
This commit is contained in:
Morgan Courbet 2017-07-04 21:16:27 +02:00
parent c6c4c4a2fa
commit 614893f36d
No known key found for this signature in database
GPG key ID: 467299D324A21B24
1 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

18
pre_commit_hooks/mixed_line_ending.py
View file

@ -77,7 +77,6 @@ def mixed_line_ending(argv=None):
return _process_no_fix(filenames) return _process_no_fix(filenames)
elif fix_option == MixedLineEndingOption.AUTO: elif fix_option == MixedLineEndingOption.AUTO:
return _process_fix_auto(filenames) return _process_fix_auto(filenames)
# when a line ending character is forced with --fix option # when a line ending character is forced with --fix option
else: else:
line_ending_enum = fix_option.line_ending_enum line_ending_enum = fix_option.line_ending_enum
@ -188,6 +187,8 @@ def _process_no_fix(filenames):
def _process_fix_auto(filenames): def _process_fix_auto(filenames):
converted_found = False
for filename in filenames: for filename in filenames:
detect_result = _detect_line_ending(filename) detect_result = _detect_line_ending(filename)
@ -198,21 +199,26 @@ def _process_fix_auto(filenames):
le_enum = detect_result.line_ending_enum le_enum = detect_result.line_ending_enum
logging.info('The file %s has mixed line ending with a ' logging.info('The file %s has mixed line ending with a '
'majority of "%s". Converting to "%s"', filename, 'majority of "%s". Converting...', filename,
le_enum.str_print, le_enum.str_print) le_enum.str_print)
_convert_line_ending(filename, le_enum.string) _convert_line_ending(filename, le_enum.string)
converted_found = True
logging.info('The file %s has been converted to "%s" line '
'ending.', filename, le_enum.str_print)
return 1
elif detect_result == MixedLineDetection.NOT_MIXED: elif detect_result == MixedLineDetection.NOT_MIXED:
logging.info('The file %s has no mixed line ending', filename) logging.info('The file %s has no mixed line ending', filename)
return 0 converted_found |= False
elif detect_result == MixedLineDetection.UNKNOWN: elif detect_result == MixedLineDetection.UNKNOWN:
logging.info('Could not define most frequent line ending in ' logging.info('Could not define most frequent line ending in '
'file %s. File skiped.', filename) 'file %s. File skiped.', filename)
return 0 converted_found |= False
return 1 if converted_found else 0
def _convert_line_ending(filename, line_ending): def _convert_line_ending(filename, line_ending):