]>
Commit | Line | Data |
---|---|---|
5d23e133 JH |
1 | #include "cache.h" |
2 | #include "diff.h" | |
3 | #include "commit.h" | |
5289bae1 | 4 | #include "sha1-lookup.h" |
5d23e133 JH |
5 | #include "patch-ids.h" |
6 | ||
7c810407 JK |
7 | static int patch_id_defined(struct commit *commit) |
8 | { | |
9 | /* must be 0 or 1 parents */ | |
10 | return !commit->parents || !commit->parents->next; | |
11 | } | |
12 | ||
ded2c097 | 13 | int commit_patch_id(struct commit *commit, struct diff_options *options, |
34f3c0eb | 14 | struct object_id *oid, int diff_header_only) |
5d23e133 | 15 | { |
7c810407 JK |
16 | if (!patch_id_defined(commit)) |
17 | return -1; | |
18 | ||
5d23e133 | 19 | if (commit->parents) |
66f414f8 BW |
20 | diff_tree_oid(&commit->parents->item->object.oid, |
21 | &commit->object.oid, "", options); | |
5d23e133 | 22 | else |
7b8dea0c | 23 | diff_root_tree_oid(&commit->object.oid, "", options); |
5d23e133 | 24 | diffcore_std(options); |
bd25f288 | 25 | return diff_flush_patch_id(options, oid, diff_header_only); |
5d23e133 JH |
26 | } |
27 | ||
b3dfeebb KW |
28 | /* |
29 | * When we cannot load the full patch-id for both commits for whatever | |
30 | * reason, the function returns -1 (i.e. return error(...)). Despite | |
31 | * the "cmp" in the name of this function, the caller only cares about | |
32 | * the return value being zero (a and b are equivalent) or non-zero (a | |
33 | * and b are different), and returning non-zero would keep both in the | |
34 | * result, even if they actually were equivalent, in order to err on | |
35 | * the side of safety. The actual value being negative does not have | |
36 | * any significance; only that it is non-zero matters. | |
37 | */ | |
3da492f8 | 38 | static int patch_id_cmp(struct diff_options *opt, |
7663cdc8 | 39 | struct patch_id *a, |
dfb7a1b4 | 40 | struct patch_id *b, |
3da492f8 | 41 | const void *unused_keydata) |
5d23e133 | 42 | { |
34f3c0eb BW |
43 | if (is_null_oid(&a->patch_id) && |
44 | commit_patch_id(a->commit, opt, &a->patch_id, 0)) | |
b3dfeebb KW |
45 | return error("Could not get patch ID for %s", |
46 | oid_to_hex(&a->commit->object.oid)); | |
34f3c0eb BW |
47 | if (is_null_oid(&b->patch_id) && |
48 | commit_patch_id(b->commit, opt, &b->patch_id, 0)) | |
b3dfeebb KW |
49 | return error("Could not get patch ID for %s", |
50 | oid_to_hex(&b->commit->object.oid)); | |
34f3c0eb | 51 | return oidcmp(&a->patch_id, &b->patch_id); |
5d23e133 JH |
52 | } |
53 | ||
5d23e133 JH |
54 | int init_patch_ids(struct patch_ids *ids) |
55 | { | |
56 | memset(ids, 0, sizeof(*ids)); | |
57 | diff_setup(&ids->diffopts); | |
5a29cbc6 | 58 | ids->diffopts.detect_rename = 0; |
8f67f8ae | 59 | DIFF_OPT_SET(&ids->diffopts, RECURSIVE); |
28452655 | 60 | diff_setup_done(&ids->diffopts); |
7663cdc8 | 61 | hashmap_init(&ids->patches, (hashmap_cmp_fn)patch_id_cmp, |
3da492f8 | 62 | &ids->diffopts, 256); |
5d23e133 JH |
63 | return 0; |
64 | } | |
65 | ||
66 | int free_patch_ids(struct patch_ids *ids) | |
67 | { | |
dfb7a1b4 | 68 | hashmap_free(&ids->patches, 1); |
5d23e133 JH |
69 | return 0; |
70 | } | |
71 | ||
dfb7a1b4 KW |
72 | static int init_patch_id_entry(struct patch_id *patch, |
73 | struct commit *commit, | |
74 | struct patch_ids *ids) | |
5d23e133 | 75 | { |
34f3c0eb | 76 | struct object_id header_only_patch_id; |
b3dfeebb | 77 | |
683f17ec | 78 | patch->commit = commit; |
34f3c0eb | 79 | if (commit_patch_id(commit, &ids->diffopts, &header_only_patch_id, 1)) |
dfb7a1b4 | 80 | return -1; |
5d23e133 | 81 | |
34f3c0eb | 82 | hashmap_entry_init(patch, sha1hash(header_only_patch_id.hash)); |
dfb7a1b4 | 83 | return 0; |
5d23e133 JH |
84 | } |
85 | ||
86 | struct patch_id *has_commit_patch_id(struct commit *commit, | |
87 | struct patch_ids *ids) | |
88 | { | |
dfb7a1b4 KW |
89 | struct patch_id patch; |
90 | ||
7c810407 JK |
91 | if (!patch_id_defined(commit)) |
92 | return NULL; | |
93 | ||
dfb7a1b4 KW |
94 | memset(&patch, 0, sizeof(patch)); |
95 | if (init_patch_id_entry(&patch, commit, ids)) | |
96 | return NULL; | |
97 | ||
3da492f8 | 98 | return hashmap_get(&ids->patches, &patch, NULL); |
5d23e133 JH |
99 | } |
100 | ||
101 | struct patch_id *add_commit_patch_id(struct commit *commit, | |
102 | struct patch_ids *ids) | |
103 | { | |
5748693b | 104 | struct patch_id *key; |
dfb7a1b4 | 105 | |
7c810407 JK |
106 | if (!patch_id_defined(commit)) |
107 | return NULL; | |
108 | ||
5748693b | 109 | key = xcalloc(1, sizeof(*key)); |
dfb7a1b4 KW |
110 | if (init_patch_id_entry(key, commit, ids)) { |
111 | free(key); | |
112 | return NULL; | |
113 | } | |
114 | ||
115 | hashmap_add(&ids->patches, key); | |
116 | return key; | |
5d23e133 | 117 | } |