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
  12 typedef void (*change_fn_t)(struct diff_options *options,
  13                  unsigned old_mode, unsigned new_mode,
  14                  const unsigned char *old_sha1,
  15                  const unsigned char *new_sha1,
  16                  const char *base, const char *path);
  17
  18 typedef void (*add_remove_fn_t)(struct diff_options *options,
  19                     int addremove, unsigned mode,
  20                     const unsigned char *sha1,
  21                     const char *base, const char *path);
  22
  23 struct diff_options {
  24         const char *filter;
  25         const char *orderfile;
  26         const char *pickaxe;
  27         unsigned recursive:1,
  28                  with_raw:1,
  29                  with_stat:1,
  30                  tree_in_recursive:1,
  31                  binary:1,
  32                  full_index:1,
  33                  silent_on_remove:1,
  34                  find_copies_harder:1,
  35                  summary:1,
  36                  color_diff:1;
  37         int context;
  38         int break_opt;
  39         int detect_rename;
  40         int line_termination;
  41         int output_format;
  42         int pickaxe_opts;
  43         int rename_score;
  44         int reverse_diff;
  45         int rename_limit;
  46         int setup;
  47         int abbrev;
  48         const char *stat_sep;
  49
  50         int nr_paths;
  51         const char **paths;
  52         int *pathlens;
  53         change_fn_t change;
  54         add_remove_fn_t add_remove;
  55 };
  56
  57 extern const char mime_boundary_leader[];
  58
  59 extern void diff_tree_setup_paths(const char **paths, struct diff_options *);
  60 extern void diff_tree_release_paths(struct diff_options *);
  61 extern int diff_tree(struct tree_desc *t1, struct tree_desc *t2,
  62                      const char *base, struct diff_options *opt);
  63 extern int diff_tree_sha1(const unsigned char *old, const unsigned char *new,
  64                           const char *base, struct diff_options *opt);
  65
  66 struct combine_diff_path {
  67         struct combine_diff_path *next;
  68         int len;
  69         char *path;
  70         unsigned int mode;
  71         unsigned char sha1[20];
  72         struct combine_diff_parent {
  73                 char status;
  74                 unsigned int mode;
  75                 unsigned char sha1[20];
  76         } parent[FLEX_ARRAY];
  77 };
  78 #define combine_diff_path_size(n, l) \
  79         (sizeof(struct combine_diff_path) + \
  80          sizeof(struct combine_diff_parent) * (n) + (l) + 1)
  81
  82 extern void show_combined_diff(struct combine_diff_path *elem, int num_parent,
  83                               int dense, struct rev_info *);
  84
  85 extern void diff_tree_combined(const unsigned char *sha1, const unsigned char parent[][20], int num_parent, int dense, struct rev_info *rev);
  86
  87 extern void diff_tree_combined_merge(const unsigned char *sha1, int, struct rev_info *);
  88
  89 extern void diff_addremove(struct diff_options *,
  90                            int addremove,
  91                            unsigned mode,
  92                            const unsigned char *sha1,
  93                            const char *base,
  94                            const char *path);
  95
  96 extern void diff_change(struct diff_options *,
  97                         unsigned mode1, unsigned mode2,
  98                         const unsigned char *sha1,
  99                         const unsigned char *sha2,
 100                         const char *base, const char *path);
 101
 102 extern void diff_unmerge(struct diff_options *,
 103                          const char *path);
 104
 105 extern int diff_scoreopt_parse(const char *opt);
 106
 107 #define DIFF_SETUP_REVERSE              1
 108 #define DIFF_SETUP_USE_CACHE            2
 109 #define DIFF_SETUP_USE_SIZE_CACHE       4
 110
 111 extern int git_diff_config(const char *var, const char *value);
 112 extern void diff_setup(struct diff_options *);
 113 extern int diff_opt_parse(struct diff_options *, const char **, int);
 114 extern int diff_setup_done(struct diff_options *);
 115
 116 #define DIFF_DETECT_RENAME      1
 117 #define DIFF_DETECT_COPY        2
 118
 119 #define DIFF_PICKAXE_ALL        1
 120 #define DIFF_PICKAXE_REGEX      2
 121
 122 extern void diffcore_std(struct diff_options *);
 123
 124 extern void diffcore_std_no_resolve(struct diff_options *);
 125
 126 #define COMMON_DIFF_OPTIONS_HELP \
 127 "\ncommon diff options:\n" \
 128 "  -z            output diff-raw with lines terminated with NUL.\n" \
 129 "  -p            output patch format.\n" \
 130 "  -u            synonym for -p.\n" \
 131 "  --patch-with-raw\n" \
 132 "                output both a patch and the diff-raw format.\n" \
 133 "  --stat        show diffstat instead of patch.\n" \
 134 "  --patch-with-stat\n" \
 135 "                output a patch and prepend its diffstat.\n" \
 136 "  --name-only   show only names of changed files.\n" \
 137 "  --name-status show names and status of changed files.\n" \
 138 "  --full-index  show full object name on index lines.\n" \
 139 "  --abbrev=<n>  abbreviate object names in diff-tree header and diff-raw.\n" \
 140 "  -R            swap input file pairs.\n" \
 141 "  -B            detect complete rewrites.\n" \
 142 "  -M            detect renames.\n" \
 143 "  -C            detect copies.\n" \
 144 "  --find-copies-harder\n" \
 145 "                try unchanged files as candidate for copy detection.\n" \
 146 "  -l<n>         limit rename attempts up to <n> paths.\n" \
 147 "  -O<file>      reorder diffs according to the <file>.\n" \
 148 "  -S<string>    find filepair whose only one side contains the string.\n" \
 149 "  --pickaxe-all\n" \
 150 "                show all files diff when -S is used and hit is found.\n"
 151
 152 extern int diff_queue_is_empty(void);
 153
 154 #define DIFF_FORMAT_RAW         1
 155 #define DIFF_FORMAT_PATCH       2
 156 #define DIFF_FORMAT_NO_OUTPUT   3
 157 #define DIFF_FORMAT_NAME        4
 158 #define DIFF_FORMAT_NAME_STATUS 5
 159 #define DIFF_FORMAT_DIFFSTAT    6
 160 #define DIFF_FORMAT_CHECKDIFF   7
 161
 162 extern void diff_flush(struct diff_options*);
 163
 164 /* diff-raw status letters */
 165 #define DIFF_STATUS_ADDED               'A'
 166 #define DIFF_STATUS_COPIED              'C'
 167 #define DIFF_STATUS_DELETED             'D'
 168 #define DIFF_STATUS_MODIFIED            'M'
 169 #define DIFF_STATUS_RENAMED             'R'
 170 #define DIFF_STATUS_TYPE_CHANGED        'T'
 171 #define DIFF_STATUS_UNKNOWN             'X'
 172 #define DIFF_STATUS_UNMERGED            'U'
 173
 174 /* these are not diff-raw status letters proper, but used by
 175  * diffcore-filter insn to specify additional restrictions.
 176  */
 177 #define DIFF_STATUS_FILTER_AON          '*'
 178 #define DIFF_STATUS_FILTER_BROKEN       'B'
 179
 180 extern const char *diff_unique_abbrev(const unsigned char *, int);
 181
 182 extern int run_diff_files(struct rev_info *revs, int silent_on_removed);
 183
 184 extern int run_diff_index(struct rev_info *revs, int cached);
 185
 186 #endif /* DIFF_H */