Merge branch 'svnup' of http://netz.smurf.noris.de/git/git
[git.git] / diff.h
1 /*
2  * Copyright (C) 2005 Junio C Hamano
3  */
4 #ifndef DIFF_H
5 #define DIFF_H
6
7 #define DIFF_FILE_CANON_MODE(mode) \
8         (S_ISREG(mode) ? (S_IFREG | ce_permissions(mode)) : \
9         S_ISLNK(mode) ? S_IFLNK : S_IFDIR)
10
11 struct tree_desc {
12         void *buf;
13         unsigned long size;
14 };
15
16 struct diff_options;
17
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);
23
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);
28
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         int break_opt;
37         int detect_rename;
38         int find_copies_harder;
39         int line_termination;
40         int output_format;
41         int pickaxe_opts;
42         int rename_score;
43         int reverse_diff;
44         int rename_limit;
45         int setup;
46
47         change_fn_t change;
48         add_remove_fn_t add_remove;
49 };
50
51 extern void diff_tree_setup_paths(const char **paths);
52 extern int diff_tree(struct tree_desc *t1, struct tree_desc *t2,
53                      const char *base, struct diff_options *opt);
54 extern int diff_tree_sha1(const unsigned char *old, const unsigned char *new,
55                           const char *base, struct diff_options *opt);
56
57 extern void diff_addremove(struct diff_options *,
58                            int addremove,
59                            unsigned mode,
60                            const unsigned char *sha1,
61                            const char *base,
62                            const char *path);
63
64 extern void diff_change(struct diff_options *,
65                         unsigned mode1, unsigned mode2,
66                         const unsigned char *sha1,
67                         const unsigned char *sha2,
68                         const char *base, const char *path);
69
70 extern void diff_unmerge(struct diff_options *,
71                          const char *path);
72
73 extern int diff_scoreopt_parse(const char *opt);
74
75 #define DIFF_SETUP_REVERSE              1
76 #define DIFF_SETUP_USE_CACHE            2
77 #define DIFF_SETUP_USE_SIZE_CACHE       4
78
79 extern void diff_setup(struct diff_options *);
80 extern int diff_opt_parse(struct diff_options *, const char **, int);
81 extern int diff_setup_done(struct diff_options *);
82
83 #define DIFF_DETECT_RENAME      1
84 #define DIFF_DETECT_COPY        2
85
86 #define DIFF_PICKAXE_ALL        1
87
88 extern void diffcore_std(struct diff_options *);
89
90 extern void diffcore_std_no_resolve(struct diff_options *);
91
92 #define COMMON_DIFF_OPTIONS_HELP \
93 "\ncommon diff options:\n" \
94 "  -z            output diff-raw with lines terminated with NUL.\n" \
95 "  -p            output patch format.\n" \
96 "  -u            synonym for -p.\n" \
97 "  --name-only   show only names of changed files.\n" \
98 "  --name-status show names and status of changed files.\n" \
99 "  -R            swap input file pairs.\n" \
100 "  -B            detect complete rewrites.\n" \
101 "  -M            detect renames.\n" \
102 "  -C            detect copies.\n" \
103 "  --find-copies-harder\n" \
104 "                try unchanged files as candidate for copy detection.\n" \
105 "  -l<n>         limit rename attempts up to <n> paths.\n" \
106 "  -O<file>      reorder diffs according to the <file>.\n" \
107 "  -S<string>    find filepair whose only one side contains the string.\n" \
108 "  --pickaxe-all\n" \
109 "                show all files diff when -S is used and hit is found.\n"
110
111 extern int diff_queue_is_empty(void);
112
113 #define DIFF_FORMAT_RAW         1
114 #define DIFF_FORMAT_PATCH       2
115 #define DIFF_FORMAT_NO_OUTPUT   3
116 #define DIFF_FORMAT_NAME        4
117 #define DIFF_FORMAT_NAME_STATUS 5
118
119 extern void diff_flush(struct diff_options*);
120
121 /* diff-raw status letters */
122 #define DIFF_STATUS_ADDED               'A'
123 #define DIFF_STATUS_COPIED              'C'
124 #define DIFF_STATUS_DELETED             'D'
125 #define DIFF_STATUS_MODIFIED            'M'
126 #define DIFF_STATUS_RENAMED             'R'
127 #define DIFF_STATUS_TYPE_CHANGED        'T'
128 #define DIFF_STATUS_UNKNOWN             'X'
129 #define DIFF_STATUS_UNMERGED            'U'
130
131 /* these are not diff-raw status letters proper, but used by
132  * diffcore-filter insn to specify additional restrictions.
133  */
134 #define DIFF_STATUS_FILTER_AON          '*'
135 #define DIFF_STATUS_FILTER_BROKEN       'B'
136
137 #endif /* DIFF_H */