Andrew's git - gitweb.git/blob

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