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

strip: don't allow empty changegroup in bundle1...

strip: don't allow empty changegroup in bundle1 Applying an empty changegroup has been an error since the beginning. The only exception was strip, which would allow to apply an empty changegroup from the temporary bundle. However, the emptyok=True option was only set for bundle1 bundles. In other words, temporary bundle2 bundles would fail if they were empty. Bundle2 has now been used enough that it seems safe to say that we simply don't create bundle2 bundles with empty changegroups. That also suggests that we never create bundle1 bundles with empty changegroups (i.e. empty bundle1 bundles, since bundle1 is just a changegroup), because, AFAICT, the code leading up to the application of the bundle is the same for bundle1 and bundle2. Therefore, let's stop passing emptyok=True, so we more clearly get the same behavior for bundle1 and bundle2.

Yuya Nishihara - - Load All Authors

File last commit:

r32513:25b37900 default


                r33307:665271d6

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