[PATCH] Rename/copy detection fix.

[git.git] / diffcore.h

diff --git a/diffcore.h b/diffcore.h
index c3809ef..7b1cd4a 100644 (file)
--- a/diffcore.h
+++ b/diffcore.h
@@ -26,7 +26,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 */
 };
@@ -41,10 +41,17 @@ extern void diff_free_filespec_data(struct diff_filespec *);
 struct diff_filepair {
        struct diff_filespec *one;
        struct diff_filespec *two;
-       char *xfrm_msg;
+       int score; /* only valid when one and two are different paths */
        int orig_order; /* the original order of insertion into the queue */
-       int xfrm_work; /* for use by tramsformers, not by diffcore */
+       int rename_rank; /* rename/copy dependency needs to enforce
+                         * certain ordering of patches that later
+                         * diffcore transformations should not break.
+                         */
 };
+#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_filepair **queue;
@@ -52,10 +59,13 @@ struct diff_queue_struct {
        int nr;
 };
 
+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_detect_rename(struct diff_queue_struct *, int, int);
-extern void diff_pickaxe(struct diff_queue_struct *, const char *);
+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 *);
 
 #endif