Seventh batch for 2.6
[git/gitweb.git] / xdiff / xdiff.h
blobc0339919ccf78c4fe7d78123f9c3e891075d0602
1 /*
2 * LibXDiff by Davide Libenzi ( File Differential Library )
3 * Copyright (C) 2003 Davide Libenzi
5 * This library is free software; you can redistribute it and/or
6 * modify it under the terms of the GNU Lesser General Public
7 * License as published by the Free Software Foundation; either
8 * version 2.1 of the License, or (at your option) any later version.
10 * This library is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13 * Lesser General Public License for more details.
15 * You should have received a copy of the GNU Lesser General Public
16 * License along with this library; if not, write to the Free Software
17 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
19 * Davide Libenzi <davidel@xmailserver.org>
23 #if !defined(XDIFF_H)
24 #define XDIFF_H
26 #ifdef __cplusplus
27 extern "C" {
28 #endif /* #ifdef __cplusplus */
31 #define XDF_NEED_MINIMAL (1 << 1)
32 #define XDF_IGNORE_WHITESPACE (1 << 2)
33 #define XDF_IGNORE_WHITESPACE_CHANGE (1 << 3)
34 #define XDF_IGNORE_WHITESPACE_AT_EOL (1 << 4)
35 #define XDF_WHITESPACE_FLAGS (XDF_IGNORE_WHITESPACE | XDF_IGNORE_WHITESPACE_CHANGE | XDF_IGNORE_WHITESPACE_AT_EOL)
37 #define XDF_PATIENCE_DIFF (1 << 5)
38 #define XDF_HISTOGRAM_DIFF (1 << 6)
39 #define XDF_DIFF_ALGORITHM_MASK (XDF_PATIENCE_DIFF | XDF_HISTOGRAM_DIFF)
40 #define XDF_DIFF_ALG(x) ((x) & XDF_DIFF_ALGORITHM_MASK)
42 #define XDF_IGNORE_BLANK_LINES (1 << 7)
44 #define XDL_EMIT_FUNCNAMES (1 << 0)
45 #define XDL_EMIT_COMMON (1 << 1)
46 #define XDL_EMIT_FUNCCONTEXT (1 << 2)
48 #define XDL_MMB_READONLY (1 << 0)
50 #define XDL_MMF_ATOMIC (1 << 0)
52 #define XDL_BDOP_INS 1
53 #define XDL_BDOP_CPY 2
54 #define XDL_BDOP_INSB 3
56 /* merge simplification levels */
57 #define XDL_MERGE_MINIMAL 0
58 #define XDL_MERGE_EAGER 1
59 #define XDL_MERGE_ZEALOUS 2
60 #define XDL_MERGE_ZEALOUS_ALNUM 3
62 /* merge favor modes */
63 #define XDL_MERGE_FAVOR_OURS 1
64 #define XDL_MERGE_FAVOR_THEIRS 2
65 #define XDL_MERGE_FAVOR_UNION 3
67 /* merge output styles */
68 #define XDL_MERGE_DIFF3 1
70 typedef struct s_mmfile {
71 char *ptr;
72 long size;
73 } mmfile_t;
75 typedef struct s_mmbuffer {
76 char *ptr;
77 long size;
78 } mmbuffer_t;
80 typedef struct s_xpparam {
81 unsigned long flags;
82 } xpparam_t;
84 typedef struct s_xdemitcb {
85 void *priv;
86 int (*outf)(void *, mmbuffer_t *, int);
87 } xdemitcb_t;
89 typedef long (*find_func_t)(const char *line, long line_len, char *buffer, long buffer_size, void *priv);
91 typedef int (*xdl_emit_hunk_consume_func_t)(long start_a, long count_a,
92 long start_b, long count_b,
93 void *cb_data);
95 typedef struct s_xdemitconf {
96 long ctxlen;
97 long interhunkctxlen;
98 unsigned long flags;
99 find_func_t find_func;
100 void *find_func_priv;
101 xdl_emit_hunk_consume_func_t hunk_func;
102 } xdemitconf_t;
104 typedef struct s_bdiffparam {
105 long bsize;
106 } bdiffparam_t;
109 #define xdl_malloc(x) malloc(x)
110 #define xdl_free(ptr) free(ptr)
111 #define xdl_realloc(ptr,x) realloc(ptr,x)
113 void *xdl_mmfile_first(mmfile_t *mmf, long *size);
114 long xdl_mmfile_size(mmfile_t *mmf);
116 int xdl_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp,
117 xdemitconf_t const *xecfg, xdemitcb_t *ecb);
119 typedef struct s_xmparam {
120 xpparam_t xpp;
121 int marker_size;
122 int level;
123 int favor;
124 int style;
125 const char *ancestor; /* label for orig */
126 const char *file1; /* label for mf1 */
127 const char *file2; /* label for mf2 */
128 } xmparam_t;
130 #define DEFAULT_CONFLICT_MARKER_SIZE 7
132 int xdl_merge(mmfile_t *orig, mmfile_t *mf1, mmfile_t *mf2,
133 xmparam_t const *xmp, mmbuffer_t *result);
135 #ifdef __cplusplus
137 #endif /* #ifdef __cplusplus */
139 #endif /* #if !defined(XDIFF_H) */