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 " -r diff recursively (only meaningful in diff-tree)\n" \
95 " -z output diff-raw with lines terminated with NUL.\n" \
96 " -p output patch format.\n" \
97 " -u synonym for -p.\n" \
98 " --name-only show only names of changed files.\n" \
99 " --name-status show names and status of changed files.\n" \
100 " -R swap input file pairs.\n" \
101 " -B detect complete rewrites.\n" \
102 " -M detect renames.\n" \
103 " -C detect copies.\n" \
104 " --find-copies-harder\n" \
105 " try unchanged files as candidate for copy detection.\n" \
106 " -l<n> limit rename attempts up to <n> paths.\n" \
107 " -O<file> reorder diffs according to the <file>.\n" \
108 " -S<string> find filepair whose only one side contains the string.\n" \
110 " show all files diff when -S is used and hit is found.\n"
112 extern int diff_queue_is_empty(void);
114 #define DIFF_FORMAT_RAW 1
115 #define DIFF_FORMAT_PATCH 2
116 #define DIFF_FORMAT_NO_OUTPUT 3
117 #define DIFF_FORMAT_NAME 4
118 #define DIFF_FORMAT_NAME_STATUS 5
120 extern void diff_flush(struct diff_options
*);
122 /* diff-raw status letters */
123 #define DIFF_STATUS_ADDED 'A'
124 #define DIFF_STATUS_COPIED 'C'
125 #define DIFF_STATUS_DELETED 'D'
126 #define DIFF_STATUS_MODIFIED 'M'
127 #define DIFF_STATUS_RENAMED 'R'
128 #define DIFF_STATUS_TYPE_CHANGED 'T'
129 #define DIFF_STATUS_UNKNOWN 'X'
130 #define DIFF_STATUS_UNMERGED 'U'
132 /* these are not diff-raw status letters proper, but used by
133 * diffcore-filter insn to specify additional restrictions.
135 #define DIFF_STATUS_FILTER_AON '*'
136 #define DIFF_STATUS_FILTER_BROKEN 'B'