mirror of
https://github.com/pre-commit/pre-commit-hooks.git
synced 2025-08-16 19:42:12 +08:00
5c752935fd
Do a straight test of detecting a real merge conflict as generated by git. Test artificial conflict detection while pending merge without a real conflict. Test artificial non-conflict non-detection in a resolved merge conflict. Rename test_does_not_care... function to reflect what we want to care about. Rename is_in_merge_conflict to is_in_merge since that is what it checks.
44 lines
1.0 KiB
Python
44 lines
1.0 KiB
Python
from __future__ import print_function
|
|
|
|
import argparse
|
|
import os.path
|
|
import sys
|
|
|
|
CONFLICT_PATTERNS = [
|
|
'<<<<<<< ',
|
|
'======= ',
|
|
'=======\n',
|
|
'>>>>>>> '
|
|
]
|
|
WARNING_MSG = 'Merge conflict string "{0}" found in {1}:{2}'
|
|
|
|
|
|
def is_in_merge():
|
|
return (
|
|
os.path.exists(os.path.join('.git', 'MERGE_MSG')) and
|
|
os.path.exists(os.path.join('.git', 'MERGE_HEAD'))
|
|
)
|
|
|
|
|
|
def detect_merge_conflict(argv=None):
|
|
parser = argparse.ArgumentParser()
|
|
parser.add_argument('filenames', nargs='*')
|
|
args = parser.parse_args(argv)
|
|
|
|
if not is_in_merge():
|
|
return 0
|
|
|
|
retcode = 0
|
|
for filename in args.filenames:
|
|
with open(filename) as inputfile:
|
|
for i, line in enumerate(inputfile):
|
|
for pattern in CONFLICT_PATTERNS:
|
|
if line.startswith(pattern):
|
|
print(WARNING_MSG.format(pattern, filename, i + 1))
|
|
retcode = 1
|
|
|
|
return retcode
|
|
|
|
if __name__ == '__main__':
|
|
sys.exit(detect_merge_conflict())
|