Mercurial > public > mercurial-scm > hg-stable

diff tests/test-bdiff.py @ 32246:ded48ad55146

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bdiff: proxy through mdiff module See the previous commit for why. mdiff seems a good place to host bdiff functions. bdiff.bdiff was already aliased as textdiff, so we use it.
author Yuya Nishihara <yuya@tcha.org>
date Wed, 26 Apr 2017 22:03:37 +0900
parents f2ad0d804700
children 0c73634d0570
line wrap: on
line diff
--- a/tests/test-bdiff.py	Wed Apr 26 21:56:47 2017 +0900
+++ b/tests/test-bdiff.py	Wed Apr 26 22:03:37 2017 +0900
@@ -4,7 +4,7 @@
 import unittest
 
 from mercurial import (
-    bdiff,
+    mdiff,
     mpatch,
 )
 
@@ -16,7 +16,7 @@
 class BdiffTests(unittest.TestCase):
 
     def assert_bdiff_applies(self, a, b):
-        d = bdiff.bdiff(a, b)
+        d = mdiff.textdiff(a, b)
         c = a
         if d:
             c = mpatch.patches(a, [d])
@@ -54,7 +54,7 @@
             self.assert_bdiff(a, b)
 
     def showdiff(self, a, b):
-        bin = bdiff.bdiff(a, b)
+        bin = mdiff.textdiff(a, b)
         pos = 0
         q = 0
         actions = []
@@ -110,7 +110,7 @@
             ("", "", 0),
         ]
         for a, b, allws in cases:
-            c = bdiff.fixws(a, allws)
+            c = mdiff.fixws(a, allws)
             self.assertEqual(
                 c, b, 'fixws(%r) want %r got %r (allws=%r)' % (a, b, c, allws))