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

typing: add type annotations to the dirstate classes...

typing: add type annotations to the dirstate classes The basic procedure here was to use `merge-pyi` to merge the `git/dirstate.pyi` file in (after renaming the interface class to match), cleaning up the import statement mess, and then repeating the procedure for `mercurial/dirstate.pyi`. Surprisingly, git's dirstate had more hints inferred in its *.pyi file. After that, it was a manual examination of each method in the interface, and how they were implemented in the core and git classes to verify what was inferred by pytype, and fill in the missing gaps. Since this involved jumping around between three different files, I applied the same type info to all three at the same time. Complex types I rolled up into type aliases in the interface module, and used that as needed. That way if it changes, there's one place to edit. There are some hints still missing, and some documentation that doesn't match the signatures. They should all be marked with TODOs. There are also a bunch of methods on the core class that aren't on the Protocol class that seem like maybe they should be (like `set_tracked()`). There are even more methods missing from the git class. But that's a project for another time.

Matt Harbison - - Load All Authors

File last commit:

r52756:f4733654 default


                r52822:93d872a0

default

Download file

             bdiff.py
        
                    89 lines
            
             | 2.4 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.

        Matt Harbison
    
typing: add `from __future__ import annotations` to most files...

              r52756
            
      from __future__ import annotations

        Yuya Nishihara
    
cffi: split modules from pure...

              r32512
            
      import struct

        Matt Harbison
    
typing: add type hints to bdiff implementations...

              r50493
            
      from typing import (

          List,

          Tuple,

      )

        Yuya Nishihara
    
cffi: split modules from pure...

              r32512
            
      from ..pure.bdiff import *

        Matt Harbison
    
typing: disable import error warnings that are already handled...

              r47543
            
      from . import _bdiff  # pytype: disable=import-error

        Yuya Nishihara
    
cffi: split modules from pure...

              r32512
            
      ffi = _bdiff.ffi

      lib = _bdiff.lib

        Augie Fackler
    
formatting: blacken the codebase...

              r43346
            
        Matt Harbison
    
typing: add type hints to bdiff implementations...

              r50493
            
      def blocks(sa: bytes, sb: bytes) -> List[Tuple[int, int, int, int]]:

        Manuel Jacob
    
cffi: pass C type and attribute names as str instead of bytes

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

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

        Manuel Jacob
    
cffi: pass bytes instead of str to ffi.new("char[]", …)...

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

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

        Manuel Jacob
    
cffi: pass C type and attribute names as str instead of bytes

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

        Yuya Nishihara
    
cffi: remove superfluous "if True" blocks

              r32513
            
          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

        Matt Harbison
    
cffi: adjust the list returned by bdiff.blocks to never have a None entry...

              r50492
            
              rl = [(0, 0, 0, 0)] * count

        Yuya Nishihara
    
cffi: remove superfluous "if True" blocks

              r32513
            
              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
            
        Augie Fackler
    
formatting: blacken the codebase...

              r43346
            
        Matt Harbison
    
typing: add type hints to bdiff implementations...

              r50493
            
      def bdiff(sa: bytes, sb: bytes) -> bytes:

        Manuel Jacob
    
cffi: pass C type and attribute names as str instead of bytes

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

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

        Manuel Jacob
    
cffi: pass bytes instead of str to ffi.new("char[]", …)...

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

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

        Manuel Jacob
    
cffi: pass C type and attribute names as str instead of bytes

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

        Yuya Nishihara
    
cffi: remove superfluous "if True" blocks

              r32513
            
          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

        Augie Fackler
    
formatting: blacken the codebase...

              r43346
            
                      rl.append(

                          struct.pack(

        Augie Fackler
    
formatting: byteify all mercurial/ and hgext/ string literals...

              r43347
            
                              b">lll",

        Augie Fackler
    
formatting: blacken the codebase...

              r43346
            
                              (a[0] + la).l - a[0].l,

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

                              lgt,

                          )

                      )

        Manuel Jacob
    
cffi: call bytes() instead of str() on CFFI buffer instances

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

        Yuya Nishihara
    
cffi: remove superfluous "if True" blocks

              r32513
            
                  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)

        Augie Fackler
    
formatting: byteify all mercurial/ and hgext/ string literals...

              r43347
            
          return b"".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.

Matt Harbison typing: add `from __future__ import annotations` to most files...	r52756	from __future__ import annotations
Yuya Nishihara cffi: split modules from pure...	r32512
		import struct

Matt Harbison typing: add type hints to bdiff implementations...	r50493	from typing import (
		List,
		Tuple,
		)

Yuya Nishihara cffi: split modules from pure...	r32512	from ..pure.bdiff import *
Matt Harbison typing: disable import error warnings that are already handled...	r47543	from . import _bdiff # pytype: disable=import-error
Yuya Nishihara cffi: split modules from pure...	r32512
		ffi = _bdiff.ffi
		lib = _bdiff.lib

Augie Fackler formatting: blacken the codebase...	r43346
Matt Harbison typing: add type hints to bdiff implementations...	r50493	def blocks(sa: bytes, sb: bytes) -> List[Tuple[int, int, int, int]]:
Manuel Jacob cffi: pass C type and attribute names as str instead of bytes	r52683	a = ffi.new("struct bdiff_line**")
		b = ffi.new("struct bdiff_line**")
Manuel Jacob cffi: pass bytes instead of str to ffi.new("char[]", …)...	r52685	ac = ffi.new("char[]", bytes(sa))
		bc = ffi.new("char[]", bytes(sb))
Manuel Jacob cffi: pass C type and attribute names as str instead of bytes	r52683	l = ffi.new("struct bdiff_hunk*")
Yuya Nishihara cffi: remove superfluous "if True" blocks	r32513	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
Matt Harbison cffi: adjust the list returned by bdiff.blocks to never have a None entry...	r50492	rl = [(0, 0, 0, 0)] * count
Yuya Nishihara cffi: remove superfluous "if True" blocks	r32513	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
Augie Fackler formatting: blacken the codebase...	r43346
Matt Harbison typing: add type hints to bdiff implementations...	r50493	def bdiff(sa: bytes, sb: bytes) -> bytes:
Manuel Jacob cffi: pass C type and attribute names as str instead of bytes	r52683	a = ffi.new("struct bdiff_line**")
		b = ffi.new("struct bdiff_line**")
Manuel Jacob cffi: pass bytes instead of str to ffi.new("char[]", …)...	r52685	ac = ffi.new("char[]", bytes(sa))
		bc = ffi.new("char[]", bytes(sb))
Manuel Jacob cffi: pass C type and attribute names as str instead of bytes	r52683	l = ffi.new("struct bdiff_hunk*")
Yuya Nishihara cffi: remove superfluous "if True" blocks	r32513	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
Augie Fackler formatting: blacken the codebase...	r43346	rl.append(
		struct.pack(
Augie Fackler formatting: byteify all mercurial/ and hgext/ string literals...	r43347	b">lll",
Augie Fackler formatting: blacken the codebase...	r43346	(a[0] + la).l - a[0].l,
		(a[0] + h.a1).l - a[0].l,
		lgt,
		)
		)
Manuel Jacob cffi: call bytes() instead of str() on CFFI buffer instances	r52684	rl.append(bytes(ffi.buffer((b[0] + lb).l, lgt)))
Yuya Nishihara cffi: remove superfluous "if True" blocks	r32513	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)
Augie Fackler formatting: byteify all mercurial/ and hgext/ string literals...	r43347	return b"".join(rl)