Blob


1 /*
2 * Copyright (c) 2020 Stefan Sperling <stsp@openbsd.org>
3 *
4 * Permission to use, copy, modify, and distribute this software for any
5 * purpose with or without fee is hereby granted, provided that the above
6 * copyright notice and this permission notice appear in all copies.
7 *
8 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
9 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
10 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
11 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
12 * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
13 * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
14 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
15 */
17 #include "arraylist.h"
18 #include "diff_main.h"
19 #include "diff_output.h"
21 enum got_diff_algorithm {
22 GOT_DIFF_ALGORITHM_MYERS,
23 GOT_DIFF_ALGORITHM_PATIENCE,
24 };
26 enum got_diff_output_format {
27 GOT_DIFF_OUTPUT_UNIDIFF,
28 GOT_DIFF_OUTPUT_EDSCRIPT,
29 };
31 struct got_diffreg_result {
32 struct diff_result *result;
33 char *map1;
34 size_t size1;
35 char *map2;
36 size_t size2;
37 struct diff_data left;
38 struct diff_data right;
39 };
41 #define GOT_DIFF_CONFLICT_MARKER_BEGIN "<<<<<<<"
42 #define GOT_DIFF_CONFLICT_MARKER_ORIG "|||||||"
43 #define GOT_DIFF_CONFLICT_MARKER_SEP "======="
44 #define GOT_DIFF_CONFLICT_MARKER_END ">>>>>>>"
46 const struct got_error *got_diff_get_config(struct diff_config **,
47 enum got_diff_algorithm, diff_atomize_func_t, void *);
48 const struct got_error *got_diff_prepare_file(FILE *, char **, size_t *,
49 struct diff_data *, const struct diff_config *, int, int);
50 const struct got_error *got_diffreg(struct got_diffreg_result **, FILE *,
51 FILE *, enum got_diff_algorithm, int, int);
52 const struct got_error *got_diffreg_output(off_t **, size_t *,
53 struct got_diffreg_result *, int, int, const char *, const char *,
54 enum got_diff_output_format, int, FILE *);
55 const struct got_error *got_diffreg_result_free(struct got_diffreg_result *);
56 const struct got_error *got_diffreg_result_free_left(
57 struct got_diffreg_result *);
58 const struct got_error *got_diffreg_result_free_right(
59 struct got_diffreg_result *);
60 const struct got_error *got_diffreg_close(char *, size_t, char *, size_t);
62 const struct got_error *got_merge_diff3(int *, int, FILE *, FILE *, FILE *,
63 const char *, const char *, const char *, enum got_diff_algorithm);
65 const struct got_error *got_diff_files(struct got_diffreg_result **, FILE *,
66 int, const char *, FILE *, int, const char *, int, int, int, FILE *);