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

context: introduce p[12]copies() methods and debugp[12]copies commands...

context: introduce p[12]copies() methods and debugp[12]copies commands As mentioned earlier, I'm working on support for storing copy metadata in the changeset instead of in the filelog. In order to transition a repo from storing metadata in filelogs to storing it in the changeset, I'm going to provide a config option for reading the metadata from the changeset, but falling back to getting it from the filelog if it's not in the changeset. In this compatiblity mode, the changeset-optmized algorithms will be used. We will then need to convert the filelog copy metadata to look like that provided by changeset copy metadata. This patch introduces methods that do just that. By having these methods here, we can start writing changeset-optimized algorithms that should work already before we add any support for storing the metadata in the changesets. This commit also includes new debugp[12]copies commands and exercises them in test-copies.t. Differential Revision: https://phab.mercurial-scm.org/D5990

Kevin Bullock - - Load All Authors

File last commit:

r33573:857876eb 4.3-rc stable


                r41905:456ad0fd

default

Download file

             bdiff.py
        
                    76 lines
            
             | 2.1 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / cffi / bdiff.py
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Yuya Nishihara
    
cffi: split modules from pure...

              r32512
            
      # bdiff.py - CFFI implementation of bdiff.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

      import struct

      from ..pure.bdiff import *

      from . import _bdiff

      ffi = _bdiff.ffi

      lib = _bdiff.lib

        Yuya Nishihara
    
cffi: remove superfluous "if True" blocks

              r32513
            
      def blocks(sa, sb):

          a = ffi.new("struct bdiff_line**")

          b = ffi.new("struct bdiff_line**")

          ac = ffi.new("char[]", str(sa))

          bc = ffi.new("char[]", str(sb))

          l = ffi.new("struct bdiff_hunk*")

          try:

              an = lib.bdiff_splitlines(ac, len(sa), a)

              bn = lib.bdiff_splitlines(bc, len(sb), b)

              if not a[0] or not b[0]:

                  raise MemoryError

              count = lib.bdiff_diff(a[0], an, b[0], bn, l)

              if count < 0:

                  raise MemoryError

              rl = [None] * count

              h = l.next

              i = 0

              while h:

                  rl[i] = (h.a1, h.a2, h.b1, h.b2)

                  h = h.next

                  i += 1

          finally:

              lib.free(a[0])

              lib.free(b[0])

              lib.bdiff_freehunks(l.next)

          return rl

        Yuya Nishihara
    
cffi: split modules from pure...

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

              r32513
            
      def bdiff(sa, sb):

          a = ffi.new("struct bdiff_line**")

          b = ffi.new("struct bdiff_line**")

          ac = ffi.new("char[]", str(sa))

          bc = ffi.new("char[]", str(sb))

          l = ffi.new("struct bdiff_hunk*")

          try:

              an = lib.bdiff_splitlines(ac, len(sa), a)

              bn = lib.bdiff_splitlines(bc, len(sb), b)

              if not a[0] or not b[0]:

                  raise MemoryError

              count = lib.bdiff_diff(a[0], an, b[0], bn, l)

              if count < 0:

                  raise MemoryError

              rl = []

              h = l.next

              la = lb = 0

              while h:

                  if h.a1 != la or h.b1 != lb:

                      lgt = (b[0] + h.b1).l - (b[0] + lb).l

                      rl.append(struct.pack(">lll", (a[0] + la).l - a[0].l,

                                            (a[0] + h.a1).l - a[0].l, lgt))

                      rl.append(str(ffi.buffer((b[0] + lb).l, lgt)))

                  la = h.a2

                  lb = h.b2

                  h = h.next

        Yuya Nishihara
    
cffi: split modules from pure...

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

              r32513
            
          finally:

              lib.free(a[0])

              lib.free(b[0])

              lib.bdiff_freehunks(l.next)

          return "".join(rl)

	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	# bdiff.py - CFFI implementation of bdiff.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

		import struct

		from ..pure.bdiff import *
		from . import _bdiff

		ffi = _bdiff.ffi
		lib = _bdiff.lib

Yuya Nishihara cffi: remove superfluous "if True" blocks	r32513	def blocks(sa, sb):
		a = ffi.new("struct bdiff_line**")
		b = ffi.new("struct bdiff_line**")
		ac = ffi.new("char[]", str(sa))
		bc = ffi.new("char[]", str(sb))
		l = ffi.new("struct bdiff_hunk*")
		try:
		an = lib.bdiff_splitlines(ac, len(sa), a)
		bn = lib.bdiff_splitlines(bc, len(sb), b)
		if not a[0] or not b[0]:
		raise MemoryError
		count = lib.bdiff_diff(a[0], an, b[0], bn, l)
		if count < 0:
		raise MemoryError
		rl = [None] * count
		h = l.next
		i = 0
		while h:
		rl[i] = (h.a1, h.a2, h.b1, h.b2)
		h = h.next
		i += 1
		finally:
		lib.free(a[0])
		lib.free(b[0])
		lib.bdiff_freehunks(l.next)
		return rl
Yuya Nishihara cffi: split modules from pure...	r32512
Yuya Nishihara cffi: remove superfluous "if True" blocks	r32513	def bdiff(sa, sb):
		a = ffi.new("struct bdiff_line**")
		b = ffi.new("struct bdiff_line**")
		ac = ffi.new("char[]", str(sa))
		bc = ffi.new("char[]", str(sb))
		l = ffi.new("struct bdiff_hunk*")
		try:
		an = lib.bdiff_splitlines(ac, len(sa), a)
		bn = lib.bdiff_splitlines(bc, len(sb), b)
		if not a[0] or not b[0]:
		raise MemoryError
		count = lib.bdiff_diff(a[0], an, b[0], bn, l)
		if count < 0:
		raise MemoryError
		rl = []
		h = l.next
		la = lb = 0
		while h:
		if h.a1 != la or h.b1 != lb:
		lgt = (b[0] + h.b1).l - (b[0] + lb).l
		rl.append(struct.pack(">lll", (a[0] + la).l - a[0].l,
		(a[0] + h.a1).l - a[0].l, lgt))
		rl.append(str(ffi.buffer((b[0] + lb).l, lgt)))
		la = h.a2
		lb = h.b2
		h = h.next
Yuya Nishihara cffi: split modules from pure...	r32512
Yuya Nishihara cffi: remove superfluous "if True" blocks	r32513	finally:
		lib.free(a[0])
		lib.free(b[0])
		lib.bdiff_freehunks(l.next)
		return "".join(rl)