X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diff.h;h=9f0852d321bbed548fa57b5afdc3aad25c1dd943;hb=479346adc5ebb099121063d4c06da30093ed9b3b;hp=97d39ac96175a5df191023697388f14c4f7e6c7c;hpb=52e9578985fb636ec1d3f6cf794fdadd5ec896fc;p=git.git

diff --git a/diff.h b/diff.h
index 97d39ac9..9f0852d3 100644
--- 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,
@@ -15,15 +19,47 @@ extern void diff_change(unsigned mode1, unsigned mode2,
 			     const unsigned char *sha2,
 			     const char *base, const char *path);
 
+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);
 
-extern void diff_setup(int detect_rename, int minimum_score,
-		       char *pickaxe,
-		       int reverse, int raw_output,
-		       const char **spec, int cnt);
+#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
+
+#define DIFF_PICKAXE_ALL	1
+
+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_std_no_resolve(const char **paths,
+				    const char *pickaxe, int pickaxe_opts,
+				    const char *orderfile, const char *filter);
+
+extern int diff_queue_is_empty(void);
+
+#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(void);
+extern void diff_flush(int output_style);
 
 #endif /* DIFF_H */