[PATCH] Diff updates to express type changes

[git.git] / diffcore.h

diff --git a/diffcore.h b/diffcore.h
index c709cdd..ee1955b 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];
@@ -42,16 +40,20 @@ struct diff_filepair {
        struct diff_filespec *one;
        struct diff_filespec *two;
        int score; /* only valid when one and two are different paths */
-       int orig_order; /* the original order of insertion into the queue */
-       int rename_rank; /* rename/copy dependency needs to enforce
-                         * certain ordering of patches that later
-                         * diffcore transformations should not break.
-                         */
        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))
 
+#define DIFF_PAIR_TYPE_CHANGED(p) \
+       ((S_IFMT & (p)->one->mode) != (S_IFMT & (p)->two->mode))
+
+#define DIFF_PAIR_MODE_CHANGED(p) ((p)->one->mode != (p)->two->mode)
+
+#define DIFF_FILE_CANON_MODE(mode) \
+       (S_ISREG(mode) ? (S_IFREG | ce_permissions(mode)) : \
+       S_ISLNK(mode) ? S_IFLNK : S_IFDIR)
+
 extern int diff_unmodified_pair(struct diff_filepair *);
 
 struct diff_queue_struct {
@@ -69,4 +71,15 @@ 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