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