Mercurial > hg-stable
changeset 32247:0c73634d0570
mpatch: proxy through mdiff module
See the previous commit for why.
| author | Yuya Nishihara <yuya@tcha.org> |
|---|---|
| date | Wed, 26 Apr 2017 22:05:59 +0900 |
| parents | ded48ad55146 |
| children | d74b0cff94a9 |
| files | contrib/bdiff-torture.py tests/test-bdiff.py |
| diffstat | 2 files changed, 2 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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])))