--- a/contrib/simplemerge Sun Sep 23 23:39:07 2018 +0300
+++ b/contrib/simplemerge Sun Sep 23 23:59:35 2018 +0300
@@ -19,13 +19,13 @@
procutil,
)
-options = [('L', 'label', [], _('labels to use on conflict markers')),
- ('a', 'text', None, _('treat all files as text')),
- ('p', 'print', None,
- _('print results instead of overwriting LOCAL')),
- ('', 'no-minimal', None, _('no effect (DEPRECATED)')),
- ('h', 'help', None, _('display help and exit')),
- ('q', 'quiet', None, _('suppress output'))]
+options = [(b'L', b'label', [], _(b'labels to use on conflict markers')),
+ (b'a', b'text', None, _(b'treat all files as text')),
+ (b'p', b'print', None,
+ _(b'print results instead of overwriting LOCAL')),
+ (b'', b'no-minimal', None, _(b'no effect (DEPRECATED)')),
+ (b'h', b'help', None, _(b'display help and exit')),
+ (b'q', b'quiet', None, _(b'suppress output'))]
usage = _('''simplemerge [OPTS] LOCAL BASE OTHER
@@ -41,16 +41,16 @@
def showhelp():
sys.stdout.write(usage)
- sys.stdout.write('\noptions:\n')
+ sys.stdout.write(b'\noptions:\n')
out_opts = []
for shortopt, longopt, default, desc in options:
- out_opts.append(('%2s%s' % (shortopt and '-%s' % shortopt,
- longopt and ' --%s' % longopt),
- '%s' % desc))
+ out_opts.append((b'%2s%s' % (shortopt and b'-%s' % shortopt,
+ longopt and b' --%s' % longopt),
+ b'%s' % desc))
opts_len = max([len(opt[0]) for opt in out_opts])
for first, second in out_opts:
- sys.stdout.write(' %-*s %s\n' % (opts_len, first, second))
+ sys.stdout.write(b' %-*s %s\n' % (opts_len, first, second))
try:
for fp in (sys.stdin, sys.stdout, sys.stderr):
@@ -61,11 +61,11 @@
args = fancyopts.fancyopts(sys.argv[1:], options, opts)
except getopt.GetoptError as e:
raise ParseError(e)
- if opts['help']:
+ if opts[b'help']:
showhelp()
sys.exit(0)
if len(args) != 3:
- raise ParseError(_('wrong number of arguments'))
+ raise ParseError(_(b'wrong number of arguments'))
local, base, other = args
sys.exit(simplemerge.simplemerge(uimod.ui.load(),
context.arbitraryfilectx(local),
@@ -73,11 +73,11 @@
context.arbitraryfilectx(other),
**opts))
except ParseError as e:
- sys.stdout.write("%s: %s\n" % (sys.argv[0], e))
+ sys.stdout.write(b"%s: %s\n" % (sys.argv[0], e))
showhelp()
sys.exit(1)
except error.Abort as e:
- sys.stderr.write("abort: %s\n" % e)
+ sys.stderr.write(b"abort: %s\n" % e)
sys.exit(255)
except KeyboardInterrupt:
sys.exit(255)