##// END OF EJS Templates
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

File last commit:

r46652:8dca9051 default
r49406:c6649c53 default
Show More
osutil.pyi
26 lines | 629 B | text/x-python | PythonLexer
Gregory Szorc
cext: add .pyi files for C extensions...
r46652 from typing import (
AnyStr,
IO,
List,
Sequence,
)
version: int
class stat:
st_dev: int
st_mode: int
st_nlink: int
st_size: int
st_mtime: int
st_ctime: int
def listdir(path: bytes, st: bool, skip: bool) -> List[stat]: ...
def posixfile(name: AnyStr, mode: bytes, buffering: int) -> IO: ...
def statfiles(names: Sequence[bytes]) -> List[stat]: ...
def recvfds(sockfd: int) -> List[int]: ...
def setprocname(name: bytes) -> None: ...
def getfstype(path: bytes) -> bytes: ...
def getfsmountpoint(path: bytes) -> bytes: ...
def unblocksignal(sig: int) -> None: ...
def isgui() -> bool: ...