Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Newer
Older
100644 111 lines (91 sloc) 3.699 kb
427dcb4 [PATCH] Diff overhaul, adding half of copy detection.
Junio C Hamano authored
1 /*
2 * Copyright (C) 2005 Junio C Hamano
3 */
4 #ifndef _DIFFCORE_H_
5 #define _DIFFCORE_H_
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;
29 unsigned long size;
30 int xfrm_flags; /* for use by the xfrm */
31 unsigned short mode; /* file mode */
32 unsigned sha1_valid : 1; /* if true, use sha1 and trust mode;
33 * if false, use the name and read from
34 * the filesystem.
35 */
dc7090e [PATCH] Re-Fix SIGSEGV on unmerged files in git-diff-files -p
Junio C Hamano authored
36 #define DIFF_FILE_VALID(spec) (((spec)->mode) != 0)
427dcb4 [PATCH] Diff overhaul, adding half of copy detection.
Junio C Hamano authored
37 unsigned should_free : 1; /* data should be free()'ed */
38 unsigned should_munmap : 1; /* data should be munmap()'ed */
39 };
40
41 extern struct diff_filespec *alloc_filespec(const char *);
42 extern void fill_filespec(struct diff_filespec *, const unsigned char *,
43 unsigned short);
44
f0c6b2a [PATCH] Optimize diff-tree -[CM] --stdin
Junio C Hamano authored
45 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
46 extern void diff_free_filespec_data(struct diff_filespec *);
427dcb4 [PATCH] Diff overhaul, adding half of copy detection.
Junio C Hamano authored
47
52e9578 [PATCH] Introducing software archaeologist's tool "pickaxe".
Junio C Hamano authored
48 struct diff_filepair {
427dcb4 [PATCH] Diff overhaul, adding half of copy detection.
Junio C Hamano authored
49 struct diff_filespec *one;
50 struct diff_filespec *two;
01c4e70 [PATCH] diff: code clean-up and removal of rename hack.
Junio C Hamano authored
51 unsigned short int score;
15d061b [PATCH] Fix the way diffcore-rename records unremoved source.
Junio C Hamano authored
52 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
53 unsigned source_stays : 1; /* all of R/C are copies */
54 unsigned broken_pair : 1;
427dcb4 [PATCH] Diff overhaul, adding half of copy detection.
Junio C Hamano authored
55 };
6b14d7f [PATCH] Diffcore updates.
Junio C Hamano authored
56 #define DIFF_PAIR_UNMERGED(p) \
57 (!DIFF_FILE_VALID((p)->one) && !DIFF_FILE_VALID((p)->two))
427dcb4 [PATCH] Diff overhaul, adding half of copy detection.
Junio C Hamano authored
58
01c4e70 [PATCH] diff: code clean-up and removal of rename hack.
Junio C Hamano authored
59 #define DIFF_PAIR_RENAME(p) (strcmp((p)->one->path, (p)->two->path))
60
f345b0a [PATCH] Add -B flag to diff-* brothers.
Junio C Hamano authored
61 #define DIFF_PAIR_BROKEN(p) \
62 ( (!DIFF_FILE_VALID((p)->one) != !DIFF_FILE_VALID((p)->two)) && \
63 ((p)->broken_pair != 0) )
64
96716a1 [PATCH] Fix type-change handling when assigning the status code to fi…
Junio C Hamano authored
65 #define DIFF_PAIR_TYPE_CHANGED(p) \
66 ((S_IFMT & (p)->one->mode) != (S_IFMT & (p)->two->mode))
67
4130b99 [PATCH] Diff updates to express type changes
Junio C Hamano authored
68 #define DIFF_PAIR_MODE_CHANGED(p) ((p)->one->mode != (p)->two->mode)
69
226406f [PATCH] Introduce diff_free_filepair() funcion.
Junio C Hamano authored
70 extern void diff_free_filepair(struct diff_filepair *);
71
f7c1512 [PATCH] Rename/copy detection fix.
Junio C Hamano authored
72 extern int diff_unmodified_pair(struct diff_filepair *);
73
427dcb4 [PATCH] Diff overhaul, adding half of copy detection.
Junio C Hamano authored
74 struct diff_queue_struct {
52e9578 [PATCH] Introducing software archaeologist's tool "pickaxe".
Junio C Hamano authored
75 struct diff_filepair **queue;
427dcb4 [PATCH] Diff overhaul, adding half of copy detection.
Junio C Hamano authored
76 int alloc;
77 int nr;
78 };
79
38c6f78 [PATCH] Prepare diffcore interface for diff-tree header supression.
Junio C Hamano authored
80 extern struct diff_queue_struct diff_queued_diff;
52e9578 [PATCH] Introducing software archaeologist's tool "pickaxe".
Junio C Hamano authored
81 extern struct diff_filepair *diff_queue(struct diff_queue_struct *,
82 struct diff_filespec *,
83 struct diff_filespec *);
6b14d7f [PATCH] Diffcore updates.
Junio C Hamano authored
84 extern void diff_q(struct diff_queue_struct *, struct diff_filepair *);
f7c1512 [PATCH] Rename/copy detection fix.
Junio C Hamano authored
85
ce24067 [PATCH] diff: Fix docs and add -O to diff-helper.
Junio C Hamano authored
86 extern void diffcore_pathspec(const char **pathspec);
87 extern void diffcore_break(int);
8082d8d Diff: -l<num> to limit rename/copy detection.
Junio C Hamano authored
88 extern void diffcore_rename(struct diff_options *);
eeaa460 [PATCH] diff: Update -B heuristics.
Junio C Hamano authored
89 extern void diffcore_merge_broken(void);
ce24067 [PATCH] diff: Fix docs and add -O to diff-helper.
Junio C Hamano authored
90 extern void diffcore_pickaxe(const char *needle, int opts);
91 extern void diffcore_order(const char *orderfile);
92
25d5ea4 [PATCH] Redo rename/copy detection logic.
Junio C Hamano authored
93 #define DIFF_DEBUG 0
94 #if DIFF_DEBUG
95 void diff_debug_filespec(struct diff_filespec *, int, const char *);
96 void diff_debug_filepair(const struct diff_filepair *, int);
97 void diff_debug_queue(const char *, struct diff_queue_struct *);
98 #else
99 #define diff_debug_filespec(a,b,c) do {} while(0)
100 #define diff_debug_filepair(a,b) do {} while(0)
101 #define diff_debug_queue(a,b) do {} while(0)
102 #endif
103
6541675 diffcore-rename: split out the delta counting code.
Junio C Hamano authored
104 extern int diffcore_count_changes(void *src, unsigned long src_size,
105 void *dst, unsigned long dst_size,
106 unsigned long delta_limit,
107 unsigned long *src_copied,
108 unsigned long *literal_added);
109
427dcb4 [PATCH] Diff overhaul, adding half of copy detection.
Junio C Hamano authored
110 #endif
Something went wrong with that request. Please try again.