git/xdiff-interface.c

#define USE_THE_REPOSITORY_VARIABLE

#include "git-compat-util.h"
#include "gettext.h"
#include "config.h"
#include "hex.h"
#include "object-store-ll.h"
#include "strbuf.h"
#include "xdiff-interface.h"
#include "xdiff/xtypes.h"
#include "xdiff/xdiffi.h"
#include "xdiff/xutils.h"

struct xdiff_emit_state { … };

static int xdiff_out_hunk(void *priv_,
			  long old_begin, long old_nr,
			  long new_begin, long new_nr,
			  const char *func, long funclen)
{ … }

static int consume_one(void *priv_, char *s, unsigned long size)
{ … }

static int xdiff_outf(void *priv_, mmbuffer_t *mb, int nbuf)
{ … }

/*
 * Trim down common substring at the end of the buffers,
 * but end on a complete line.
 */
static void trim_common_tail(mmfile_t *a, mmfile_t *b)
{ … }

int xdi_diff(mmfile_t *mf1, mmfile_t *mf2, xpparam_t const *xpp, xdemitconf_t const *xecfg, xdemitcb_t *xecb)
{ … }

int xdi_diff_outf(mmfile_t *mf1, mmfile_t *mf2,
		  xdiff_emit_hunk_fn hunk_fn,
		  xdiff_emit_line_fn line_fn,
		  void *consume_callback_data,
		  xpparam_t const *xpp, xdemitconf_t const *xecfg)
{ … }

int read_mmfile(mmfile_t *ptr, const char *filename)
{ … }

void read_mmblob(mmfile_t *ptr, const struct object_id *oid)
{ … }

#define FIRST_FEW_BYTES …
int buffer_is_binary(const char *ptr, unsigned long size)
{ … }

struct ff_regs { … };

static long ff_regexp(const char *line, long len,
		char *buffer, long buffer_size, void *priv)
{ … }

void xdiff_set_find_func(xdemitconf_t *xecfg, const char *value, int cflags)
{ … }

void xdiff_clear_find_func(xdemitconf_t *xecfg)
{ … }

unsigned long xdiff_hash_string(const char *s, size_t len, long flags)
{ … }

int xdiff_compare_lines(const char *l1, long s1,
			const char *l2, long s2, long flags)
{ … }

int parse_conflict_style_name(const char *value)
{ … }

int git_xmerge_style = …;

int git_xmerge_config(const char *var, const char *value,
		      const struct config_context *ctx, void *cb)
{ … }