summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRené Scharfe <rene.scharfe@lsrfire.ath.cx>2012-05-09 20:20:55 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-05-09 21:00:15 (GMT)
commit467d348c19b2ce82753bb9b5a873f6d129eb04e2 (patch)
treeacc276448fc369d45713e87653c5adf9055dd781
parenta3935e6791c619a9f2f472e9e553d45d88c4e263 (diff)
downloadgit-467d348c19b2ce82753bb9b5a873f6d129eb04e2.zip
git-467d348c19b2ce82753bb9b5a873f6d129eb04e2.tar.gz
git-467d348c19b2ce82753bb9b5a873f6d129eb04e2.tar.bz2
xdiff: add hunk_func()
Add a way to register a callback function that is gets passed the start line and line count of each hunk of a diff. Only standard types are used. Signed-off-by: Rene Scharfe <rene.scharfe@lsrfire.ath.cx> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--xdiff/xdiff.h5
-rw-r--r--xdiff/xdiffi.c17
2 files changed, 22 insertions, 0 deletions
diff --git a/xdiff/xdiff.h b/xdiff/xdiff.h
index 09215af..33c010b 100644
--- a/xdiff/xdiff.h
+++ b/xdiff/xdiff.h
@@ -86,6 +86,10 @@ typedef struct s_xdemitcb {
typedef long (*find_func_t)(const char *line, long line_len, char *buffer, long buffer_size, void *priv);
+typedef int (*xdl_emit_hunk_consume_func_t)(long start_a, long count_a,
+ long start_b, long count_b,
+ void *cb_data);
+
typedef struct s_xdemitconf {
long ctxlen;
long interhunkctxlen;
@@ -93,6 +97,7 @@ typedef struct s_xdemitconf {
find_func_t find_func;
void *find_func_priv;
void (*emit_func)();
+ xdl_emit_hunk_consume_func_t hunk_func;
} xdemitconf_t;
typedef struct s_bdiffparam {
diff --git a/xdiff/xdiffi.c b/xdiff/xdiffi.c
index bc889e8..4d671f4 100644
--- a/xdiff/xdiffi.c
+++ b/xdiff/xdiffi.c
@@ -538,6 +538,20 @@ void xdl_free_script(xdchange_t *xscr) {
}
}
+static int xdl_call_hunk_func(xdfenv_t *xe, xdchange_t *xscr, xdemitcb_t *ecb,
+ xdemitconf_t const *xecfg)
+{
+ xdchange_t *xch, *xche;
+
+ for (xch = xscr; xch; xch = xche->next) {
+ xche = xdl_get_hunk(xch, xecfg);
+ if (xecfg->hunk_func(xch->i1, xche->i1 + xche->chg1 - xch->i1,
+ xch->i2, xche->i2 + xche->chg2 - xch->i2,
+ ecb->priv) < 0)
+ return -1;
+ }
+ return 0;
+}
int xdl_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp,
xdemitconf_t const *xecfg, xdemitcb_t *ecb) {
@@ -546,6 +560,9 @@ int xdl_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp,
emit_func_t ef = xecfg->emit_func ?
(emit_func_t)xecfg->emit_func : xdl_emit_diff;
+ if (xecfg->hunk_func)
+ ef = xdl_call_hunk_func;
+
if (xdl_do_diff(mf1, mf2, xpp, &xe) < 0) {
return -1;