| /* |
| * Copyright (C) 2005 Junio C Hamano |
| */ |
| #ifndef DIFF_H |
| #define DIFF_H |
| |
| #include "tree-walk.h" |
| #include "pathspec.h" |
| #include "object.h" |
| |
| struct rev_info; |
| struct diff_options; |
| struct diff_queue_struct; |
| struct strbuf; |
| struct diff_filespec; |
| struct userdiff_driver; |
| struct sha1_array; |
| struct commit; |
| struct combine_diff_path; |
| |
| typedef int (*pathchange_fn_t)(struct diff_options *options, |
| struct combine_diff_path *path); |
| |
| typedef void (*change_fn_t)(struct diff_options *options, |
| unsigned old_mode, unsigned new_mode, |
| const unsigned char *old_sha1, |
| const unsigned char *new_sha1, |
| int old_sha1_valid, int new_sha1_valid, |
| const char *fullpath, |
| unsigned old_dirty_submodule, unsigned new_dirty_submodule); |
| |
| typedef void (*add_remove_fn_t)(struct diff_options *options, |
| int addremove, unsigned mode, |
| const unsigned char *sha1, |
| int sha1_valid, |
| const char *fullpath, unsigned dirty_submodule); |
| |
| typedef void (*diff_format_fn_t)(struct diff_queue_struct *q, |
| struct diff_options *options, void *data); |
| |
| typedef struct strbuf *(*diff_prefix_fn_t)(struct diff_options *opt, void *data); |
| |
| #define DIFF_FORMAT_RAW 0x0001 |
| #define DIFF_FORMAT_DIFFSTAT 0x0002 |
| #define DIFF_FORMAT_NUMSTAT 0x0004 |
| #define DIFF_FORMAT_SUMMARY 0x0008 |
| #define DIFF_FORMAT_PATCH 0x0010 |
| #define DIFF_FORMAT_SHORTSTAT 0x0020 |
| #define DIFF_FORMAT_DIRSTAT 0x0040 |
| |
| /* These override all above */ |
| #define DIFF_FORMAT_NAME 0x0100 |
| #define DIFF_FORMAT_NAME_STATUS 0x0200 |
| #define DIFF_FORMAT_CHECKDIFF 0x0400 |
| |
| /* Same as output_format = 0 but we know that -s flag was given |
| * and we should not give default value to output_format. |
| */ |
| #define DIFF_FORMAT_NO_OUTPUT 0x0800 |
| |
| #define DIFF_FORMAT_CALLBACK 0x1000 |
| |
| #define DIFF_OPT_RECURSIVE (1 << 0) |
| #define DIFF_OPT_TREE_IN_RECURSIVE (1 << 1) |
| #define DIFF_OPT_BINARY (1 << 2) |
| #define DIFF_OPT_TEXT (1 << 3) |
| #define DIFF_OPT_FULL_INDEX (1 << 4) |
| #define DIFF_OPT_SILENT_ON_REMOVE (1 << 5) |
| #define DIFF_OPT_FIND_COPIES_HARDER (1 << 6) |
| #define DIFF_OPT_FOLLOW_RENAMES (1 << 7) |
| #define DIFF_OPT_RENAME_EMPTY (1 << 8) |
| /* (1 << 9) unused */ |
| #define DIFF_OPT_HAS_CHANGES (1 << 10) |
| #define DIFF_OPT_QUICK (1 << 11) |
| #define DIFF_OPT_NO_INDEX (1 << 12) |
| #define DIFF_OPT_ALLOW_EXTERNAL (1 << 13) |
| #define DIFF_OPT_EXIT_WITH_STATUS (1 << 14) |
| #define DIFF_OPT_REVERSE_DIFF (1 << 15) |
| #define DIFF_OPT_CHECK_FAILED (1 << 16) |
| #define DIFF_OPT_RELATIVE_NAME (1 << 17) |
| #define DIFF_OPT_IGNORE_SUBMODULES (1 << 18) |
| #define DIFF_OPT_DIRSTAT_CUMULATIVE (1 << 19) |
| #define DIFF_OPT_DIRSTAT_BY_FILE (1 << 20) |
| #define DIFF_OPT_ALLOW_TEXTCONV (1 << 21) |
| #define DIFF_OPT_DIFF_FROM_CONTENTS (1 << 22) |
| #define DIFF_OPT_SUBMODULE_LOG (1 << 23) |
| #define DIFF_OPT_DIRTY_SUBMODULES (1 << 24) |
| #define DIFF_OPT_IGNORE_UNTRACKED_IN_SUBMODULES (1 << 25) |
| #define DIFF_OPT_IGNORE_DIRTY_SUBMODULES (1 << 26) |
| #define DIFF_OPT_OVERRIDE_SUBMODULE_CONFIG (1 << 27) |
| #define DIFF_OPT_DIRSTAT_BY_LINE (1 << 28) |
| #define DIFF_OPT_FUNCCONTEXT (1 << 29) |
| #define DIFF_OPT_PICKAXE_IGNORE_CASE (1 << 30) |
| #define DIFF_OPT_DEFAULT_FOLLOW_RENAMES (1U << 31) |
| |
| #define DIFF_OPT_TST(opts, flag) ((opts)->flags & DIFF_OPT_##flag) |
| #define DIFF_OPT_TOUCHED(opts, flag) ((opts)->touched_flags & DIFF_OPT_##flag) |
| #define DIFF_OPT_SET(opts, flag) (((opts)->flags |= DIFF_OPT_##flag),((opts)->touched_flags |= DIFF_OPT_##flag)) |
| #define DIFF_OPT_CLR(opts, flag) (((opts)->flags &= ~DIFF_OPT_##flag),((opts)->touched_flags |= DIFF_OPT_##flag)) |
| #define DIFF_XDL_TST(opts, flag) ((opts)->xdl_opts & XDF_##flag) |
| #define DIFF_XDL_SET(opts, flag) ((opts)->xdl_opts |= XDF_##flag) |
| #define DIFF_XDL_CLR(opts, flag) ((opts)->xdl_opts &= ~XDF_##flag) |
| |
| #define DIFF_WITH_ALG(opts, flag) (((opts)->xdl_opts & ~XDF_DIFF_ALGORITHM_MASK) | XDF_##flag) |
| |
| enum diff_words_type { |
| DIFF_WORDS_NONE = 0, |
| DIFF_WORDS_PORCELAIN, |
| DIFF_WORDS_PLAIN, |
| DIFF_WORDS_COLOR |
| }; |
| |
| struct diff_options { |
| const char *orderfile; |
| const char *pickaxe; |
| const char *single_follow; |
| const char *a_prefix, *b_prefix; |
| unsigned flags; |
| unsigned touched_flags; |
| |
| /* diff-filter bits */ |
| unsigned int filter; |
| |
| int use_color; |
| int context; |
| int interhunkcontext; |
| int break_opt; |
| int detect_rename; |
| int irreversible_delete; |
| int skip_stat_unmatch; |
| int line_termination; |
| int output_format; |
| int pickaxe_opts; |
| int rename_score; |
| int rename_limit; |
| int needed_rename_limit; |
| int degraded_cc_to_c; |
| int show_rename_progress; |
| int dirstat_permille; |
| int setup; |
| int abbrev; |
| /* white-space error highlighting */ |
| #define WSEH_NEW 1 |
| #define WSEH_CONTEXT 2 |
| #define WSEH_OLD 4 |
| unsigned ws_error_highlight; |
| const char *prefix; |
| int prefix_length; |
| const char *stat_sep; |
| long xdl_opts; |
| |
| int stat_width; |
| int stat_name_width; |
| int stat_graph_width; |
| int stat_count; |
| const char *word_regex; |
| enum diff_words_type word_diff; |
| |
| /* this is set by diffcore for DIFF_FORMAT_PATCH */ |
| int found_changes; |
| |
| /* to support internal diff recursion by --follow hack*/ |
| int found_follow; |
| |
| void (*set_default)(struct diff_options *); |
| |
| FILE *file; |
| int close_file; |
| |
| struct pathspec pathspec; |
| pathchange_fn_t pathchange; |
| change_fn_t change; |
| add_remove_fn_t add_remove; |
| diff_format_fn_t format_callback; |
| void *format_callback_data; |
| diff_prefix_fn_t output_prefix; |
| int output_prefix_length; |
| void *output_prefix_data; |
| |
| int diff_path_counter; |
| }; |
| |
| enum color_diff { |
| DIFF_RESET = 0, |
| DIFF_CONTEXT = 1, |
| DIFF_METAINFO = 2, |
| DIFF_FRAGINFO = 3, |
| DIFF_FILE_OLD = 4, |
| DIFF_FILE_NEW = 5, |
| DIFF_COMMIT = 6, |
| DIFF_WHITESPACE = 7, |
| DIFF_FUNCINFO = 8 |
| }; |
| const char *diff_get_color(int diff_use_color, enum color_diff ix); |
| #define diff_get_color_opt(o, ix) \ |
| diff_get_color((o)->use_color, ix) |
| |
| |
| const char *diff_line_prefix(struct diff_options *); |
| |
| |
| extern const char mime_boundary_leader[]; |
| |
| extern struct combine_diff_path *diff_tree_paths( |
| struct combine_diff_path *p, const unsigned char *sha1, |
| const unsigned char **parent_sha1, int nparent, |
| struct strbuf *base, struct diff_options *opt); |
| extern int diff_tree_sha1(const unsigned char *old, const unsigned char *new, |
| const char *base, struct diff_options *opt); |
| extern int diff_root_tree_sha1(const unsigned char *new, const char *base, |
| struct diff_options *opt); |
| |
| struct combine_diff_path { |
| struct combine_diff_path *next; |
| char *path; |
| unsigned int mode; |
| struct object_id oid; |
| struct combine_diff_parent { |
| char status; |
| unsigned int mode; |
| struct object_id oid; |
| } parent[FLEX_ARRAY]; |
| }; |
| #define combine_diff_path_size(n, l) \ |
| st_add4(sizeof(struct combine_diff_path), (l), 1, \ |
| st_mult(sizeof(struct combine_diff_parent), (n))) |
| |
| extern void show_combined_diff(struct combine_diff_path *elem, int num_parent, |
| int dense, struct rev_info *); |
| |
| extern void diff_tree_combined(const unsigned char *sha1, const struct sha1_array *parents, int dense, struct rev_info *rev); |
| |
| extern void diff_tree_combined_merge(const struct commit *commit, int dense, struct rev_info *rev); |
| |
| void diff_set_mnemonic_prefix(struct diff_options *options, const char *a, const char *b); |
| |
| extern int diff_can_quit_early(struct diff_options *); |
| |
| extern void diff_addremove(struct diff_options *, |
| int addremove, |
| unsigned mode, |
| const unsigned char *sha1, |
| int sha1_valid, |
| const char *fullpath, unsigned dirty_submodule); |
| |
| extern void diff_change(struct diff_options *, |
| unsigned mode1, unsigned mode2, |
| const unsigned char *sha1, |
| const unsigned char *sha2, |
| int sha1_valid, |
| int sha2_valid, |
| const char *fullpath, |
| unsigned dirty_submodule1, unsigned dirty_submodule2); |
| |
| extern struct diff_filepair *diff_unmerge(struct diff_options *, const char *path); |
| |
| #define DIFF_SETUP_REVERSE 1 |
| #define DIFF_SETUP_USE_CACHE 2 |
| #define DIFF_SETUP_USE_SIZE_CACHE 4 |
| |
| /* |
| * Poor man's alternative to parse-option, to allow both stuck form |
| * (--option=value) and separate form (--option value). |
| */ |
| extern int parse_long_opt(const char *opt, const char **argv, |
| const char **optarg); |
| |
| extern int git_diff_basic_config(const char *var, const char *value, void *cb); |
| extern void init_diff_ui_defaults(void); |
| extern int git_diff_ui_config(const char *var, const char *value, void *cb); |
| extern void diff_setup(struct diff_options *); |
| extern int diff_opt_parse(struct diff_options *, const char **, int, const char *); |
| extern void diff_setup_done(struct diff_options *); |
| |
| #define DIFF_DETECT_RENAME 1 |
| #define DIFF_DETECT_COPY 2 |
| |
| #define DIFF_PICKAXE_ALL 1 |
| #define DIFF_PICKAXE_REGEX 2 |
| |
| #define DIFF_PICKAXE_KIND_S 4 /* traditional plumbing counter */ |
| #define DIFF_PICKAXE_KIND_G 8 /* grep in the patch */ |
| |
| extern void diffcore_std(struct diff_options *); |
| extern void diffcore_fix_diff_index(struct diff_options *); |
| |
| #define COMMON_DIFF_OPTIONS_HELP \ |
| "\ncommon diff options:\n" \ |
| " -z output diff-raw with lines terminated with NUL.\n" \ |
| " -p output patch format.\n" \ |
| " -u synonym for -p.\n" \ |
| " --patch-with-raw\n" \ |
| " output both a patch and the diff-raw format.\n" \ |
| " --stat show diffstat instead of patch.\n" \ |
| " --numstat show numeric diffstat instead of patch.\n" \ |
| " --patch-with-stat\n" \ |
| " output a patch and prepend its diffstat.\n" \ |
| " --name-only show only names of changed files.\n" \ |
| " --name-status show names and status of changed files.\n" \ |
| " --full-index show full object name on index lines.\n" \ |
| " --abbrev=<n> abbreviate object names in diff-tree header and diff-raw.\n" \ |
| " -R swap input file pairs.\n" \ |
| " -B detect complete rewrites.\n" \ |
| " -M detect renames.\n" \ |
| " -C detect copies.\n" \ |
| " --find-copies-harder\n" \ |
| " try unchanged files as candidate for copy detection.\n" \ |
| " -l<n> limit rename attempts up to <n> paths.\n" \ |
| " -O<file> reorder diffs according to the <file>.\n" \ |
| " -S<string> find filepair whose only one side contains the string.\n" \ |
| " --pickaxe-all\n" \ |
| " show all files diff when -S is used and hit is found.\n" \ |
| " -a --text treat all files as text.\n" |
| |
| extern int diff_queue_is_empty(void); |
| extern void diff_flush(struct diff_options*); |
| extern void diff_warn_rename_limit(const char *varname, int needed, int degraded_cc); |
| |
| /* diff-raw status letters */ |
| #define DIFF_STATUS_ADDED 'A' |
| #define DIFF_STATUS_COPIED 'C' |
| #define DIFF_STATUS_DELETED 'D' |
| #define DIFF_STATUS_MODIFIED 'M' |
| #define DIFF_STATUS_RENAMED 'R' |
| #define DIFF_STATUS_TYPE_CHANGED 'T' |
| #define DIFF_STATUS_UNKNOWN 'X' |
| #define DIFF_STATUS_UNMERGED 'U' |
| |
| /* these are not diff-raw status letters proper, but used by |
| * diffcore-filter insn to specify additional restrictions. |
| */ |
| #define DIFF_STATUS_FILTER_AON '*' |
| #define DIFF_STATUS_FILTER_BROKEN 'B' |
| |
| extern const char *diff_unique_abbrev(const unsigned char *, int); |
| |
| /* do not report anything on removed paths */ |
| #define DIFF_SILENT_ON_REMOVED 01 |
| /* report racily-clean paths as modified */ |
| #define DIFF_RACY_IS_MODIFIED 02 |
| extern int run_diff_files(struct rev_info *revs, unsigned int option); |
| extern int run_diff_index(struct rev_info *revs, int cached); |
| |
| extern int do_diff_cache(const unsigned char *, struct diff_options *); |
| extern int diff_flush_patch_id(struct diff_options *, unsigned char *, int); |
| |
| extern int diff_result_code(struct diff_options *, int); |
| |
| extern void diff_no_index(struct rev_info *, int, const char **); |
| |
| extern int index_differs_from(const char *def, int diff_flags); |
| |
| /* |
| * Fill the contents of the filespec "df", respecting any textconv defined by |
| * its userdiff driver. The "driver" parameter must come from a |
| * previous call to get_textconv(), and therefore should either be NULL or have |
| * textconv enabled. |
| * |
| * Note that the memory ownership of the resulting buffer depends on whether |
| * the driver field is NULL. If it is, then the memory belongs to the filespec |
| * struct. If it is non-NULL, then "outbuf" points to a newly allocated buffer |
| * that should be freed by the caller. |
| */ |
| extern size_t fill_textconv(struct userdiff_driver *driver, |
| struct diff_filespec *df, |
| char **outbuf); |
| |
| /* |
| * Look up the userdiff driver for the given filespec, and return it if |
| * and only if it has textconv enabled (otherwise return NULL). The result |
| * can be passed to fill_textconv(). |
| */ |
| extern struct userdiff_driver *get_textconv(struct diff_filespec *one); |
| |
| extern int parse_rename_score(const char **cp_p); |
| |
| extern long parse_algorithm_value(const char *value); |
| |
| extern int print_stat_summary(FILE *fp, int files, |
| int insertions, int deletions); |
| extern void setup_diff_pager(struct diff_options *); |
| |
| #endif /* DIFF_H */ |