Output a message when a hook fails due to file modification

This commit is contained in:
Joe Bateson
2015-11-25 11:14:01 -08:00
parent c6200329a2
commit 91a547ed61
4 changed files with 36 additions and 7 deletions

View File

@@ -89,8 +89,10 @@ def _run_single_hook(hook, repo, args, write, skips=frozenset()):
retcode, stdout, stderr = repo.run_hook(hook, filenames)
diff_after = cmd_output('git', 'diff', retcode=None, encoding=None)
file_modifications = diff_before != diff_after
# If the hook makes changes, fail the commit
if diff_before != diff_after:
if file_modifications:
retcode = 1
if retcode:
@@ -104,9 +106,19 @@ def _run_single_hook(hook, repo, args, write, skips=frozenset()):
write(color.format_color(pass_fail, print_color, args.color) + '\n')
if (stdout or stderr) and (retcode or args.verbose):
if (stdout or stderr or file_modifications) and (retcode or args.verbose):
write('hookid: {0}\n'.format(hook['id']))
write('\n')
# Print a message if failing due to file modifications
if file_modifications:
write('Files were modified by this hook.')
if stdout or stderr:
write(' Additional output:\n')
write('\n')
for output in (stdout, stderr):
assert type(output) is bytes, type(output)
if output.strip():