Andrew's git / gitweb.git /
cbf5d8e166541a17e9d87206bdd8965ae15f6e92
   1/*
   2 *  LibXDiff by Davide Libenzi ( File Differential Library )
   3 *  Copyright (C) 2003  Davide Libenzi
   4 *
   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.
   9 *
  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.
  14 *
  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
  18 *
  19 *  Davide Libenzi <davidel@xmailserver.org>
  20 *
  21 */
  22
  23#if !defined(XDIFF_H)
  24#define XDIFF_H
  25
  26#ifdef __cplusplus
  27extern "C" {
  28#endif /* #ifdef __cplusplus */
  29
  30/* xpparm_t.flags */
  31#define XDF_NEED_MINIMAL (1 << 0)
  32
  33#define XDF_IGNORE_WHITESPACE (1 << 1)
  34#define XDF_IGNORE_WHITESPACE_CHANGE (1 << 2)
  35#define XDF_IGNORE_WHITESPACE_AT_EOL (1 << 3)
  36#define XDF_WHITESPACE_FLAGS (XDF_IGNORE_WHITESPACE | \
  37                              XDF_IGNORE_WHITESPACE_CHANGE | \
  38                              XDF_IGNORE_WHITESPACE_AT_EOL)
  39
  40#define XDF_IGNORE_BLANK_LINES (1 << 7)
  41
  42#define XDF_PATIENCE_DIFF (1 << 14)
  43#define XDF_HISTOGRAM_DIFF (1 << 15)
  44#define XDF_DIFF_ALGORITHM_MASK (XDF_PATIENCE_DIFF | XDF_HISTOGRAM_DIFF)
  45#define XDF_DIFF_ALG(x) ((x) & XDF_DIFF_ALGORITHM_MASK)
  46
  47#define XDF_INDENT_HEURISTIC (1 << 23)
  48
  49/* xdemitconf_t.flags */
  50#define XDL_EMIT_FUNCNAMES (1 << 0)
  51#define XDL_EMIT_FUNCCONTEXT (1 << 2)
  52
  53#define XDL_MMB_READONLY (1 << 0)
  54
  55#define XDL_MMF_ATOMIC (1 << 0)
  56
  57#define XDL_BDOP_INS 1
  58#define XDL_BDOP_CPY 2
  59#define XDL_BDOP_INSB 3
  60
  61/* merge simplification levels */
  62#define XDL_MERGE_MINIMAL 0
  63#define XDL_MERGE_EAGER 1
  64#define XDL_MERGE_ZEALOUS 2
  65#define XDL_MERGE_ZEALOUS_ALNUM 3
  66
  67/* merge favor modes */
  68#define XDL_MERGE_FAVOR_OURS 1
  69#define XDL_MERGE_FAVOR_THEIRS 2
  70#define XDL_MERGE_FAVOR_UNION 3
  71
  72/* merge output styles */
  73#define XDL_MERGE_DIFF3 1
  74
  75typedef struct s_mmfile {
  76        char *ptr;
  77        long size;
  78} mmfile_t;
  79
  80typedef struct s_mmbuffer {
  81        char *ptr;
  82        long size;
  83} mmbuffer_t;
  84
  85typedef struct s_xpparam {
  86        unsigned long flags;
  87} xpparam_t;
  88
  89typedef struct s_xdemitcb {
  90        void *priv;
  91        int (*outf)(void *, mmbuffer_t *, int);
  92} xdemitcb_t;
  93
  94typedef long (*find_func_t)(const char *line, long line_len, char *buffer, long buffer_size, void *priv);
  95
  96typedef int (*xdl_emit_hunk_consume_func_t)(long start_a, long count_a,
  97                                            long start_b, long count_b,
  98                                            void *cb_data);
  99
 100typedef struct s_xdemitconf {
 101        long ctxlen;
 102        long interhunkctxlen;
 103        unsigned long flags;
 104        find_func_t find_func;
 105        void *find_func_priv;
 106        xdl_emit_hunk_consume_func_t hunk_func;
 107} xdemitconf_t;
 108
 109typedef struct s_bdiffparam {
 110        long bsize;
 111} bdiffparam_t;
 112
 113
 114#define xdl_malloc(x) malloc(x)
 115#define xdl_free(ptr) free(ptr)
 116#define xdl_realloc(ptr,x) realloc(ptr,x)
 117
 118void *xdl_mmfile_first(mmfile_t *mmf, long *size);
 119long xdl_mmfile_size(mmfile_t *mmf);
 120
 121int xdl_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp,
 122             xdemitconf_t const *xecfg, xdemitcb_t *ecb);
 123
 124typedef struct s_xmparam {
 125        xpparam_t xpp;
 126        int marker_size;
 127        int level;
 128        int favor;
 129        int style;
 130        const char *ancestor;   /* label for orig */
 131        const char *file1;      /* label for mf1 */
 132        const char *file2;      /* label for mf2 */
 133} xmparam_t;
 134
 135#define DEFAULT_CONFLICT_MARKER_SIZE 7
 136
 137int xdl_merge(mmfile_t *orig, mmfile_t *mf1, mmfile_t *mf2,
 138                xmparam_t const *xmp, mmbuffer_t *result);
 139
 140#ifdef __cplusplus
 141}
 142#endif /* #ifdef __cplusplus */
 143
 144#endif /* #if !defined(XDIFF_H) */