2 * Copyright (C) 2005 Junio C Hamano
11 struct userdiff_driver
;
13 /* This header file is internal between diff.c and its diff transformers
14 * (e.g. diffcore-rename, diffcore-pickaxe). Never include this header
18 /* We internally use unsigned short as the score value,
19 * and rely on an int capable to hold 32-bits. -B can take
20 * -Bmerge_score/break_score format and the two scores are
21 * passed around in one int (high 16-bit for merge and low 16-bit
24 #define MAX_SCORE 60000.0
25 #define DEFAULT_RENAME_SCORE 30000 /* rename/copy similarity minimum (50%) */
26 #define DEFAULT_BREAK_SCORE 30000 /* minimum for break to happen (50%) */
27 #define DEFAULT_MERGE_SCORE 36000 /* maximum for break-merge to happen (60%) */
29 #define MINIMUM_BREAK_SIZE 400 /* do not break a file smaller than this */
32 * the internal representation for a single file (blob). It records the blob
33 * object name (if known -- for a work tree file it typically is a NUL SHA-1),
34 * filemode and pathname. This is what the `diff_addremove()`, `diff_change()`
35 * and `diff_unmerge()` synthesize and feed `diff_queue()` function with.
37 struct diff_filespec
{
43 int count
; /* Reference count */
44 int rename_used
; /* Count of rename users */
45 unsigned short mode
; /* file mode */
46 unsigned oid_valid
: 1; /* if true, use oid and trust mode;
47 * if false, use the name and read from
50 #define DIFF_FILE_VALID(spec) (((spec)->mode) != 0)
51 unsigned should_free
: 1; /* data should be free()'ed */
52 unsigned should_munmap
: 1; /* data should be munmap()'ed */
53 unsigned dirty_submodule
: 2; /* For submodules: its work tree is dirty */
54 #define DIRTY_SUBMODULE_UNTRACKED 1
55 #define DIRTY_SUBMODULE_MODIFIED 2
56 unsigned is_stdin
: 1;
57 unsigned has_more_entries
: 1; /* only appear in combined diff */
58 /* data should be considered "binary"; -1 means "don't know yet" */
59 signed int is_binary
: 2;
60 struct userdiff_driver
*driver
;
63 struct diff_filespec
*alloc_filespec(const char *);
64 void free_filespec(struct diff_filespec
*);
65 void fill_filespec(struct diff_filespec
*, const struct object_id
*,
68 struct diff_populate_filespec_options
{
69 unsigned check_size_only
: 1;
70 unsigned check_binary
: 1;
72 int diff_populate_filespec(struct repository
*, struct diff_filespec
*,
73 const struct diff_populate_filespec_options
*);
74 void diff_free_filespec_data(struct diff_filespec
*);
75 void diff_free_filespec_blob(struct diff_filespec
*);
76 int diff_filespec_is_binary(struct repository
*, struct diff_filespec
*);
79 * This records a pair of `struct diff_filespec`; the filespec for a file in
80 * the "old" set (i.e. preimage) is called `one`, and the filespec for a file
81 * in the "new" set (i.e. postimage) is called `two`. A change that represents
82 * file creation has NULL in `one`, and file deletion has NULL in `two`.
84 * A `filepair` starts pointing at `one` and `two` that are from the same
85 * filename, but `diffcore_std()` can break pairs and match component filespecs
86 * with other filespecs from a different filepair to form new filepair. This is
87 * called 'rename detection'.
89 struct diff_filepair
{
90 struct diff_filespec
*one
;
91 struct diff_filespec
*two
;
92 unsigned short int score
;
93 char status
; /* M C R A D U etc. (see Documentation/diff-format.txt or DIFF_STATUS_* in diff.h) */
94 unsigned broken_pair
: 1;
95 unsigned renamed_pair
: 1;
96 unsigned is_unmerged
: 1;
97 unsigned done_skip_stat_unmatch
: 1;
98 unsigned skip_stat_unmatch_result
: 1;
101 #define DIFF_PAIR_UNMERGED(p) ((p)->is_unmerged)
103 #define DIFF_PAIR_RENAME(p) ((p)->renamed_pair)
105 #define DIFF_PAIR_BROKEN(p) \
106 ( (!DIFF_FILE_VALID((p)->one) != !DIFF_FILE_VALID((p)->two)) && \
107 ((p)->broken_pair != 0) )
109 #define DIFF_PAIR_TYPE_CHANGED(p) \
110 ((S_IFMT & (p)->one->mode) != (S_IFMT & (p)->two->mode))
112 #define DIFF_PAIR_MODE_CHANGED(p) ((p)->one->mode != (p)->two->mode)
114 void diff_free_filepair(struct diff_filepair
*);
116 int diff_unmodified_pair(struct diff_filepair
*);
119 * This is a collection of filepairs. Notable members are:
122 * An array of pointers to `struct diff_filepair`. This dynamically grows as
126 * The allocated size of the `queue` array;
129 * The number of elements in the `queue` array.
131 struct diff_queue_struct
{
132 struct diff_filepair
**queue
;
137 #define DIFF_QUEUE_CLEAR(q) \
140 (q)->nr = (q)->alloc = 0; \
143 extern struct diff_queue_struct diff_queued_diff
;
144 struct diff_filepair
*diff_queue(struct diff_queue_struct
*,
145 struct diff_filespec
*,
146 struct diff_filespec
*);
147 void diff_q(struct diff_queue_struct
*, struct diff_filepair
*);
149 void diffcore_break(struct repository
*, int);
150 void diffcore_rename(struct diff_options
*);
151 void diffcore_merge_broken(void);
152 void diffcore_pickaxe(struct diff_options
*);
153 void diffcore_order(const char *orderfile
);
155 /* low-level interface to diffcore_order */
157 void *obj
; /* setup by caller */
159 /* setup/used by order_objects() */
164 typedef const char *(*obj_path_fn_t
)(void *obj
);
166 void order_objects(const char *orderfile
, obj_path_fn_t obj_path
,
167 struct obj_order
*objs
, int nr
);
171 void diff_debug_filespec(struct diff_filespec
*, int, const char *);
172 void diff_debug_filepair(const struct diff_filepair
*, int);
173 void diff_debug_queue(const char *, struct diff_queue_struct
*);
175 #define diff_debug_filespec(a,b,c) do { /* nothing */ } while (0)
176 #define diff_debug_filepair(a,b) do { /* nothing */ } while (0)
177 #define diff_debug_queue(a,b) do { /* nothing */ } while (0)
180 int diffcore_count_changes(struct repository
*r
,
181 struct diff_filespec
*src
,
182 struct diff_filespec
*dst
,
185 unsigned long *src_copied
,
186 unsigned long *literal_added
);