equal
deleted
inserted
replaced
12 context, |
12 context, |
13 error, |
13 error, |
14 fancyopts, |
14 fancyopts, |
15 simplemerge, |
15 simplemerge, |
16 ui as uimod, |
16 ui as uimod, |
17 util, |
17 ) |
|
18 from mercurial.utils import ( |
|
19 procutil, |
18 ) |
20 ) |
19 |
21 |
20 options = [('L', 'label', [], _('labels to use on conflict markers')), |
22 options = [('L', 'label', [], _('labels to use on conflict markers')), |
21 ('a', 'text', None, _('treat all files as text')), |
23 ('a', 'text', None, _('treat all files as text')), |
22 ('p', 'print', None, |
24 ('p', 'print', None, |
50 for first, second in out_opts: |
52 for first, second in out_opts: |
51 sys.stdout.write(' %-*s %s\n' % (opts_len, first, second)) |
53 sys.stdout.write(' %-*s %s\n' % (opts_len, first, second)) |
52 |
54 |
53 try: |
55 try: |
54 for fp in (sys.stdin, sys.stdout, sys.stderr): |
56 for fp in (sys.stdin, sys.stdout, sys.stderr): |
55 util.setbinary(fp) |
57 procutil.setbinary(fp) |
56 |
58 |
57 opts = {} |
59 opts = {} |
58 try: |
60 try: |
59 args = fancyopts.fancyopts(sys.argv[1:], options, opts) |
61 args = fancyopts.fancyopts(sys.argv[1:], options, opts) |
60 except getopt.GetoptError as e: |
62 except getopt.GetoptError as e: |