[PATCH] optimize git-resolve-script

[git.git] / diffcore.h

diff --git a/diffcore.h b/diffcore.h
index 5fa7067..4610168 100644 (file)
--- a/diffcore.h
+++ b/diffcore.h
@@ -12,8 +12,6 @@
 #define DEFAULT_MINIMUM_SCORE 5000
 
 #define RENAME_DST_MATCHED 01
-#define RENAME_SRC_GONE    02
-#define RENAME_SCORE_SHIFT 8
 
 struct diff_filespec {
        unsigned char sha1[20];
@@ -26,7 +24,7 @@ struct diff_filespec {
                                  * if false, use the name and read from
                                  * the filesystem.
                                  */
-       unsigned file_valid : 1; /* if false the file does not exist */
+#define DIFF_FILE_VALID(spec) (((spec)->mode) != 0)
        unsigned should_free : 1; /* data should be free()'ed */
        unsigned should_munmap : 1; /* data should be munmap()'ed */
 };
@@ -38,23 +36,41 @@ extern void fill_filespec(struct diff_filespec *, const unsigned char *,
 extern int diff_populate_filespec(struct diff_filespec *);
 extern void diff_free_filespec_data(struct diff_filespec *);
 
-struct diff_file_pair {
+struct diff_filepair {
        struct diff_filespec *one;
        struct diff_filespec *two;
-       char *xfrm_msg;
-       int orig_order; /* the original order of insertion into the queue */
-       int xfrm_work; /* for use by tramsformers, not by diffcore */
+       int score; /* only valid when one and two are different paths */
+       int status; /* M C R N D U (see Documentation/diff-format.txt) */
 };
+#define DIFF_PAIR_UNMERGED(p) \
+       (!DIFF_FILE_VALID((p)->one) && !DIFF_FILE_VALID((p)->two))
+
+extern int diff_unmodified_pair(struct diff_filepair *);
 
 struct diff_queue_struct {
-       struct diff_file_pair **queue;
+       struct diff_filepair **queue;
        int alloc;
        int nr;
 };
 
-extern struct diff_file_pair *diff_queue(struct diff_queue_struct *,
-                                        struct diff_filespec *,
-                                        struct diff_filespec *);
-extern void diff_detect_rename(struct diff_queue_struct *, int, int);
+extern struct diff_queue_struct diff_queued_diff;
+extern struct diff_filepair *diff_queue(struct diff_queue_struct *,
+                                       struct diff_filespec *,
+                                       struct diff_filespec *);
+extern void diff_q(struct diff_queue_struct *, struct diff_filepair *);
+
+extern int diff_needs_to_stay(struct diff_queue_struct *, int,
+                             struct diff_filespec *);
+
+#define DIFF_DEBUG 0
+#if DIFF_DEBUG
+void diff_debug_filespec(struct diff_filespec *, int, const char *);
+void diff_debug_filepair(const struct diff_filepair *, int);
+void diff_debug_queue(const char *, struct diff_queue_struct *);
+#else
+#define diff_debug_filespec(a,b,c) do {} while(0)
+#define diff_debug_filepair(a,b) do {} while(0)
+#define diff_debug_queue(a,b) do {} while(0)
+#endif
 
 #endif