Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mpatch: proxy through mdiff module
authorYuya Nishihara <yuya@tcha.org>
Wed, 26 Apr 2017 22:05:59 +0900
changeset 32203 0c73634d0570
parent 32202 ded48ad55146
child 32208 d74b0cff94a9
mpatch: proxy through mdiff module See the previous commit for why.
contrib/bdiff-torture.py file | annotate | diff | comparison | revisions
tests/test-bdiff.py file | annotate | diff | comparison | revisions 
--- 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")
 
--- 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])))
mercurial