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

debug: move extensions debug behind a dedicated flag...

debug: move extensions debug behind a dedicated flag Since b86664c81833, we process the `--debug` flag earlier. This is overall good and useful, but has at least one negative side effect. Previously the debug message we report when trying to import extensions were issued before we processed the `--debug` flag. Now they happen after. Before: $ ./hg id --debug tip After: $ ./hg id --debug ☿ (revset-bench) could not import hgext.evolve (No module named evolve): trying hgext3rd.evolve could not import hgext.mercurial_keyring (No module named mercurial_keyring): trying hgext3rd.mercurial_keyring could not import hgext3rd.mercurial_keyring (No module named mercurial_keyring): trying mercurial_keyring could not import hgext.hggit (No module named hggit): trying hgext3rd.hggit could not import hgext3rd.hggit (No module named hggit): trying hggit tip (This get worse if --traceback is used). To work around this, we move this extensions related debug message behind a new flag 'devel.debug.extensions' and restore the previous output. I'm not fully happy about using the 'devel' section for a flag that can be used by legitimate users to debug extensions issues. However, it fits well next to other `devel.devel.*` options and is mostly used by extensions author anyway. We might move it to another, more appropriate section in the future (using alias).

Kevin Bullock - - Load All Authors

File last commit:

r33573:857876eb 4.3-rc stable


                r38750:fcb517ff

@85 default

Download file

             mpatch.py
        
                    48 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("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]

      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

				# 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("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]

				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