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

Simplify a few things

Browse source
This commit is contained in:
Anthony Sottile 2015-01-14 19:21:32 -08:00
parent b707cbba06
commit 931c69b3fa
7 changed files with 29 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

13
pre_commit/commands/run.py
View file

@ -50,18 +50,16 @@ def _print_user_skipped(hook, write, args):
def get_changed_files(new, old):
changed_files = cmd_output(
return cmd_output(
'git', 'diff', '--name-only', '{0}..{1}'.format(old, new),
)[1].splitlines()
for f in changed_files:
if f:
yield f
def _run_single_hook(runner, repository, hook, args, write, skips=set()):
if args.origin and args.source:
get_filenames = git.get_files_matching(
lambda: get_changed_files(args.origin, args.source))
lambda: get_changed_files(args.origin, args.source),
)
elif args.files:
get_filenames = git.get_files_matching(lambda: args.files)
elif args.all_files:
@ -150,9 +148,8 @@ def run(runner, args, write=sys_stdout_write_wrapper, environ=os.environ):
if _has_unmerged_paths(runner):
logger.error('Unmerged files. Resolve before committing.')
return 1
if (args.source and not args.origin) or \
(args.origin and not args.source):
logger.error('--origin and --source depend on each other.')
if bool(args.source) != bool(args.origin):
logger.error('Specify both --origin and --source.')
return 1
# Don't stash if specified or files are specified