Mercurial > hg
view contrib/plan9/mkfile @ 36673:b3c9c483cac9
xdiff: add a bdiff hunk mode
xdiff generated hunks for the differences (ex. questionmarks in the
`@@ -?,? +?,? @@` part from `diff --git` output). However, bdiff generates
matched hunks instead.
This patch adds a `XDL_EMIT_BDIFFHUNK` flag used by the output function
`xdl_call_hunk_func`. Once set, xdiff will generate bdiff-like hunks
instead. That makes it easier to use xdiff as a drop-in replacement of bdiff.
Note that since `bdiff('', '')` returns `[(0, 0, 0, 0)]`, the shortcut path
`if (xscr)` is removed. I have checked functions called with `xscr` argument
(`xdl_mark_ignorable`, `xdl_call_hunk_func`, `xdl_emit_diff`,
`xdl_free_script`) work just fine with `xscr = NULL`.
Test Plan:
Will be tested in a later patch.
Differential Revision: https://phab.mercurial-scm.org/D2575
author | Jun Wu <quark@fb.com> |
---|---|
date | Sat, 03 Mar 2018 12:38:41 -0800 |
parents | f9262456fb01 |
children |
line wrap: on
line source
APE=/sys/src/ape <$APE/config PYTHON=python PYTHONBIN=/rc/bin SH=ape/psh PURE=--pure ROOT=../.. # This is slightly underhanded; Plan 9 does not support GNU gettext nor # does it support dynamically loaded extension modules. We work around # this by calling build_py and build_scripts directly; this avoids # additional platform hacks in setup.py. build:VQ: @{ cd $ROOT $SH -c '$PYTHON setup.py $PURE build_py build_scripts' } clean:VQ: @{ cd $ROOT $SH -c '$PYTHON setup.py $PURE clean --all' } install:VQ: build @{ cd $ROOT $SH -c '$PYTHON setup.py $PURE install \ --install-scripts $PYTHONBIN \ --skip-build \ --force' } mkdir -p /lib/mercurial/hgrc.d dircp hgrc.d /lib/mercurial/hgrc.d/ cp 9diff /rc/bin/