forked from xgouchet/AutoMergeTool
-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathgen_debug.py
More file actions
executable file
·31 lines (24 loc) · 894 Bytes
/
gen_debug.py
File metadata and controls
executable file
·31 lines (24 loc) · 894 Bytes
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
import sys
import argparse
from amtutils import *
def parse_arguments():
"""Parses the arguments passed on invocation in a dict and return it"""
parser = argparse.ArgumentParser(description="A tool to resolve dummy conflicts")
parser.add_argument('-m', '--merged', required=True)
parser.add_argument(
'-r',
'--report',
choices=[REPORT_NONE, REPORT_SOLVED, REPORT_UNSOLVED, REPORT_FULL],
default=REPORT_UNSOLVED,
required=False)
parser.add_argument('-v', '--verbose', required=False, action='store_true')
return parser.parse_args()
if __name__ == '__main__':
args = parse_arguments()
walker = ConflictsWalker(args.merged, 'dbg', args.report, args.verbose)
while walker.has_more_conflicts():
continue
walker.end()
sys.exit(walker.get_merge_status())