iframe-proxy | Sunbelt Computer Software

History

51 lines (40 loc) · 1.34 KB

Raw

import argparse

import os.path

from typing import Optional

from typing import Sequence

CONFLICT_PATTERNS = [

b'<<<<<<< ',

b'======= ',

b'=======\n',

b'>>>>>>> ',

]

def is_in_merge() -> int:

return (

os.path.exists(os.path.join('.git', 'MERGE_MSG')) and

(

os.path.exists(os.path.join('.git', 'MERGE_HEAD')) or

os.path.exists(os.path.join('.git', 'rebase-apply')) or

os.path.exists(os.path.join('.git', 'rebase-merge'))

)

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')

args = parser.parse_args(argv)

if not is_in_merge() and not args.assume_in_merge:

return 0

retcode = 0

for filename in args.filenames:

with open(filename, 'rb') as inputfile:

for i, line in enumerate(inputfile):

for pattern in CONFLICT_PATTERNS:

if line.startswith(pattern):

print(

f'Merge conflict string "{pattern.decode()}" '

f'found in {filename}:{i + 1}',

)

retcode = 1

return retcode

if __name__ == '__main__':

exit(main())

Sunbelt Computer Software

PL/B Language Development and Support

Navigation Menu

Uh oh!

Sunbelt Computer Software

PL/B Language Development and Support

Uh oh!

FilesExpand file tree

check_merge_conflict.py

Latest commit

History

check_merge_conflict.py

File metadata and controls