diff-tree -c: show a merge commit a bit more sensibly.
[git.git] / diff.h
blob081234cb97ce1a06c7acda97510dc8440d440a86
1 /*
2 * Copyright (C) 2005 Junio C Hamano
3 */
4 #ifndef DIFF_H
5 #define DIFF_H
7 #define DIFF_FILE_CANON_MODE(mode) \
8 (S_ISREG(mode) ? (S_IFREG | ce_permissions(mode)) : \
9 S_ISLNK(mode) ? S_IFLNK : S_IFDIR)
11 struct tree_desc {
12 void *buf;
13 unsigned long size;
16 struct diff_options;
18 typedef void (*change_fn_t)(struct diff_options *options,
19 unsigned old_mode, unsigned new_mode,
20 const unsigned char *old_sha1,
21 const unsigned char *new_sha1,
22 const char *base, const char *path);
24 typedef void (*add_remove_fn_t)(struct diff_options *options,
25 int addremove, unsigned mode,
26 const unsigned char *sha1,
27 const char *base, const char *path);
29 struct diff_options {
30 const char **paths;
31 const char *filter;
32 const char *orderfile;
33 const char *pickaxe;
34 unsigned recursive:1,
35 tree_in_recursive:1,
36 full_index:1;
37 int break_opt;
38 int detect_rename;
39 int find_copies_harder;
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;
49 change_fn_t change;
50 add_remove_fn_t add_remove;
53 extern void diff_tree_setup_paths(const char **paths);
54 extern int diff_tree(struct tree_desc *t1, struct tree_desc *t2,
55 const char *base, struct diff_options *opt);
56 extern int diff_tree_sha1(const unsigned char *old, const unsigned char *new,
57 const char *base, struct diff_options *opt);
59 extern int diff_tree_combined_merge(const unsigned char *sha1, const char *, int);
61 extern void diff_addremove(struct diff_options *,
62 int addremove,
63 unsigned mode,
64 const unsigned char *sha1,
65 const char *base,
66 const char *path);
68 extern void diff_change(struct diff_options *,
69 unsigned mode1, unsigned mode2,
70 const unsigned char *sha1,
71 const unsigned char *sha2,
72 const char *base, const char *path);
74 extern void diff_unmerge(struct diff_options *,
75 const char *path);
77 extern int diff_scoreopt_parse(const char *opt);
79 #define DIFF_SETUP_REVERSE 1
80 #define DIFF_SETUP_USE_CACHE 2
81 #define DIFF_SETUP_USE_SIZE_CACHE 4
83 extern int git_diff_config(const char *var, const char *value);
84 extern void diff_setup(struct diff_options *);
85 extern int diff_opt_parse(struct diff_options *, const char **, int);
86 extern int diff_setup_done(struct diff_options *);
88 #define DIFF_DETECT_RENAME 1
89 #define DIFF_DETECT_COPY 2
91 #define DIFF_PICKAXE_ALL 1
93 #define DIFF_DEFAULT_INDEX_ABBREV 7 /* hex digits */
94 #define DIFF_DEFAULT_ABBREV 7 /* hex digits */
96 extern void diffcore_std(struct diff_options *);
98 extern void diffcore_std_no_resolve(struct diff_options *);
100 #define COMMON_DIFF_OPTIONS_HELP \
101 "\ncommon diff options:\n" \
102 " -z output diff-raw with lines terminated with NUL.\n" \
103 " -p output patch format.\n" \
104 " -u synonym for -p.\n" \
105 " --name-only show only names of changed files.\n" \
106 " --name-status show names and status of changed files.\n" \
107 " --full-index show full object name on index lines.\n" \
108 " --abbrev=<n> abbreviate object names in diff-tree header and diff-raw.\n" \
109 " -R swap input file pairs.\n" \
110 " -B detect complete rewrites.\n" \
111 " -M detect renames.\n" \
112 " -C detect copies.\n" \
113 " --find-copies-harder\n" \
114 " try unchanged files as candidate for copy detection.\n" \
115 " -l<n> limit rename attempts up to <n> paths.\n" \
116 " -O<file> reorder diffs according to the <file>.\n" \
117 " -S<string> find filepair whose only one side contains the string.\n" \
118 " --pickaxe-all\n" \
119 " show all files diff when -S is used and hit is found.\n"
121 extern int diff_queue_is_empty(void);
123 #define DIFF_FORMAT_RAW 1
124 #define DIFF_FORMAT_PATCH 2
125 #define DIFF_FORMAT_NO_OUTPUT 3
126 #define DIFF_FORMAT_NAME 4
127 #define DIFF_FORMAT_NAME_STATUS 5
129 extern void diff_flush(struct diff_options*);
131 /* diff-raw status letters */
132 #define DIFF_STATUS_ADDED 'A'
133 #define DIFF_STATUS_COPIED 'C'
134 #define DIFF_STATUS_DELETED 'D'
135 #define DIFF_STATUS_MODIFIED 'M'
136 #define DIFF_STATUS_RENAMED 'R'
137 #define DIFF_STATUS_TYPE_CHANGED 'T'
138 #define DIFF_STATUS_UNKNOWN 'X'
139 #define DIFF_STATUS_UNMERGED 'U'
141 /* these are not diff-raw status letters proper, but used by
142 * diffcore-filter insn to specify additional restrictions.
144 #define DIFF_STATUS_FILTER_AON '*'
145 #define DIFF_STATUS_FILTER_BROKEN 'B'
147 extern const char *diff_unique_abbrev(const unsigned char *, int);
149 #endif /* DIFF_H */