mirror of
https://github.com/git/git.git
synced 2024-10-31 22:37:54 +01:00
611e42a598
The xdiff library always emits hunk header lines to our callbacks as
formatted strings like "@@ -a,b +c,d @@\n". This is convenient if we're
going to output a diff, but less so if we actually need to compute using
those numbers, which requires re-parsing the line.
In preparation for moving away from this, let's teach xdiff a new
callback function which gets the broken-out hunk information. To help
callers that don't want to use this new callback, if it's NULL we'll
continue to format the hunk header into a string.
Note that this function renames the "outf" callback to "out_line", as
well. This isn't strictly necessary, but helps in two ways:
1. Now that there are two callbacks, it's nice to use more descriptive
names.
2. Many callers did not zero the emit_callback_data struct, and needed
to be modified to set ecb.out_hunk to NULL. By changing the name of
the existing struct member, that guarantees that any new callers
from in-flight topics will break the build and be examined
manually.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
146 lines
3.7 KiB
C
146 lines
3.7 KiB
C
/*
|
|
* LibXDiff by Davide Libenzi ( File Differential Library )
|
|
* Copyright (C) 2003 Davide Libenzi
|
|
*
|
|
* This library is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
* License as published by the Free Software Foundation; either
|
|
* version 2.1 of the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library; if not, see
|
|
* <http://www.gnu.org/licenses/>.
|
|
*
|
|
* Davide Libenzi <davidel@xmailserver.org>
|
|
*
|
|
*/
|
|
|
|
#if !defined(XDIFF_H)
|
|
#define XDIFF_H
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif /* #ifdef __cplusplus */
|
|
|
|
/* xpparm_t.flags */
|
|
#define XDF_NEED_MINIMAL (1 << 0)
|
|
|
|
#define XDF_IGNORE_WHITESPACE (1 << 1)
|
|
#define XDF_IGNORE_WHITESPACE_CHANGE (1 << 2)
|
|
#define XDF_IGNORE_WHITESPACE_AT_EOL (1 << 3)
|
|
#define XDF_IGNORE_CR_AT_EOL (1 << 4)
|
|
#define XDF_WHITESPACE_FLAGS (XDF_IGNORE_WHITESPACE | \
|
|
XDF_IGNORE_WHITESPACE_CHANGE | \
|
|
XDF_IGNORE_WHITESPACE_AT_EOL | \
|
|
XDF_IGNORE_CR_AT_EOL)
|
|
|
|
#define XDF_IGNORE_BLANK_LINES (1 << 7)
|
|
|
|
#define XDF_PATIENCE_DIFF (1 << 14)
|
|
#define XDF_HISTOGRAM_DIFF (1 << 15)
|
|
#define XDF_DIFF_ALGORITHM_MASK (XDF_PATIENCE_DIFF | XDF_HISTOGRAM_DIFF)
|
|
#define XDF_DIFF_ALG(x) ((x) & XDF_DIFF_ALGORITHM_MASK)
|
|
|
|
#define XDF_INDENT_HEURISTIC (1 << 23)
|
|
|
|
/* xdemitconf_t.flags */
|
|
#define XDL_EMIT_FUNCNAMES (1 << 0)
|
|
#define XDL_EMIT_FUNCCONTEXT (1 << 2)
|
|
|
|
/* merge simplification levels */
|
|
#define XDL_MERGE_MINIMAL 0
|
|
#define XDL_MERGE_EAGER 1
|
|
#define XDL_MERGE_ZEALOUS 2
|
|
#define XDL_MERGE_ZEALOUS_ALNUM 3
|
|
|
|
/* merge favor modes */
|
|
#define XDL_MERGE_FAVOR_OURS 1
|
|
#define XDL_MERGE_FAVOR_THEIRS 2
|
|
#define XDL_MERGE_FAVOR_UNION 3
|
|
|
|
/* merge output styles */
|
|
#define XDL_MERGE_DIFF3 1
|
|
|
|
typedef struct s_mmfile {
|
|
char *ptr;
|
|
long size;
|
|
} mmfile_t;
|
|
|
|
typedef struct s_mmbuffer {
|
|
char *ptr;
|
|
long size;
|
|
} mmbuffer_t;
|
|
|
|
typedef struct s_xpparam {
|
|
unsigned long flags;
|
|
|
|
/* See Documentation/diff-options.txt. */
|
|
char **anchors;
|
|
size_t anchors_nr;
|
|
} xpparam_t;
|
|
|
|
typedef struct s_xdemitcb {
|
|
void *priv;
|
|
int (*out_hunk)(void *,
|
|
long old_begin, long old_nr,
|
|
long new_begin, long new_nr,
|
|
const char *func, long funclen);
|
|
int (*out_line)(void *, mmbuffer_t *, int);
|
|
} xdemitcb_t;
|
|
|
|
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;
|
|
unsigned long flags;
|
|
find_func_t find_func;
|
|
void *find_func_priv;
|
|
xdl_emit_hunk_consume_func_t hunk_func;
|
|
} xdemitconf_t;
|
|
|
|
typedef struct s_bdiffparam {
|
|
long bsize;
|
|
} bdiffparam_t;
|
|
|
|
|
|
#define xdl_malloc(x) malloc(x)
|
|
#define xdl_free(ptr) free(ptr)
|
|
#define xdl_realloc(ptr,x) realloc(ptr,x)
|
|
|
|
void *xdl_mmfile_first(mmfile_t *mmf, long *size);
|
|
long xdl_mmfile_size(mmfile_t *mmf);
|
|
|
|
int xdl_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp,
|
|
xdemitconf_t const *xecfg, xdemitcb_t *ecb);
|
|
|
|
typedef struct s_xmparam {
|
|
xpparam_t xpp;
|
|
int marker_size;
|
|
int level;
|
|
int favor;
|
|
int style;
|
|
const char *ancestor; /* label for orig */
|
|
const char *file1; /* label for mf1 */
|
|
const char *file2; /* label for mf2 */
|
|
} xmparam_t;
|
|
|
|
#define DEFAULT_CONFLICT_MARKER_SIZE 7
|
|
|
|
int xdl_merge(mmfile_t *orig, mmfile_t *mf1, mmfile_t *mf2,
|
|
xmparam_t const *xmp, mmbuffer_t *result);
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif /* #ifdef __cplusplus */
|
|
|
|
#endif /* #if !defined(XDIFF_H) */
|