mirror of
https://github.com/git/git.git
synced 2024-11-15 21:53:44 +01:00
857b933e04
This new function implements the functionality of RCS merge, but in-memory. It returns < 0 on error, otherwise the number of conflicts. Finding the conflicting lines can be a very expensive task. You can control the eagerness of this algorithm: - a level value of 0 means that all overlapping changes are treated as conflicts, - a value of 1 means that if the overlapping changes are identical, it is not treated as a conflict. - If you set level to 2, overlapping changes will be analyzed, so that almost identical changes will not result in huge conflicts. Rather, only the conflicting lines will be shown inside conflict markers. With each increasing level, the algorithm gets slower, but more accurate. Note that the code for level 2 depends on the simple definition of mmfile_t specific to git, and therefore it will be harder to port that to LibXDiff. Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de> Signed-off-by: Junio C Hamano <junkio@cox.net>
105 lines
2.6 KiB
C
105 lines
2.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_WHITESPACE_FLAGS (XDF_IGNORE_WHITESPACE | XDF_IGNORE_WHITESPACE_CHANGE)
|
|
|
|
#define XDL_PATCH_NORMAL '-'
|
|
#define XDL_PATCH_REVERSE '+'
|
|
#define XDL_PATCH_MODEMASK ((1 << 8) - 1)
|
|
#define XDL_PATCH_IGNOREBSPACE (1 << 8)
|
|
|
|
#define XDL_EMIT_FUNCNAMES (1 << 0)
|
|
#define XDL_EMIT_COMMON (1 << 1)
|
|
|
|
#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
|
|
|
|
#define XDL_MERGE_MINIMAL 0
|
|
#define XDL_MERGE_EAGER 1
|
|
#define XDL_MERGE_ZEALOUS 2
|
|
|
|
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 struct s_xdemitconf {
|
|
long ctxlen;
|
|
unsigned long flags;
|
|
} 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);
|
|
void *xdl_mmfile_next(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);
|
|
|
|
int xdl_merge(mmfile_t *orig, mmfile_t *mf1, const char *name1,
|
|
mmfile_t *mf2, const char *name2,
|
|
xpparam_t const *xpp, int level, mmbuffer_t *result);
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif /* #ifdef __cplusplus */
|
|
|
|
#endif /* #if !defined(XDIFF_H) */
|
|
|