2 * Copyright (C) 2005 Junio C Hamano
7 #define DIFF_FILE_CANON_MODE(mode) \
8 (S_ISREG(mode) ? (S_IFREG | ce_permissions(mode)) : \
9 S_ISLNK(mode) ? S_IFLNK : S_IFDIR)
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);
32 const char *orderfile;
38 int find_copies_harder;
48 add_remove_fn_t add_remove;
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);
57 extern void diff_addremove(struct diff_options *,
60 const unsigned char *sha1,
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);
70 extern void diff_unmerge(struct diff_options *,
73 extern int diff_scoreopt_parse(const char *opt);
75 #define DIFF_SETUP_REVERSE 1
76 #define DIFF_SETUP_USE_CACHE 2
77 #define DIFF_SETUP_USE_SIZE_CACHE 4
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 *);
83 #define DIFF_DETECT_RENAME 1
84 #define DIFF_DETECT_COPY 2
86 #define DIFF_PICKAXE_ALL 1
88 extern void diffcore_std(struct diff_options *);
90 extern void diffcore_std_no_resolve(struct diff_options *);
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" \
109 " show all files diff when -S is used and hit is found.\n"
111 extern int diff_queue_is_empty(void);
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
119 extern void diff_flush(struct diff_options*);
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'
131 /* these are not diff-raw status letters proper, but used by
132 * diffcore-filter insn to specify additional restrictions.
134 #define DIFF_STATUS_FILTER_AON '*'
135 #define DIFF_STATUS_FILTER_BROKEN 'B'