Mercurial > hg
view mercurial/cext/bdiff.pyi @ 46497:4a012e531066
diff: extract function for getting possibly re-merged parent to diff against
We'll want to reuse the logic that `hg diff --change` with
`diff.merge` uses. At least `hg log -p` should reuse it. This patch
therefore extracts that code to a function.
Differential Revision: https://phab.mercurial-scm.org/D9957
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Thu, 04 Feb 2021 13:21:01 -0800 |
parents | 8dca9051a859 |
children | b8389533ba3a |
line wrap: on
line source
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]]: ...