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

repo-config: adjust "root" path for parsing shared config...

repo-config: adjust "root" path for parsing shared config That "root" argument is used to resolve relative path in the config. For a repository config it is expected to be the root of the working copy (the directory that contains the `.hg` directory). Before this patch, the config was loaded using the `.hg/` directory of the share source, this is not the right directory and would break in all cases. Instead we use the working copy directory of the share. This is not always good, if some relative path we pointing inside the source's `.hg`. However that is better than something plain wrong. Also this is the right answer for all path that refer to the actual working copy. Fixing this ambiguity is left as an exercises to a future developer. At least we no longer use a plain invalid value.

Matt Harbison - - Load All Authors

File last commit:

r52756:f4733654 default


                r53319:8a52fd13

default

Download file

             mpatch.py
        
                    51 lines
            
             | 1.5 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 annotations

      from typing import List

      from ..pure.mpatch import *

      from ..pure.mpatch import mpatchError  # silence pyflakes

      from . import _mpatch  # pytype: disable=import-error

      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[]", bytes(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: bytes, bins: List[bytes]) -> bytes:

          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("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 annotations

				from typing import List

				from ..pure.mpatch import *
				from ..pure.mpatch import mpatchError # silence pyflakes
				from . import _mpatch # pytype: disable=import-error

				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[]", bytes(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: bytes, bins: List[bytes]) -> bytes:
				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("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