upstream/mercurial-mirror Files · mercurial/cffi/mpatch.py

run-tests: fix `HGTESTEXTRAEXTENSIONS` with py3...

run-tests: fix `HGTESTEXTRAEXTENSIONS` with py3 Since `extensions` was a str and `section` bytes, it never populated anything. If it had, it would have put bytes into the environment dictionary that is all str. As everything starts and ends as str, remove the incomplete attempt at byteification. It doesn't appear that we had any test coverage of this bit of code, so also add a non-extension config to make sure it is filtered out properly. Differential Revision: https://phab.mercurial-scm.org/D9557

Augie Fackler - - Load All Authors

File last commit:

r43347:687b865b default


                r46707:af3a6900

default

Download file

             mpatch.py
        
                    49 lines
            
             | 1.4 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / cffi / mpatch.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # mpatch.py - CFFI implementation of mpatch.c

      #

      # Copyright 2016 Maciej Fijalkowski <fijall@gmail.com>

      #

      # This software may be used and distributed according to the terms of the

      # GNU General Public License version 2 or any later version.

      from __future__ import absolute_import

      from ..pure.mpatch import *

      from ..pure.mpatch import mpatchError  # silence pyflakes

      from . import _mpatch

      ffi = _mpatch.ffi

      lib = _mpatch.lib

      @ffi.def_extern()

      def cffi_get_next_item(arg, pos):

          all, bins = ffi.from_handle(arg)

          container = ffi.new(b"struct mpatch_flist*[1]")

          to_pass = ffi.new(b"char[]", str(bins[pos]))

          all.append(to_pass)

          r = lib.mpatch_decode(to_pass, len(to_pass) - 1, container)

          if r < 0:

              return ffi.NULL

          return container[0]

      def patches(text, bins):

          lgt = len(bins)

          all = []

          if not lgt:

              return text

          arg = (all, bins)

          patch = lib.mpatch_fold(ffi.new_handle(arg), lib.cffi_get_next_item, 0, lgt)

          if not patch:

              raise mpatchError(b"cannot decode chunk")

          outlen = lib.mpatch_calcsize(len(text), patch)

          if outlen < 0:

              lib.mpatch_lfree(patch)

              raise mpatchError(b"inconsistency detected")

          buf = ffi.new(b"char[]", outlen)

          if lib.mpatch_apply(buf, text, len(text), patch) < 0:

              lib.mpatch_lfree(patch)

              raise mpatchError(b"error applying patches")

          res = ffi.buffer(buf, outlen)[:]

          lib.mpatch_lfree(patch)

          return res

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				# mpatch.py - CFFI implementation of mpatch.c
				#
				# Copyright 2016 Maciej Fijalkowski <fijall@gmail.com>
				#
				# This software may be used and distributed according to the terms of the
				# GNU General Public License version 2 or any later version.

				from __future__ import absolute_import

				from ..pure.mpatch import *
				from ..pure.mpatch import mpatchError # silence pyflakes
				from . import _mpatch

				ffi = _mpatch.ffi
				lib = _mpatch.lib


				@ffi.def_extern()
				def cffi_get_next_item(arg, pos):
				all, bins = ffi.from_handle(arg)
				container = ffi.new(b"struct mpatch_flist*[1]")
				to_pass = ffi.new(b"char[]", str(bins[pos]))
				all.append(to_pass)
				r = lib.mpatch_decode(to_pass, len(to_pass) - 1, container)
				if r < 0:
				return ffi.NULL
				return container[0]


				def patches(text, bins):
				lgt = len(bins)
				all = []
				if not lgt:
				return text
				arg = (all, bins)
				patch = lib.mpatch_fold(ffi.new_handle(arg), lib.cffi_get_next_item, 0, lgt)
				if not patch:
				raise mpatchError(b"cannot decode chunk")
				outlen = lib.mpatch_calcsize(len(text), patch)
				if outlen < 0:
				lib.mpatch_lfree(patch)
				raise mpatchError(b"inconsistency detected")
				buf = ffi.new(b"char[]", outlen)
				if lib.mpatch_apply(buf, text, len(text), patch) < 0:
				lib.mpatch_lfree(patch)
				raise mpatchError(b"error applying patches")
				res = ffi.buffer(buf, outlen)[:]
				lib.mpatch_lfree(patch)
				return res