equal
deleted
inserted
replaced
45 util.setbinary(fp) |
45 util.setbinary(fp) |
46 |
46 |
47 opts = {} |
47 opts = {} |
48 try: |
48 try: |
49 args = fancyopts.fancyopts(sys.argv[1:], options, opts) |
49 args = fancyopts.fancyopts(sys.argv[1:], options, opts) |
50 except fancyopts.getopt.GetoptError, e: |
50 except fancyopts.getopt.GetoptError as e: |
51 raise ParseError(e) |
51 raise ParseError(e) |
52 if opts['help']: |
52 if opts['help']: |
53 showhelp() |
53 showhelp() |
54 sys.exit(0) |
54 sys.exit(0) |
55 if len(args) != 3: |
55 if len(args) != 3: |
56 raise ParseError(_('wrong number of arguments')) |
56 raise ParseError(_('wrong number of arguments')) |
57 sys.exit(simplemerge.simplemerge(ui.ui(), *args, **opts)) |
57 sys.exit(simplemerge.simplemerge(ui.ui(), *args, **opts)) |
58 except ParseError, e: |
58 except ParseError as e: |
59 sys.stdout.write("%s: %s\n" % (sys.argv[0], e)) |
59 sys.stdout.write("%s: %s\n" % (sys.argv[0], e)) |
60 showhelp() |
60 showhelp() |
61 sys.exit(1) |
61 sys.exit(1) |
62 except error.Abort, e: |
62 except error.Abort as e: |
63 sys.stderr.write("abort: %s\n" % e) |
63 sys.stderr.write("abort: %s\n" % e) |
64 sys.exit(255) |
64 sys.exit(255) |
65 except KeyboardInterrupt: |
65 except KeyboardInterrupt: |
66 sys.exit(255) |
66 sys.exit(255) |