third-party/pre-commit
1
0
Fork 0
mirror of https://github.com/pre-commit/pre-commit.git synced 2026-02-17 08:14:42 +04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1566 from thetradedesk/master

Browse source 
Save diff between hook executions
This commit is contained in:
Anthony Sottile 2020-08-21 21:02:09 -07:00 • committed by GitHub
commit 9a5461db24
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

24
pre_commit/commands/run.py
View file

@ -134,9 +134,10 @@ def _run_single_hook(
hook: Hook, hook: Hook,
skips: Set[str], skips: Set[str],
cols: int, cols: int,
diff_before: bytes,
verbose: bool, verbose: bool,
use_color: bool, use_color: bool,
) -> bool: ) -> Tuple[bool, bytes]:
filenames = classifier.filenames_for_hook(hook) filenames = classifier.filenames_for_hook(hook)
if hook.id in skips or hook.alias in skips: if hook.id in skips or hook.alias in skips:
@ -151,6 +152,7 @@ def _run_single_hook(
) )
duration = None duration = None
retcode = 0 retcode = 0
diff_after = diff_before
files_modified = False files_modified = False
out = b'' out = b''
elif not filenames and not hook.always_run: elif not filenames and not hook.always_run:
@ -166,21 +168,20 @@ def _run_single_hook(
) )
duration = None duration = None
retcode = 0 retcode = 0
diff_after = diff_before
files_modified = False files_modified = False
out = b'' out = b''
else: else:
# print hook and dots first in case the hook takes a while to run # print hook and dots first in case the hook takes a while to run
output.write(_start_msg(start=hook.name, end_len=6, cols=cols)) output.write(_start_msg(start=hook.name, end_len=6, cols=cols))
diff_cmd = ('git', 'diff', '--no-ext-diff')
diff_before = cmd_output_b(*diff_cmd, retcode=None)
if not hook.pass_filenames: if not hook.pass_filenames:
filenames = () filenames = ()
time_before = time.time() time_before = time.time()
language = languages[hook.language] language = languages[hook.language]
retcode, out = language.run_hook(hook, filenames, use_color) retcode, out = language.run_hook(hook, filenames, use_color)
duration = round(time.time() - time_before, 2) or 0 duration = round(time.time() - time_before, 2) or 0
diff_after = cmd_output_b(*diff_cmd, retcode=None) diff_after = _get_diff()
# if the hook makes changes, fail the commit # if the hook makes changes, fail the commit
files_modified = diff_before != diff_after files_modified = diff_before != diff_after
@ -212,7 +213,7 @@ def _run_single_hook(
output.write_line_b(out.strip(), logfile_name=hook.log_file) output.write_line_b(out.strip(), logfile_name=hook.log_file)
output.write_line() output.write_line()
return files_modified or bool(retcode) return files_modified or bool(retcode), diff_after
def _compute_cols(hooks: Sequence[Hook]) -> int: def _compute_cols(hooks: Sequence[Hook]) -> int:
@ -248,6 +249,11 @@ def _all_filenames(args: argparse.Namespace) -> Collection[str]:
return git.get_staged_files() return git.get_staged_files()
def _get_diff() -> bytes:
_, out, _ = cmd_output_b('git', 'diff', '--no-ext-diff', retcode=None)
return out
def _run_hooks( def _run_hooks(
config: Dict[str, Any], config: Dict[str, Any],
hooks: Sequence[Hook], hooks: Sequence[Hook],
@ -261,14 +267,16 @@ def _run_hooks(
_all_filenames(args), config['files'], config['exclude'], _all_filenames(args), config['files'], config['exclude'],
) )
retval = 0 retval = 0
prior_diff = _get_diff()
for hook in hooks: for hook in hooks:
retval |= _run_single_hook( current_retval, prior_diff = _run_single_hook(
classifier, hook, skips, cols, classifier, hook, skips, cols, prior_diff,
verbose=args.verbose, use_color=args.color, verbose=args.verbose, use_color=args.color,
) )
retval |= current_retval
if retval and config['fail_fast']: if retval and config['fail_fast']:
break break
if retval and args.show_diff_on_failure and git.has_diff(): if retval and args.show_diff_on_failure and prior_diff:
if args.all_files: if args.all_files:
output.write_line( output.write_line(
'pre-commit hook(s) made changes.\n' 'pre-commit hook(s) made changes.\n'