X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diff.h;h=2f4a7b463b699e65848656279287e2d8e2048c16;hb=4eba0f3763e2f4bbf614c99ae3a5b299e8d61aff;hp=c146d8acf8601f81cb7b7baeaffcf85081e1eb1b;hpb=99665af5c0be0fe4319b39183e84917993153576;p=git.git

diff --git a/diff.h b/diff.h
index c146d8ac..2f4a7b46 100644
--- a/diff.h
+++ b/diff.h
@@ -4,34 +4,106 @@
 #ifndef DIFF_H
 #define DIFF_H
 
-extern void diff_addremove(int addremove,
+#define DIFF_FILE_CANON_MODE(mode) \
+	(S_ISREG(mode) ? (S_IFREG | ce_permissions(mode)) : \
+	S_ISLNK(mode) ? S_IFLNK : S_IFDIR)
+
+struct diff_options {
+	const char **paths;
+	const char *filter;
+	const char *orderfile;
+	const char *pickaxe;
+	int break_opt;
+	int detect_rename;
+	int find_copies_harder;
+	int line_termination;
+	int output_format;
+	int pickaxe_opts;
+	int rename_score;
+	int reverse_diff;
+	int rename_limit;
+	int setup;
+};
+
+extern void diff_addremove(struct diff_options *,
+			   int addremove,
 			   unsigned mode,
 			   const unsigned char *sha1,
 			   const char *base,
 			   const char *path);
 
-extern void diff_change(unsigned mode1, unsigned mode2,
-			     const unsigned char *sha1,
-			     const unsigned char *sha2,
-			     const char *base, const char *path);
-
-extern void diff_unmerge(const char *path);
-
-/* These are for diff-helper */
-
-struct diff_spec {
-	unsigned char blob_sha1[20];
-	unsigned short mode;	 /* file mode */
-	unsigned sha1_valid : 1; /* if true, use blob_sha1 and trust mode;
-				  * however with a NULL SHA1, read them
-				  * from the file system.
-				  * if false, use the name and read mode from
-				  * the filesystem.
-				  */
-	unsigned file_valid : 1; /* if false the file does not even exist */
-};
+extern void diff_change(struct diff_options *,
+			unsigned mode1, unsigned mode2,
+			const unsigned char *sha1,
+			const unsigned char *sha2,
+			const char *base, const char *path);
+
+extern void diff_unmerge(struct diff_options *,
+			 const char *path);
+
+extern int diff_scoreopt_parse(const char *opt);
+
+#define DIFF_SETUP_REVERSE      	1
+#define DIFF_SETUP_USE_CACHE		2
+#define DIFF_SETUP_USE_SIZE_CACHE	4
+
+extern void diff_setup(struct diff_options *);
+extern int diff_opt_parse(struct diff_options *, const char **, int);
+extern int diff_setup_done(struct diff_options *);
+
+#define DIFF_DETECT_RENAME	1
+#define DIFF_DETECT_COPY	2
 
-extern void run_external_diff(const char *name,
-			      struct diff_spec *, struct diff_spec *);
+#define DIFF_PICKAXE_ALL	1
+
+extern void diffcore_std(struct diff_options *);
+
+extern void diffcore_std_no_resolve(struct diff_options *);
+
+#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-status show names and status of changed files.\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" \
+"  -l<n>         limit rename attempts up to <n> paths.\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);
+
+#define DIFF_FORMAT_RAW		1
+#define DIFF_FORMAT_PATCH	2
+#define DIFF_FORMAT_NO_OUTPUT	3
+#define DIFF_FORMAT_NAME	4
+#define DIFF_FORMAT_NAME_STATUS	5
+
+extern void diff_flush(struct diff_options*);
+
+/* diff-raw status letters */
+#define DIFF_STATUS_ADDED		'A'
+#define DIFF_STATUS_COPIED		'C'
+#define DIFF_STATUS_DELETED		'D'
+#define DIFF_STATUS_MODIFIED		'M'
+#define DIFF_STATUS_RENAMED		'R'
+#define DIFF_STATUS_TYPE_CHANGED	'T'
+#define DIFF_STATUS_UNKNOWN		'X'
+#define DIFF_STATUS_UNMERGED		'U'
+
+/* these are not diff-raw status letters proper, but used by
+ * diffcore-filter insn to specify additional restrictions.
+ */
+#define DIFF_STATUS_FILTER_AON		'*'
+#define DIFF_STATUS_FILTER_BROKEN	'B'
 
 #endif /* DIFF_H */