[PATCH] Add a RPMBUILD make variable

[git.git] / diff.h

diff --git a/diff.h b/diff.h
index 6aa4128..e0a3207 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -4,6 +4,10 @@
 #ifndef DIFF_H
 #define DIFF_H
 
+#define DIFF_FILE_CANON_MODE(mode) \
+       (S_ISREG(mode) ? (S_IFREG | ce_permissions(mode)) : \
+       S_ISLNK(mode) ? S_IFLNK : S_IFDIR)
+
 extern void diff_addremove(int addremove,
                           unsigned mode,
                           const unsigned char *sha1,
@@ -28,24 +32,54 @@ extern void diff_unmerge(const char *path);
 
 extern int diff_scoreopt_parse(const char *opt);
 
-#define DIFF_FORMAT_HUMAN      0
-#define DIFF_FORMAT_MACHINE    1
-#define DIFF_FORMAT_PATCH      2
-#define DIFF_FORMAT_NO_OUTPUT  3
-extern void diff_setup(int reverse);
+#define DIFF_SETUP_REVERSE             1
+#define DIFF_SETUP_USE_CACHE           2
+#define DIFF_SETUP_USE_SIZE_CACHE      4
+
+extern void diff_setup(int flags);
 
 #define DIFF_DETECT_RENAME     1
 #define DIFF_DETECT_COPY       2
 
-extern void diffcore_rename(int rename_copy, int minimum_score);
+#define DIFF_PICKAXE_ALL       1
 
-extern void diffcore_prune(void);
+extern void diffcore_std(const char **paths,
+                        int detect_rename, int rename_score,
+                        const char *pickaxe, int pickaxe_opts,
+                        int break_opt,
+                        const char *orderfile, const char *filter);
 
-extern void diffcore_pickaxe(const char *needle);
-extern void diffcore_pathspec(const char **pathspec);
+extern void diffcore_std_no_resolve(const char **paths,
+                                   const char *pickaxe, int pickaxe_opts,
+                                   const char *orderfile, const char *filter);
+
+#define COMMON_DIFF_OPTIONS_HELP \
+"\ncommon diff options:\n" \
+"  -r          diff recursively (only meaningful in diff-tree)\n" \
+"  -z          output diff-raw with lines terminated with NUL.\n" \
+"  -p          output patch format.\n" \
+"  -u          synonym for -p.\n" \
+"  --name-only show only names of changed files.\n" \
+"  --name-only-z\n" \
+"              same as --name-only but terminate lines with NUL.\n" \
+"  -R          swap input file pairs.\n" \
+"  -B          detect complete rewrites.\n" \
+"  -M          detect renames.\n" \
+"  -C          detect copies.\n" \
+"  --find-copies-harder\n" \
+"              try unchanged files as candidate for copy detection.\n" \
+"  -O<file>    reorder diffs according to the <file>.\n" \
+"  -S<string>  find filepair whose only one side contains the string.\n" \
+"  --pickaxe-all\n" \
+"              show all files diff when -S is used and hit is found.\n"
 
 extern int diff_queue_is_empty(void);
 
-extern void diff_flush(int output_style, int resolve_rename_copy);
+#define DIFF_FORMAT_RAW                1
+#define DIFF_FORMAT_PATCH      2
+#define DIFF_FORMAT_NO_OUTPUT  3
+#define DIFF_FORMAT_NAME       4
+
+extern void diff_flush(int output_style, int line_terminator);
 
 #endif /* DIFF_H */