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

pre-commit-hooks: python3.6+

Browse source
This commit is contained in:
Anthony Sottile 2020-02-05 11:10:42 -08:00
parent 551d1a07b3
commit f5c42a050b
60 changed files with 291 additions and 493 deletions
Download patch file Download diff file Expand all files Collapse all files

12
pre_commit_hooks/check_merge_conflict.py
View file

@ -1,5 +1,3 @@
from __future__ import print_function
import argparse
import os.path
from typing import Optional
@ -12,10 +10,9 @@ CONFLICT_PATTERNS = [
b'=======\n',
b'>>>>>>> ',
]
WARNING_MSG = 'Merge conflict string "{0}" found in {1}:{2}'
def is_in_merge(): # type: () -> int
def is_in_merge() -> int:
return (
os.path.exists(os.path.join('.git', 'MERGE_MSG')) and
(
@ -26,7 +23,7 @@ def is_in_merge(): # type: () -> int
)
def main(argv=None): # type: (Optional[Sequence[str]]) -> int
def main(argv: Optional[Sequence[str]] = None) -> int:
parser = argparse.ArgumentParser()
parser.add_argument('filenames', nargs='*')
parser.add_argument('--assume-in-merge', action='store_true')
@ -42,9 +39,8 @@ def main(argv=None): # type: (Optional[Sequence[str]]) -> int
for pattern in CONFLICT_PATTERNS:
if line.startswith(pattern):
print(
WARNING_MSG.format(
pattern.decode(), filename, i + 1,
),
f'Merge conflict string "{pattern.decode()}" '
f'found in {filename}:{i + 1}',
)
retcode = 1