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)
14 const char *orderfile
;
18 int find_copies_harder
;
27 extern void diff_addremove(struct diff_options
*,
30 const unsigned char *sha1
,
34 extern void diff_change(struct diff_options
*,
35 unsigned mode1
, unsigned mode2
,
36 const unsigned char *sha1
,
37 const unsigned char *sha2
,
38 const char *base
, const char *path
);
40 extern void diff_unmerge(struct diff_options
*,
43 extern int diff_scoreopt_parse(const char *opt
);
45 #define DIFF_SETUP_REVERSE 1
46 #define DIFF_SETUP_USE_CACHE 2
47 #define DIFF_SETUP_USE_SIZE_CACHE 4
49 extern void diff_setup(struct diff_options
*);
50 extern int diff_opt_parse(struct diff_options
*, const char **, int);
51 extern int diff_setup_done(struct diff_options
*);
53 #define DIFF_DETECT_RENAME 1
54 #define DIFF_DETECT_COPY 2
56 #define DIFF_PICKAXE_ALL 1
58 extern void diffcore_std(struct diff_options
*);
60 extern void diffcore_std_no_resolve(struct diff_options
*);
62 #define COMMON_DIFF_OPTIONS_HELP \
63 "\ncommon diff options:\n" \
64 " -r diff recursively (only meaningful in diff-tree)\n" \
65 " -z output diff-raw with lines terminated with NUL.\n" \
66 " -p output patch format.\n" \
67 " -u synonym for -p.\n" \
68 " --name-only show only names of changed files.\n" \
70 " same as --name-only but terminate lines with NUL.\n" \
71 " -R swap input file pairs.\n" \
72 " -B detect complete rewrites.\n" \
73 " -M detect renames.\n" \
74 " -C detect copies.\n" \
75 " --find-copies-harder\n" \
76 " try unchanged files as candidate for copy detection.\n" \
77 " -O<file> reorder diffs according to the <file>.\n" \
78 " -S<string> find filepair whose only one side contains the string.\n" \
80 " show all files diff when -S is used and hit is found.\n"
82 extern int diff_queue_is_empty(void);
84 #define DIFF_FORMAT_RAW 1
85 #define DIFF_FORMAT_PATCH 2
86 #define DIFF_FORMAT_NO_OUTPUT 3
87 #define DIFF_FORMAT_NAME 4
89 extern void diff_flush(struct diff_options
*);
91 /* diff-raw status letters */
92 #define DIFF_STATUS_ADDED 'A'
93 #define DIFF_STATUS_COPIED 'C'
94 #define DIFF_STATUS_DELETED 'D'
95 #define DIFF_STATUS_MODIFIED 'M'
96 #define DIFF_STATUS_RENAMED 'R'
97 #define DIFF_STATUS_TYPE_CHANGED 'T'
98 #define DIFF_STATUS_UNKNOWN 'X'
99 #define DIFF_STATUS_UNMERGED 'U'
101 /* these are not diff-raw status letters proper, but used by
102 * diffcore-filter insn to specify additional restrictions.
104 #define DIFF_STATUS_FILTER_AON 'A'
105 #define DIFF_STATUS_FILTER_BROKEN 'B'