--- a/contrib/simplemerge Thu Aug 24 21:26:40 2017 -0700
+++ b/contrib/simplemerge Thu Aug 24 21:30:37 2017 -0700
@@ -49,6 +49,26 @@
for first, second in out_opts:
sys.stdout.write(' %-*s %s\n' % (opts_len, first, second))
+class filebackedctx(object):
+ """simplemerge requires context-like objects"""
+ def __init__(self, path):
+ self._path = path
+
+ def decodeddata(self):
+ with open(self._path, "rb") as f:
+ return f.read()
+
+ def flags(self):
+ return ''
+
+ def path(self):
+ return self._path
+
+ def write(self, data, flags):
+ assert not flags
+ with open(self._path, "w") as f:
+ f.write(data)
+
try:
for fp in (sys.stdin, sys.stdout, sys.stderr):
util.setbinary(fp)
@@ -63,7 +83,16 @@
sys.exit(0)
if len(args) != 3:
raise ParseError(_('wrong number of arguments'))
- sys.exit(simplemerge.simplemerge(uimod.ui.load(), *args, **opts))
+ local, base, other = args
+ sys.exit(simplemerge.simplemerge(uimod.ui.load(),
+ local,
+ base,
+ other,
+ filebackedctx(local),
+ filebackedctx(base),
+ filebackedctx(other),
+ filtereddata=True,
+ **opts))
except ParseError as e:
sys.stdout.write("%s: %s\n" % (sys.argv[0], e))
showhelp()