diff.h

   1 /*
   2  * Copyright (C) 2005 Junio C Hamano
   3  */
   4 #ifndef DIFF_H
   5 #define DIFF_H
   6
   7 #include "tree-walk.h"
   8
   9 struct rev_info;
  10 struct diff_options;
  11 struct diff_queue_struct;
  12
  13 typedef 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
  19 typedef 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
  24 typedef 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_NUMSTAT     0x0004
  30 #define DIFF_FORMAT_SUMMARY     0x0008
  31 #define DIFF_FORMAT_PATCH       0x0010
  32 #define DIFF_FORMAT_SHORTSTAT   0x0020
  33
  34 /* These override all above */
  35 #define DIFF_FORMAT_NAME        0x0100
  36 #define DIFF_FORMAT_NAME_STATUS 0x0200
  37 #define DIFF_FORMAT_CHECKDIFF   0x0400
  38
  39 /* Same as output_format = 0 but we know that -s flag was given
  40  * and we should not give default value to output_format.
  41  */
  42 #define DIFF_FORMAT_NO_OUTPUT   0x0800
  43
  44 #define DIFF_FORMAT_CALLBACK    0x1000
  45
  46 #define DIFF_OPT_RECURSIVE           (1 <<  0)
  47 #define DIFF_OPT_TREE_IN_RECURSIVE   (1 <<  1)
  48 #define DIFF_OPT_BINARY              (1 <<  2)
  49 #define DIFF_OPT_TEXT                (1 <<  3)
  50 #define DIFF_OPT_FULL_INDEX          (1 <<  4)
  51 #define DIFF_OPT_SILENT_ON_REMOVE    (1 <<  5)
  52 #define DIFF_OPT_FIND_COPIES_HARDER  (1 <<  6)
  53 #define DIFF_OPT_FOLLOW_RENAMES      (1 <<  7)
  54 #define DIFF_OPT_COLOR_DIFF          (1 <<  8)
  55 #define DIFF_OPT_COLOR_DIFF_WORDS    (1 <<  9)
  56 #define DIFF_OPT_HAS_CHANGES         (1 << 10)
  57 #define DIFF_OPT_QUIET               (1 << 11)
  58 #define DIFF_OPT_NO_INDEX            (1 << 12)
  59 #define DIFF_OPT_ALLOW_EXTERNAL      (1 << 13)
  60 #define DIFF_OPT_EXIT_WITH_STATUS    (1 << 14)
  61 #define DIFF_OPT_REVERSE_DIFF        (1 << 15)
  62 #define DIFF_OPT_TST(opts, flag)    ((opts)->flags & DIFF_OPT_##flag)
  63 #define DIFF_OPT_SET(opts, flag)    ((opts)->flags |= DIFF_OPT_##flag)
  64 #define DIFF_OPT_CLR(opts, flag)    ((opts)->flags &= ~DIFF_OPT_##flag)
  65
  66 struct diff_options {
  67         const char *filter;
  68         const char *orderfile;
  69         const char *pickaxe;
  70         const char *single_follow;
  71         unsigned flags;
  72         int context;
  73         int break_opt;
  74         int detect_rename;
  75         int skip_stat_unmatch;
  76         int line_termination;
  77         int output_format;
  78         int pickaxe_opts;
  79         int rename_score;
  80         int rename_limit;
  81         int setup;
  82         int abbrev;
  83         const char *msg_sep;
  84         const char *stat_sep;
  85         long xdl_opts;
  86
  87         int stat_width;
  88         int stat_name_width;
  89
  90         /* this is set by diffcore for DIFF_FORMAT_PATCH */
  91         int found_changes;
  92
  93         int nr_paths;
  94         const char **paths;
  95         int *pathlens;
  96         change_fn_t change;
  97         add_remove_fn_t add_remove;
  98         diff_format_fn_t format_callback;
  99         void *format_callback_data;
 100 };
 101
 102 enum color_diff {
 103         DIFF_RESET = 0,
 104         DIFF_PLAIN = 1,
 105         DIFF_METAINFO = 2,
 106         DIFF_FRAGINFO = 3,
 107         DIFF_FILE_OLD = 4,
 108         DIFF_FILE_NEW = 5,
 109         DIFF_COMMIT = 6,
 110         DIFF_WHITESPACE = 7,
 111 };
 112 const char *diff_get_color(int diff_use_color, enum color_diff ix);
 113 #define diff_get_color_opt(o, ix) \
 114         diff_get_color(DIFF_OPT_TST((o), COLOR_DIFF), ix)
 115
 116
 117 extern const char mime_boundary_leader[];
 118
 119 extern void diff_tree_setup_paths(const char **paths, struct diff_options *);
 120 extern void diff_tree_release_paths(struct diff_options *);
 121 extern int diff_tree(struct tree_desc *t1, struct tree_desc *t2,
 122                      const char *base, struct diff_options *opt);
 123 extern int diff_tree_sha1(const unsigned char *old, const unsigned char *new,
 124                           const char *base, struct diff_options *opt);
 125 extern int diff_root_tree_sha1(const unsigned char *new, const char *base,
 126                                struct diff_options *opt);
 127
 128 struct combine_diff_path {
 129         struct combine_diff_path *next;
 130         int len;
 131         char *path;
 132         unsigned int mode;
 133         unsigned char sha1[20];
 134         struct combine_diff_parent {
 135                 char status;
 136                 unsigned int mode;
 137                 unsigned char sha1[20];
 138         } parent[FLEX_ARRAY];
 139 };
 140 #define combine_diff_path_size(n, l) \
 141         (sizeof(struct combine_diff_path) + \
 142          sizeof(struct combine_diff_parent) * (n) + (l) + 1)
 143
 144 extern void show_combined_diff(struct combine_diff_path *elem, int num_parent,
 145                               int dense, struct rev_info *);
 146
 147 extern void diff_tree_combined(const unsigned char *sha1, const unsigned char parent[][20], int num_parent, int dense, struct rev_info *rev);
 148
 149 extern void diff_tree_combined_merge(const unsigned char *sha1, int, struct rev_info *);
 150
 151 extern void diff_addremove(struct diff_options *,
 152                            int addremove,
 153                            unsigned mode,
 154                            const unsigned char *sha1,
 155                            const char *base,
 156                            const char *path);
 157
 158 extern void diff_change(struct diff_options *,
 159                         unsigned mode1, unsigned mode2,
 160                         const unsigned char *sha1,
 161                         const unsigned char *sha2,
 162                         const char *base, const char *path);
 163
 164 extern void diff_unmerge(struct diff_options *,
 165                          const char *path,
 166                          unsigned mode,
 167                          const unsigned char *sha1);
 168
 169 #define DIFF_SETUP_REVERSE              1
 170 #define DIFF_SETUP_USE_CACHE            2
 171 #define DIFF_SETUP_USE_SIZE_CACHE       4
 172
 173 extern int git_diff_ui_config(const char *var, const char *value);
 174 extern void diff_setup(struct diff_options *);
 175 extern int diff_opt_parse(struct diff_options *, const char **, int);
 176 extern int diff_setup_done(struct diff_options *);
 177
 178 #define DIFF_DETECT_RENAME      1
 179 #define DIFF_DETECT_COPY        2
 180
 181 #define DIFF_PICKAXE_ALL        1
 182 #define DIFF_PICKAXE_REGEX      2
 183
 184 extern void diffcore_std(struct diff_options *);
 185
 186 #define COMMON_DIFF_OPTIONS_HELP \
 187 "\ncommon diff options:\n" \
 188 "  -z            output diff-raw with lines terminated with NUL.\n" \
 189 "  -p            output patch format.\n" \
 190 "  -u            synonym for -p.\n" \
 191 "  --patch-with-raw\n" \
 192 "                output both a patch and the diff-raw format.\n" \
 193 "  --stat        show diffstat instead of patch.\n" \
 194 "  --numstat     show numeric diffstat instead of patch.\n" \
 195 "  --patch-with-stat\n" \
 196 "                output a patch and prepend its diffstat.\n" \
 197 "  --name-only   show only names of changed files.\n" \
 198 "  --name-status show names and status of changed files.\n" \
 199 "  --full-index  show full object name on index lines.\n" \
 200 "  --abbrev=<n>  abbreviate object names in diff-tree header and diff-raw.\n" \
 201 "  -R            swap input file pairs.\n" \
 202 "  -B            detect complete rewrites.\n" \
 203 "  -M            detect renames.\n" \
 204 "  -C            detect copies.\n" \
 205 "  --find-copies-harder\n" \
 206 "                try unchanged files as candidate for copy detection.\n" \
 207 "  -l<n>         limit rename attempts up to <n> paths.\n" \
 208 "  -O<file>      reorder diffs according to the <file>.\n" \
 209 "  -S<string>    find filepair whose only one side contains the string.\n" \
 210 "  --pickaxe-all\n" \
 211 "                show all files diff when -S is used and hit is found.\n" \
 212 "  -a  --text    treat all files as text.\n"
 213
 214 extern int diff_queue_is_empty(void);
 215 extern void diff_flush(struct diff_options*);
 216
 217 /* diff-raw status letters */
 218 #define DIFF_STATUS_ADDED               'A'
 219 #define DIFF_STATUS_COPIED              'C'
 220 #define DIFF_STATUS_DELETED             'D'
 221 #define DIFF_STATUS_MODIFIED            'M'
 222 #define DIFF_STATUS_RENAMED             'R'
 223 #define DIFF_STATUS_TYPE_CHANGED        'T'
 224 #define DIFF_STATUS_UNKNOWN             'X'
 225 #define DIFF_STATUS_UNMERGED            'U'
 226
 227 /* these are not diff-raw status letters proper, but used by
 228  * diffcore-filter insn to specify additional restrictions.
 229  */
 230 #define DIFF_STATUS_FILTER_AON          '*'
 231 #define DIFF_STATUS_FILTER_BROKEN       'B'
 232
 233 extern const char *diff_unique_abbrev(const unsigned char *, int);
 234
 235 /* do not report anything on removed paths */
 236 #define DIFF_SILENT_ON_REMOVED 01
 237 /* report racily-clean paths as modified */
 238 #define DIFF_RACY_IS_MODIFIED 02
 239 extern int run_diff_files(struct rev_info *revs, unsigned int option);
 240 extern int setup_diff_no_index(struct rev_info *revs,
 241                 int argc, const char ** argv, int nongit, const char *prefix);
 242 extern int run_diff_files_cmd(struct rev_info *revs, int argc, const char **argv);
 243
 244 extern int run_diff_index(struct rev_info *revs, int cached);
 245
 246 extern int do_diff_cache(const unsigned char *, struct diff_options *);
 247 extern int diff_flush_patch_id(struct diff_options *, unsigned char *);
 248
 249 #endif /* DIFF_H */