mirror of
https://github.com/git/git.git
synced 2024-10-30 22:07:53 +01:00
3cde4e02ee
When a patch inserts a block of lines, whose last lines are the same as the existing lines that appear before the inserted block, "git diff" can choose any place between these existing lines as the boundary between the pre-context and the added lines (adjusting the end of the inserted block as appropriate) to come up with variants of the same patch, and some variants are easier to read than others. We have been trying to improve the choice of this boundary, and Git 2.11 shipped with an experimental "compaction-heuristic". Since then another attempt to improve the logic further resulted in a new "indent-heuristic" logic. It is agreed that the latter gives better result overall, and the former outlived its usefulness. Retire "compaction", and keep "indent" as an experimental feature. The latter hopefully will be turned on by default in a future release, but that should be done as a separate step. Suggested-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
140 lines
3.6 KiB
C
140 lines
3.6 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, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
*
|
|
* Davide Libenzi <davidel@xmailserver.org>
|
|
*
|
|
*/
|
|
|
|
#if !defined(XDIFF_H)
|
|
#define XDIFF_H
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif /* #ifdef __cplusplus */
|
|
|
|
|
|
#define XDF_NEED_MINIMAL (1 << 1)
|
|
#define XDF_IGNORE_WHITESPACE (1 << 2)
|
|
#define XDF_IGNORE_WHITESPACE_CHANGE (1 << 3)
|
|
#define XDF_IGNORE_WHITESPACE_AT_EOL (1 << 4)
|
|
#define XDF_WHITESPACE_FLAGS (XDF_IGNORE_WHITESPACE | XDF_IGNORE_WHITESPACE_CHANGE | XDF_IGNORE_WHITESPACE_AT_EOL)
|
|
|
|
#define XDF_PATIENCE_DIFF (1 << 5)
|
|
#define XDF_HISTOGRAM_DIFF (1 << 6)
|
|
#define XDF_DIFF_ALGORITHM_MASK (XDF_PATIENCE_DIFF | XDF_HISTOGRAM_DIFF)
|
|
#define XDF_DIFF_ALG(x) ((x) & XDF_DIFF_ALGORITHM_MASK)
|
|
|
|
#define XDF_IGNORE_BLANK_LINES (1 << 7)
|
|
|
|
#define XDF_INDENT_HEURISTIC (1 << 8)
|
|
|
|
#define XDL_EMIT_FUNCNAMES (1 << 0)
|
|
#define XDL_EMIT_FUNCCONTEXT (1 << 2)
|
|
|
|
#define XDL_MMB_READONLY (1 << 0)
|
|
|
|
#define XDL_MMF_ATOMIC (1 << 0)
|
|
|
|
#define XDL_BDOP_INS 1
|
|
#define XDL_BDOP_CPY 2
|
|
#define XDL_BDOP_INSB 3
|
|
|
|
/* 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;
|
|
} xpparam_t;
|
|
|
|
typedef struct s_xdemitcb {
|
|
void *priv;
|
|
int (*outf)(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) */
|