X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=diffcore.h;h=462014b652ea6f7c5a2b09a7b37dbf563a174c3f;hb=6145ee8b361959db04b8cdefc883e4fc2dc27276;hp=7b1cd4a059be96018f2d78784afbe9181a3fb12d;hpb=f7c1512af8ff4f821c530f9a4bc8f8ff25733d51;p=git.git diff --git a/diffcore.h b/diffcore.h index 7b1cd4a0..462014b6 100644 --- 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]; @@ -41,16 +39,26 @@ extern void diff_free_filespec_data(struct diff_filespec *); 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. - */ + unsigned short int score; /* only valid when one and two are + * different paths + */ + char source_stays; /* all of R/C are copies */ + char 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 void diff_free_filepair(struct diff_filepair *); + extern int diff_unmodified_pair(struct diff_filepair *); struct diff_queue_struct { @@ -65,7 +73,15 @@ extern struct diff_filepair *diff_queue(struct diff_queue_struct *, 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