diff.hon commit git-format-patch: fix bug using -o in subdirectories (77e565d)
   1/*
   2 * Copyright (C) 2005 Junio C Hamano
   3 */
   4#ifndef DIFF_H
   5#define DIFF_H
   6
   7#include "tree-walk.h"
   8
   9struct rev_info;
  10struct diff_options;
  11struct diff_queue_struct;
  12
  13typedef void (*change_fn_t)(struct diff_options *options,
  14                 unsigned old_mode, unsigned new_mode,
  15                 const unsigned char *old_sha1,
  16                 const unsigned char *new_sha1,
  17                 const char *base, const char *path);
  18
  19typedef void (*add_remove_fn_t)(struct diff_options *options,
  20                    int addremove, unsigned mode,
  21                    const unsigned char *sha1,
  22                    const char *base, const char *path);
  23
  24typedef void (*diff_format_fn_t)(struct diff_queue_struct *q,
  25                struct diff_options *options, void *data);
  26
  27#define DIFF_FORMAT_RAW         0x0001
  28#define DIFF_FORMAT_DIFFSTAT    0x0002
  29#define DIFF_FORMAT_SUMMARY     0x0004
  30#define DIFF_FORMAT_PATCH       0x0008
  31
  32/* These override all above */
  33#define DIFF_FORMAT_NAME        0x0010
  34#define DIFF_FORMAT_NAME_STATUS 0x0020
  35#define DIFF_FORMAT_CHECKDIFF   0x0040
  36
  37/* Same as output_format = 0 but we know that -s flag was given
  38 * and we should not give default value to output_format.
  39 */
  40#define DIFF_FORMAT_NO_OUTPUT   0x0080
  41
  42#define DIFF_FORMAT_CALLBACK    0x0100
  43
  44struct diff_options {
  45        const char *filter;
  46        const char *orderfile;
  47        const char *pickaxe;
  48        unsigned recursive:1,
  49                 tree_in_recursive:1,
  50                 binary:1,
  51                 text:1,
  52                 full_index:1,
  53                 silent_on_remove:1,
  54                 find_copies_harder:1,
  55                 color_diff:1,
  56                 color_diff_words:1;
  57        int context;
  58        int break_opt;
  59        int detect_rename;
  60        int line_termination;
  61        int output_format;
  62        int pickaxe_opts;
  63        int rename_score;
  64        int reverse_diff;
  65        int rename_limit;
  66        int setup;
  67        int abbrev;
  68        const char *msg_sep;
  69        const char *stat_sep;
  70        long xdl_opts;
  71
  72        int nr_paths;
  73        const char **paths;
  74        int *pathlens;
  75        change_fn_t change;
  76        add_remove_fn_t add_remove;
  77        diff_format_fn_t format_callback;
  78        void *format_callback_data;
  79};
  80
  81enum color_diff {
  82        DIFF_RESET = 0,
  83        DIFF_PLAIN = 1,
  84        DIFF_METAINFO = 2,
  85        DIFF_FRAGINFO = 3,
  86        DIFF_FILE_OLD = 4,
  87        DIFF_FILE_NEW = 5,
  88        DIFF_COMMIT = 6,
  89        DIFF_WHITESPACE = 7,
  90};
  91const char *diff_get_color(int diff_use_color, enum color_diff ix);
  92
  93extern const char mime_boundary_leader[];
  94
  95extern void diff_tree_setup_paths(const char **paths, struct diff_options *);
  96extern void diff_tree_release_paths(struct diff_options *);
  97extern int diff_tree(struct tree_desc *t1, struct tree_desc *t2,
  98                     const char *base, struct diff_options *opt);
  99extern int diff_tree_sha1(const unsigned char *old, const unsigned char *new,
 100                          const char *base, struct diff_options *opt);
 101
 102struct combine_diff_path {
 103        struct combine_diff_path *next;
 104        int len;
 105        char *path;
 106        unsigned int mode;
 107        unsigned char sha1[20];
 108        struct combine_diff_parent {
 109                char status;
 110                unsigned int mode;
 111                unsigned char sha1[20];
 112        } parent[FLEX_ARRAY];
 113};
 114#define combine_diff_path_size(n, l) \
 115        (sizeof(struct combine_diff_path) + \
 116         sizeof(struct combine_diff_parent) * (n) + (l) + 1)
 117
 118extern void show_combined_diff(struct combine_diff_path *elem, int num_parent,
 119                              int dense, struct rev_info *);
 120
 121extern void diff_tree_combined(const unsigned char *sha1, const unsigned char parent[][20], int num_parent, int dense, struct rev_info *rev);
 122
 123extern void diff_tree_combined_merge(const unsigned char *sha1, int, struct rev_info *);
 124
 125extern void diff_addremove(struct diff_options *,
 126                           int addremove,
 127                           unsigned mode,
 128                           const unsigned char *sha1,
 129                           const char *base,
 130                           const char *path);
 131
 132extern void diff_change(struct diff_options *,
 133                        unsigned mode1, unsigned mode2,
 134                        const unsigned char *sha1,
 135                        const unsigned char *sha2,
 136                        const char *base, const char *path);
 137
 138extern void diff_unmerge(struct diff_options *,
 139                         const char *path);
 140
 141extern int diff_scoreopt_parse(const char *opt);
 142
 143#define DIFF_SETUP_REVERSE              1
 144#define DIFF_SETUP_USE_CACHE            2
 145#define DIFF_SETUP_USE_SIZE_CACHE       4
 146
 147extern int git_diff_ui_config(const char *var, const char *value);
 148extern void diff_setup(struct diff_options *);
 149extern int diff_opt_parse(struct diff_options *, const char **, int);
 150extern int diff_setup_done(struct diff_options *);
 151
 152#define DIFF_DETECT_RENAME      1
 153#define DIFF_DETECT_COPY        2
 154
 155#define DIFF_PICKAXE_ALL        1
 156#define DIFF_PICKAXE_REGEX      2
 157
 158extern void diffcore_std(struct diff_options *);
 159
 160extern void diffcore_std_no_resolve(struct diff_options *);
 161
 162#define COMMON_DIFF_OPTIONS_HELP \
 163"\ncommon diff options:\n" \
 164"  -z            output diff-raw with lines terminated with NUL.\n" \
 165"  -p            output patch format.\n" \
 166"  -u            synonym for -p.\n" \
 167"  --patch-with-raw\n" \
 168"                output both a patch and the diff-raw format.\n" \
 169"  --stat        show diffstat instead of patch.\n" \
 170"  --patch-with-stat\n" \
 171"                output a patch and prepend its diffstat.\n" \
 172"  --name-only   show only names of changed files.\n" \
 173"  --name-status show names and status of changed files.\n" \
 174"  --full-index  show full object name on index lines.\n" \
 175"  --abbrev=<n>  abbreviate object names in diff-tree header and diff-raw.\n" \
 176"  -R            swap input file pairs.\n" \
 177"  -B            detect complete rewrites.\n" \
 178"  -M            detect renames.\n" \
 179"  -C            detect copies.\n" \
 180"  --find-copies-harder\n" \
 181"                try unchanged files as candidate for copy detection.\n" \
 182"  -l<n>         limit rename attempts up to <n> paths.\n" \
 183"  -O<file>      reorder diffs according to the <file>.\n" \
 184"  -S<string>    find filepair whose only one side contains the string.\n" \
 185"  --pickaxe-all\n" \
 186"                show all files diff when -S is used and hit is found.\n" \
 187"  -a  --text    treat all files as text.\n"
 188
 189extern int diff_queue_is_empty(void);
 190extern void diff_flush(struct diff_options*);
 191
 192/* diff-raw status letters */
 193#define DIFF_STATUS_ADDED               'A'
 194#define DIFF_STATUS_COPIED              'C'
 195#define DIFF_STATUS_DELETED             'D'
 196#define DIFF_STATUS_MODIFIED            'M'
 197#define DIFF_STATUS_RENAMED             'R'
 198#define DIFF_STATUS_TYPE_CHANGED        'T'
 199#define DIFF_STATUS_UNKNOWN             'X'
 200#define DIFF_STATUS_UNMERGED            'U'
 201
 202/* these are not diff-raw status letters proper, but used by
 203 * diffcore-filter insn to specify additional restrictions.
 204 */
 205#define DIFF_STATUS_FILTER_AON          '*'
 206#define DIFF_STATUS_FILTER_BROKEN       'B'
 207
 208extern const char *diff_unique_abbrev(const unsigned char *, int);
 209
 210extern int run_diff_files(struct rev_info *revs, int silent_on_removed);
 211
 212extern int run_diff_index(struct rev_info *revs, int cached);
 213
 214extern int diff_flush_patch_id(struct diff_options *, unsigned char *);
 215
 216#endif /* DIFF_H */