pre-commit/pre-commit-hooks
1
0
Fork 0
mirror of https://github.com/pre-commit/pre-commit-hooks.git synced 2026-04-08 12:34:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Apply typing to all of pre-commit-hooks

Browse source
This commit is contained in:
Anthony Sottile 2019-01-31 19:19:10 -08:00
parent 63cc3414e9
commit 030bfac7e4
54 changed files with 401 additions and 264 deletions
Download patch file Download diff file Expand all files Collapse all files

9
pre_commit_hooks/check_merge_conflict.py
View file

@ -2,6 +2,9 @@ from __future__ import print_function
import argparse
import os.path
from typing import Optional
from typing import Sequence
CONFLICT_PATTERNS = [
b'<<<<<<< ',
@ -12,7 +15,7 @@ CONFLICT_PATTERNS = [
WARNING_MSG = 'Merge conflict string "{0}" found in {1}:{2}'
def is_in_merge():
def is_in_merge(): # type: () -> int
return (
os.path.exists(os.path.join('.git', 'MERGE_MSG')) and
(
@ -23,7 +26,7 @@ def is_in_merge():
)
def detect_merge_conflict(argv=None):
def main(argv=None): # type: (Optional[Sequence[str]]) -> int
parser = argparse.ArgumentParser()
parser.add_argument('filenames', nargs='*')
parser.add_argument('--assume-in-merge', action='store_true')
@ -47,4 +50,4 @@ def detect_merge_conflict(argv=None):
if __name__ == '__main__':
exit(detect_merge_conflict())
exit(main())