[PATCH] Clean up diff_setup() to make it more extensible.

[git.git] / diff.h

diff --git a/diff.h b/diff.h
index 1fc8469..6c25023 100644 (file)
--- a/diff.h
+++ b/diff.h
@@ -15,27 +15,37 @@ extern void diff_change(unsigned mode1, unsigned mode2,
                             const unsigned char *sha2,
                             const char *base, const char *path);
 
-extern void diff_guif(unsigned mode1,
-                     unsigned mode2,
-                     const unsigned char *sha1,
-                     const unsigned char *sha2,
-                     const char *path1,
-                     const char *path2);
+extern void diff_helper_input(unsigned mode1,
+                             unsigned mode2,
+                             const unsigned char *sha1,
+                             const unsigned char *sha2,
+                             const char *path1,
+                             int status,
+                             int score,
+                             const char *path2);
 
 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
-extern void diff_setup(int reverse, int diff_output_style);
+#define DIFF_SETUP_REVERSE             1
+extern void diff_setup(int flags);
 
-extern void diff_detect_rename(int, int);
-extern void diff_pickaxe(const char *);
+#define DIFF_DETECT_RENAME     1
+#define DIFF_DETECT_COPY       2
+
+extern void diffcore_rename(int rename_copy, int minimum_score);
+
+extern void diffcore_pickaxe(const char *needle);
+extern void diffcore_pathspec(const char **pathspec);
 
 extern int diff_queue_is_empty(void);
 
-extern void diff_flush(const char **, int);
+#define DIFF_FORMAT_HUMAN      0
+#define DIFF_FORMAT_MACHINE    1
+#define DIFF_FORMAT_PATCH      2
+#define DIFF_FORMAT_NO_OUTPUT  3
+
+extern void diff_flush(int output_style, int resolve_rename_copy);
 
 #endif /* DIFF_H */