|
Packit Service |
20376f |
/*
|
|
Packit Service |
20376f |
* LibXDiff by Davide Libenzi ( File Differential Library )
|
|
Packit Service |
20376f |
* Copyright (C) 2003 Davide Libenzi
|
|
Packit Service |
20376f |
*
|
|
Packit Service |
20376f |
* This library is free software; you can redistribute it and/or
|
|
Packit Service |
20376f |
* modify it under the terms of the GNU Lesser General Public
|
|
Packit Service |
20376f |
* License as published by the Free Software Foundation; either
|
|
Packit Service |
20376f |
* version 2.1 of the License, or (at your option) any later version.
|
|
Packit Service |
20376f |
*
|
|
Packit Service |
20376f |
* This library is distributed in the hope that it will be useful,
|
|
Packit Service |
20376f |
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
Packit Service |
20376f |
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Packit Service |
20376f |
* Lesser General Public License for more details.
|
|
Packit Service |
20376f |
*
|
|
Packit Service |
20376f |
* You should have received a copy of the GNU Lesser General Public
|
|
Packit Service |
20376f |
* License along with this library; if not, write to the Free Software
|
|
Packit Service |
20376f |
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
Packit Service |
20376f |
*
|
|
Packit Service |
20376f |
* Davide Libenzi <davidel@xmailserver.org>
|
|
Packit Service |
20376f |
*
|
|
Packit Service |
20376f |
*/
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
#include "../util.h"
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
#if !defined(XDIFF_H)
|
|
Packit Service |
20376f |
#define XDIFF_H
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
#ifdef __cplusplus
|
|
Packit Service |
20376f |
extern "C" {
|
|
Packit Service |
20376f |
#endif /* #ifdef __cplusplus */
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
#define XDF_NEED_MINIMAL (1 << 1)
|
|
Packit Service |
20376f |
#define XDF_IGNORE_WHITESPACE (1 << 2)
|
|
Packit Service |
20376f |
#define XDF_IGNORE_WHITESPACE_CHANGE (1 << 3)
|
|
Packit Service |
20376f |
#define XDF_IGNORE_WHITESPACE_AT_EOL (1 << 4)
|
|
Packit Service |
20376f |
#define XDF_WHITESPACE_FLAGS (XDF_IGNORE_WHITESPACE | XDF_IGNORE_WHITESPACE_CHANGE | XDF_IGNORE_WHITESPACE_AT_EOL)
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
#define XDF_PATIENCE_DIFF (1 << 5)
|
|
Packit Service |
20376f |
#define XDF_HISTOGRAM_DIFF (1 << 6)
|
|
Packit Service |
20376f |
#define XDF_DIFF_ALGORITHM_MASK (XDF_PATIENCE_DIFF | XDF_HISTOGRAM_DIFF)
|
|
Packit Service |
20376f |
#define XDF_DIFF_ALG(x) ((x) & XDF_DIFF_ALGORITHM_MASK)
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
#define XDF_IGNORE_BLANK_LINES (1 << 7)
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
#define XDL_EMIT_FUNCNAMES (1 << 0)
|
|
Packit Service |
20376f |
#define XDL_EMIT_COMMON (1 << 1)
|
|
Packit Service |
20376f |
#define XDL_EMIT_FUNCCONTEXT (1 << 2)
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
#define XDL_MMB_READONLY (1 << 0)
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
#define XDL_MMF_ATOMIC (1 << 0)
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
#define XDL_BDOP_INS 1
|
|
Packit Service |
20376f |
#define XDL_BDOP_CPY 2
|
|
Packit Service |
20376f |
#define XDL_BDOP_INSB 3
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
/* merge simplification levels */
|
|
Packit Service |
20376f |
#define XDL_MERGE_MINIMAL 0
|
|
Packit Service |
20376f |
#define XDL_MERGE_EAGER 1
|
|
Packit Service |
20376f |
#define XDL_MERGE_ZEALOUS 2
|
|
Packit Service |
20376f |
#define XDL_MERGE_ZEALOUS_ALNUM 3
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
/* merge favor modes */
|
|
Packit Service |
20376f |
#define XDL_MERGE_FAVOR_OURS 1
|
|
Packit Service |
20376f |
#define XDL_MERGE_FAVOR_THEIRS 2
|
|
Packit Service |
20376f |
#define XDL_MERGE_FAVOR_UNION 3
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
/* merge output styles */
|
|
Packit Service |
20376f |
#define XDL_MERGE_DIFF3 1
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
typedef struct s_mmfile {
|
|
Packit Service |
20376f |
char *ptr;
|
|
Packit Service |
20376f |
size_t size;
|
|
Packit Service |
20376f |
} mmfile_t;
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
typedef struct s_mmbuffer {
|
|
Packit Service |
20376f |
char *ptr;
|
|
Packit Service |
20376f |
size_t size;
|
|
Packit Service |
20376f |
} mmbuffer_t;
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
typedef struct s_xpparam {
|
|
Packit Service |
20376f |
unsigned long flags;
|
|
Packit Service |
20376f |
} xpparam_t;
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
typedef struct s_xdemitcb {
|
|
Packit Service |
20376f |
void *priv;
|
|
Packit Service |
20376f |
int (*outf)(void *, mmbuffer_t *, int);
|
|
Packit Service |
20376f |
} xdemitcb_t;
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
typedef long (*find_func_t)(const char *line, long line_len, char *buffer, long buffer_size, void *priv);
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
typedef int (*xdl_emit_hunk_consume_func_t)(long start_a, long count_a,
|
|
Packit Service |
20376f |
long start_b, long count_b,
|
|
Packit Service |
20376f |
void *cb_data);
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
typedef struct s_xdemitconf {
|
|
Packit Service |
20376f |
long ctxlen;
|
|
Packit Service |
20376f |
long interhunkctxlen;
|
|
Packit Service |
20376f |
unsigned long flags;
|
|
Packit Service |
20376f |
find_func_t find_func;
|
|
Packit Service |
20376f |
void *find_func_priv;
|
|
Packit Service |
20376f |
xdl_emit_hunk_consume_func_t hunk_func;
|
|
Packit Service |
20376f |
} xdemitconf_t;
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
typedef struct s_bdiffparam {
|
|
Packit Service |
20376f |
long bsize;
|
|
Packit Service |
20376f |
} bdiffparam_t;
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
#define xdl_malloc(x) git__malloc(x)
|
|
Packit Service |
20376f |
#define xdl_free(ptr) git__free(ptr)
|
|
Packit Service |
20376f |
#define xdl_realloc(ptr,x) git__realloc(ptr,x)
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
void *xdl_mmfile_first(mmfile_t *mmf, long *size);
|
|
Packit Service |
20376f |
long xdl_mmfile_size(mmfile_t *mmf);
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
int xdl_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp,
|
|
Packit Service |
20376f |
xdemitconf_t const *xecfg, xdemitcb_t *ecb);
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
typedef struct s_xmparam {
|
|
Packit Service |
20376f |
xpparam_t xpp;
|
|
Packit Service |
20376f |
int marker_size;
|
|
Packit Service |
20376f |
int level;
|
|
Packit Service |
20376f |
int favor;
|
|
Packit Service |
20376f |
int style;
|
|
Packit Service |
20376f |
const char *ancestor; /* label for orig */
|
|
Packit Service |
20376f |
const char *file1; /* label for mf1 */
|
|
Packit Service |
20376f |
const char *file2; /* label for mf2 */
|
|
Packit Service |
20376f |
} xmparam_t;
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
#define DEFAULT_CONFLICT_MARKER_SIZE 7
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
int xdl_merge(mmfile_t *orig, mmfile_t *mf1, mmfile_t *mf2,
|
|
Packit Service |
20376f |
xmparam_t const *xmp, mmbuffer_t *result);
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
#ifdef __cplusplus
|
|
Packit Service |
20376f |
}
|
|
Packit Service |
20376f |
#endif /* #ifdef __cplusplus */
|
|
Packit Service |
20376f |
|
|
Packit Service |
20376f |
#endif /* #if !defined(XDIFF_H) */
|