Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Newer
Older
100644 122 lines (102 sloc) 4.088 kb
427dcb4 [PATCH] Diff overhaul, adding half of copy detection.
Junio C Hamano authored
1 /*
2 * Copyright (C) 2005 Junio C Hamano
3 */
e0173ad Make macros to prevent double-inclusion in headers consistent.
Junio C Hamano authored
4 #ifndef DIFFCORE_H
5 #define DIFFCORE_H
427dcb4 [PATCH] Diff overhaul, adding half of copy detection.
Junio C Hamano authored
6
7 /* This header file is internal between diff.c and its diff transformers
8 * (e.g. diffcore-rename, diffcore-pickaxe). Never include this header
9 * in anything else.
10 */
eeaa460 [PATCH] diff: Update -B heuristics.
Junio C Hamano authored
11
12 /* We internally use unsigned short as the score value,
13 * and rely on an int capable to hold 32-bits. -B can take
14 * -Bmerge_score/break_score format and the two scores are
15 * passed around in one int (high 16-bit for merge and low 16-bit
16 * for break).
17 */
ee3d299 diffcore-break/diffcore-rename: integer overflow.
Junio C Hamano authored
18 #define MAX_SCORE 60000.0
f345b0a [PATCH] Add -B flag to diff-* brothers.
Junio C Hamano authored
19 #define DEFAULT_RENAME_SCORE 30000 /* rename/copy similarity minimum (50%) */
4d0f39c diffcore-break: similarity estimator fix.
Junio C Hamano authored
20 #define DEFAULT_BREAK_SCORE 30000 /* minimum for break to happen (50%) */
21 #define DEFAULT_MERGE_SCORE 36000 /* maximum for break-merge to happen 60%) */
eeaa460 [PATCH] diff: Update -B heuristics.
Junio C Hamano authored
22
23 #define MINIMUM_BREAK_SIZE 400 /* do not break a file smaller than this */
427dcb4 [PATCH] Diff overhaul, adding half of copy detection.
Junio C Hamano authored
24
25 struct diff_filespec {
26 unsigned char sha1[20];
27 char *path;
28 void *data;
c06c796 diffcore-rename: somewhat optimized.
Junio C Hamano authored
29 void *cnt_data;
e0e324a @gitster Fix configuration syntax to specify customized hunk header patterns.
gitster authored
30 const char *funcname_pattern_ident;
427dcb4 [PATCH] Diff overhaul, adding half of copy detection.
Junio C Hamano authored
31 unsigned long size;
9fb8841 @torvalds Ref-count the filespecs used by diffcore
torvalds authored
32 int count; /* Reference count */
427dcb4 [PATCH] Diff overhaul, adding half of copy detection.
Junio C Hamano authored
33 int xfrm_flags; /* for use by the xfrm */
6447971 @torvalds copy vs rename detection: avoid unnecessary O(n*m) loops
torvalds authored
34 int rename_used; /* Count of rename users */
427dcb4 [PATCH] Diff overhaul, adding half of copy detection.
Junio C Hamano authored
35 unsigned short mode; /* file mode */
36 unsigned sha1_valid : 1; /* if true, use sha1 and trust mode;
37 * if false, use the name and read from
38 * the filesystem.
39 */
dc7090e [PATCH] Re-Fix SIGSEGV on unmerged files in git-diff-files -p
Junio C Hamano authored
40 #define DIFF_FILE_VALID(spec) (((spec)->mode) != 0)
427dcb4 [PATCH] Diff overhaul, adding half of copy detection.
Junio C Hamano authored
41 unsigned should_free : 1; /* data should be free()'ed */
42 unsigned should_munmap : 1; /* data should be munmap()'ed */
29a3eef @gitster Introduce diff_filespec_is_binary()
gitster authored
43 unsigned checked_attr : 1;
706098a @gitster diffcore_filespec: add is_binary
gitster authored
44 unsigned is_binary : 1; /* data should be considered "binary" */
427dcb4 [PATCH] Diff overhaul, adding half of copy detection.
Junio C Hamano authored
45 };
46
47 extern struct diff_filespec *alloc_filespec(const char *);
9fb8841 @torvalds Ref-count the filespecs used by diffcore
torvalds authored
48 extern void free_filespec(struct diff_filespec *);
427dcb4 [PATCH] Diff overhaul, adding half of copy detection.
Junio C Hamano authored
49 extern void fill_filespec(struct diff_filespec *, const unsigned char *,
50 unsigned short);
51
f0c6b2a [PATCH] Optimize diff-tree -[CM] --stdin
Junio C Hamano authored
52 extern int diff_populate_filespec(struct diff_filespec *, int);
19397b4 Revert "[PATCH] plug memory leak in diff.c::diff_free_filepair()"
Junio C Hamano authored
53 extern void diff_free_filespec_data(struct diff_filespec *);
8ae92e6 @gitster rename diff_free_filespec_data_large() to diff_free_filespec_blob()
gitster authored
54 extern void diff_free_filespec_blob(struct diff_filespec *);
29a3eef @gitster Introduce diff_filespec_is_binary()
gitster authored
55 extern int diff_filespec_is_binary(struct diff_filespec *);
427dcb4 [PATCH] Diff overhaul, adding half of copy detection.
Junio C Hamano authored
56
52e9578 [PATCH] Introducing software archaeologist's tool "pickaxe".
Junio C Hamano authored
57 struct diff_filepair {
427dcb4 [PATCH] Diff overhaul, adding half of copy detection.
Junio C Hamano authored
58 struct diff_filespec *one;
59 struct diff_filespec *two;
01c4e70 [PATCH] diff: code clean-up and removal of rename hack.
Junio C Hamano authored
60 unsigned short int score;
15d061b [PATCH] Fix the way diffcore-rename records unremoved source.
Junio C Hamano authored
61 char status; /* M C R N D U (see Documentation/diff-format.txt) */
f345b0a [PATCH] Add -B flag to diff-* brothers.
Junio C Hamano authored
62 unsigned broken_pair : 1;
ef67768 diff.c: do not use pathname comparison to tell renames
Junio C Hamano authored
63 unsigned renamed_pair : 1;
e9c8409 diff-index --cached --raw: show tree entry on the LHS for unmerged entri...
Junio C Hamano authored
64 unsigned is_unmerged : 1;
427dcb4 [PATCH] Diff overhaul, adding half of copy detection.
Junio C Hamano authored
65 };
e9c8409 diff-index --cached --raw: show tree entry on the LHS for unmerged entri...
Junio C Hamano authored
66 #define DIFF_PAIR_UNMERGED(p) ((p)->is_unmerged)
427dcb4 [PATCH] Diff overhaul, adding half of copy detection.
Junio C Hamano authored
67
ef67768 diff.c: do not use pathname comparison to tell renames
Junio C Hamano authored
68 #define DIFF_PAIR_RENAME(p) ((p)->renamed_pair)
01c4e70 [PATCH] diff: code clean-up and removal of rename hack.
Junio C Hamano authored
69
f345b0a [PATCH] Add -B flag to diff-* brothers.
Junio C Hamano authored
70 #define DIFF_PAIR_BROKEN(p) \
71 ( (!DIFF_FILE_VALID((p)->one) != !DIFF_FILE_VALID((p)->two)) && \
72 ((p)->broken_pair != 0) )
73
96716a1 [PATCH] Fix type-change handling when assigning the status code to filep...
Junio C Hamano authored
74 #define DIFF_PAIR_TYPE_CHANGED(p) \
75 ((S_IFMT & (p)->one->mode) != (S_IFMT & (p)->two->mode))
76
4130b99 [PATCH] Diff updates to express type changes
Junio C Hamano authored
77 #define DIFF_PAIR_MODE_CHANGED(p) ((p)->one->mode != (p)->two->mode)
78
226406f [PATCH] Introduce diff_free_filepair() funcion.
Junio C Hamano authored
79 extern void diff_free_filepair(struct diff_filepair *);
80
f7c1512 [PATCH] Rename/copy detection fix.
Junio C Hamano authored
81 extern int diff_unmodified_pair(struct diff_filepair *);
82
427dcb4 [PATCH] Diff overhaul, adding half of copy detection.
Junio C Hamano authored
83 struct diff_queue_struct {
52e9578 [PATCH] Introducing software archaeologist's tool "pickaxe".
Junio C Hamano authored
84 struct diff_filepair **queue;
427dcb4 [PATCH] Diff overhaul, adding half of copy detection.
Junio C Hamano authored
85 int alloc;
86 int nr;
87 };
88
38c6f78 [PATCH] Prepare diffcore interface for diff-tree header supression.
Junio C Hamano authored
89 extern struct diff_queue_struct diff_queued_diff;
52e9578 [PATCH] Introducing software archaeologist's tool "pickaxe".
Junio C Hamano authored
90 extern struct diff_filepair *diff_queue(struct diff_queue_struct *,
91 struct diff_filespec *,
92 struct diff_filespec *);
6b14d7f [PATCH] Diffcore updates.
Junio C Hamano authored
93 extern void diff_q(struct diff_queue_struct *, struct diff_filepair *);
f7c1512 [PATCH] Rename/copy detection fix.
Junio C Hamano authored
94
ce24067 [PATCH] diff: Fix docs and add -O to diff-helper.
Junio C Hamano authored
95 extern void diffcore_pathspec(const char **pathspec);
96 extern void diffcore_break(int);
8082d8d Diff: -l<num> to limit rename/copy detection.
Junio C Hamano authored
97 extern void diffcore_rename(struct diff_options *);
eeaa460 [PATCH] diff: Update -B heuristics.
Junio C Hamano authored
98 extern void diffcore_merge_broken(void);
ce24067 [PATCH] diff: Fix docs and add -O to diff-helper.
Junio C Hamano authored
99 extern void diffcore_pickaxe(const char *needle, int opts);
100 extern void diffcore_order(const char *orderfile);
101
25d5ea4 [PATCH] Redo rename/copy detection logic.
Junio C Hamano authored
102 #define DIFF_DEBUG 0
103 #if DIFF_DEBUG
104 void diff_debug_filespec(struct diff_filespec *, int, const char *);
105 void diff_debug_filepair(const struct diff_filepair *, int);
106 void diff_debug_queue(const char *, struct diff_queue_struct *);
107 #else
108 #define diff_debug_filespec(a,b,c) do {} while(0)
109 #define diff_debug_filepair(a,b) do {} while(0)
110 #define diff_debug_queue(a,b) do {} while(0)
111 #endif
112
d8c3d03 @gitster diffcore_count_changes: pass diffcore_filespec
gitster authored
113 extern int diffcore_count_changes(struct diff_filespec *src,
114 struct diff_filespec *dst,
c06c796 diffcore-rename: somewhat optimized.
Junio C Hamano authored
115 void **src_count_p,
116 void **dst_count_p,
6541675 diffcore-rename: split out the delta counting code.
Junio C Hamano authored
117 unsigned long delta_limit,
118 unsigned long *src_copied,
119 unsigned long *literal_added);
120
427dcb4 [PATCH] Diff overhaul, adding half of copy detection.
Junio C Hamano authored
121 #endif
Something went wrong with that request. Please try again.