mirror of
https://github.com/git-for-windows/git.git
synced 2026-06-27 11:47:49 -05:00
faff5b2eb1
The source files for libgit.a have been moved into a new "lib/" directory to clean up the top-level directory and clearly separate library code. * ps/libgit-in-subdir: Move libgit.a sources into separate "lib/" directory t/helper: prepare "test-example-tap.c" for introduction of "lib/"
40 lines
1.3 KiB
C
40 lines
1.3 KiB
C
#ifndef DIFF_PROCESS_H
|
|
#define DIFF_PROCESS_H
|
|
|
|
#include "xdiff/xdiff.h"
|
|
|
|
struct diff_options;
|
|
|
|
enum diff_process_result {
|
|
DIFF_PROCESS_ERROR = -1, /* tool failure: warned, fell back */
|
|
DIFF_PROCESS_OK = 0, /* hunks populated in xpp */
|
|
DIFF_PROCESS_SKIP, /* no process configured: use builtin */
|
|
DIFF_PROCESS_EQUIVALENT, /* tool says files are equivalent */
|
|
};
|
|
|
|
/*
|
|
* Consult the diff process configured for 'path' and populate
|
|
* xpp->external_hunks with the returned hunks.
|
|
*
|
|
* Handles driver lookup, flag checks (--no-ext-diff,
|
|
* --diff-algorithm), subprocess management, and error reporting.
|
|
*
|
|
* Returns DIFF_PROCESS_OK when hunks are populated in xpp.
|
|
* The caller owns xpp->external_hunks and must free() it.
|
|
*
|
|
* Returns DIFF_PROCESS_EQUIVALENT when the tool returns no hunks
|
|
* (files are considered identical); caller should skip diff/blame.
|
|
* Returns DIFF_PROCESS_SKIP when no process applies; caller
|
|
* should use the builtin diff algorithm.
|
|
* Returns DIFF_PROCESS_ERROR on tool failure (already warned);
|
|
* caller should fall back to the builtin diff algorithm.
|
|
*/
|
|
enum diff_process_result diff_process_fill_hunks(
|
|
struct diff_options *diffopt,
|
|
const char *path,
|
|
const mmfile_t *file_a,
|
|
const mmfile_t *file_b,
|
|
xpparam_t *xpp);
|
|
|
|
#endif /* DIFF_PROCESS_H */
|