Mercurial > public > mercurial-scm > hg-stable

diff mercurial/pure/bdiff.py @ 30042:d24e03da24b5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
lazymanifest: write a more efficient, pypy friendly version of lazymanifest
author Maciej Fijalkowski <fijall@gmail.com>
date Mon, 12 Sep 2016 13:37:14 +0200
parents 1ea77b75d266
children 6d30699729dd
line wrap: on
line diff
--- a/mercurial/pure/bdiff.py	Sun Oct 02 22:34:40 2016 -0700
+++ b/mercurial/pure/bdiff.py	Mon Sep 12 13:37:14 2016 +0200
@@ -111,8 +111,8 @@
         def blocks(sa, sb):
             a = ffi.new("struct bdiff_line**")
             b = ffi.new("struct bdiff_line**")
-            ac = ffi.new("char[]", sa)
-            bc = ffi.new("char[]", sb)
+            ac = ffi.new("char[]", str(sa))
+            bc = ffi.new("char[]", str(sb))
             l = ffi.new("struct bdiff_hunk*")
             try:
                 an = lib.bdiff_splitlines(ac, len(sa), a)
@@ -138,8 +138,8 @@
         def bdiff(sa, sb):
             a = ffi.new("struct bdiff_line**")
             b = ffi.new("struct bdiff_line**")
-            ac = ffi.new("char[]", sa)
-            bc = ffi.new("char[]", sb)
+            ac = ffi.new("char[]", str(sa))
+            bc = ffi.new("char[]", str(sb))
             l = ffi.new("struct bdiff_hunk*")
             try:
                 an = lib.bdiff_splitlines(ac, len(sa), a)