upstream/mercurial-mirror Files · mercurial/cext/bdiff.pyi

simplemerge: make merge_lines() a free function...

simplemerge: make merge_lines() a free function IMO, the rendering of a conflict as text with merge markers should be separate from the code for resolving conflicts. The latter is what `Merge3Text` is mostly about already. Differential Revision: https://phab.mercurial-scm.org/D11974

Gregory Szorc - - Load All Authors

File last commit:

r46652:8dca9051 default


                r49406:c6649c53

default

Download file

             bdiff.pyi
        
                    12 lines
            
             | 341 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / cext / bdiff.pyi
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      from typing import (

          List,

          Tuple,

      )

      version: int

      def bdiff(a: bytes, b: bytes): bytes

      def blocks(a: bytes, b: bytes) -> List[Tuple[int, int, int, int]]: ...

      def fixws(s: bytes, allws: bool) -> bytes: ...

      def splitnewlines(text: bytes) -> List[bytes]: ...

      def xdiffblocks(a: bytes, b: bytes) -> List[Tuple[int, int, int, int]]: ...

	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

				from typing import (
				List,
				Tuple,
				)

				version: int

				def bdiff(a: bytes, b: bytes): bytes
				def blocks(a: bytes, b: bytes) -> List[Tuple[int, int, int, int]]: ...
				def fixws(s: bytes, allws: bool) -> bytes: ...
				def splitnewlines(text: bytes) -> List[bytes]: ...
				def xdiffblocks(a: bytes, b: bytes) -> List[Tuple[int, int, int, int]]: ...