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

revlog: don't say "not found" on internal error...

revlog: don't say "not found" on internal error If index_node() returned NULL, then index_find_node() and and nt_partialmatch() used to return -2 to signal that the node was not found. However, we were passing in a revnum to index_node() that we knew should exist, so the only reason it could return NULL was due to some internal error or perhaps out of memory. Let's not use "not found" for these cases. I suppose we never noticed this because these error never happen in practice. I think there are more places where we should error out instead of reporting that the node was not found, but the cases mentioned above were all I cared about right now (because using the same error code for all failures simplified some future patches). Differential Revision: https://phab.mercurial-scm.org/D3457

Kevin Bullock - - Load All Authors

File last commit:

r33573:857876eb 4.3-rc stable


                r37878:a9d9802d

default

Download file

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

        Yuya Nishihara
    
cffi: split modules from pure...

              r32512
            
      # 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

        Yuya Nishihara
    
cffi: remove superfluous "if True" blocks

              r32513
            
      @ffi.def_extern()

      def cffi_get_next_item(arg, pos):

          all, bins = ffi.from_handle(arg)

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

          to_pass = ffi.new("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]

        Yuya Nishihara
    
cffi: split modules from pure...

              r32512
            
        Yuya Nishihara
    
cffi: remove superfluous "if True" blocks

              r32513
            
      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("cannot decode chunk")

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

          if outlen < 0:

              lib.mpatch_lfree(patch)

              raise mpatchError("inconsistency detected")

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

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

              lib.mpatch_lfree(patch)

              raise mpatchError("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

Yuya Nishihara cffi: split modules from pure...	r32512	# 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

Yuya Nishihara cffi: remove superfluous "if True" blocks	r32513	@ffi.def_extern()
		def cffi_get_next_item(arg, pos):
		all, bins = ffi.from_handle(arg)
		container = ffi.new("struct mpatch_flist*[1]")
		to_pass = ffi.new("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]
Yuya Nishihara cffi: split modules from pure...	r32512
Yuya Nishihara cffi: remove superfluous "if True" blocks	r32513	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("cannot decode chunk")
		outlen = lib.mpatch_calcsize(len(text), patch)
		if outlen < 0:
		lib.mpatch_lfree(patch)
		raise mpatchError("inconsistency detected")
		buf = ffi.new("char[]", outlen)
		if lib.mpatch_apply(buf, text, len(text), patch) < 0:
		lib.mpatch_lfree(patch)
		raise mpatchError("error applying patches")
		res = ffi.buffer(buf, outlen)[:]
		lib.mpatch_lfree(patch)
		return res