# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1493211959 -32400
# Node ID 0c73634d0570d359d6fe8339441339a15126d7f9
# Parent  ded48ad5514626a319dc11eb5e198abb471f582a
mpatch: proxy through mdiff module

See the previous commit for why.

diff -r ded48ad55146 -r 0c73634d0570 contrib/bdiff-torture.py
--- a/contrib/bdiff-torture.py	Wed Apr 26 22:03:37 2017 +0900
+++ b/contrib/bdiff-torture.py	Wed Apr 26 22:05:59 2017 +0900
@@ -6,7 +6,6 @@
 
 from mercurial import (
     mdiff,
-    mpatch,
 )
 
 def reducetest(a, b):
@@ -45,7 +44,7 @@
     d = mdiff.textdiff(a, b)
     if not d:
         raise ValueError("empty")
-    c = mpatch.patches(a, [d])
+    c = mdiff.patches(a, [d])
     if c != b:
         raise ValueError("bad")
 
diff -r ded48ad55146 -r 0c73634d0570 tests/test-bdiff.py
--- a/tests/test-bdiff.py	Wed Apr 26 22:03:37 2017 +0900
+++ b/tests/test-bdiff.py	Wed Apr 26 22:05:59 2017 +0900
@@ -5,7 +5,6 @@
 
 from mercurial import (
     mdiff,
-    mpatch,
 )
 
 class diffreplace(
@@ -19,7 +18,7 @@
         d = mdiff.textdiff(a, b)
         c = a
         if d:
-            c = mpatch.patches(a, [d])
+            c = mdiff.patches(a, [d])
         self.assertEqual(
             c, b, ("bad diff+patch result from\n  %r to\n  "
                    "%r: \nbdiff: %r\npatched: %r" % (a, b, d, c[:200])))