push: avoid showing false negotiation errors
[git/gitster.git] / patch-ids.c
bloba5683b462c6e7692ceff3218213b9747a9b6cc02
1 #include "git-compat-util.h"
2 #include "diff.h"
3 #include "commit.h"
4 #include "hash.h"
5 #include "hex.h"
6 #include "patch-ids.h"
8 static int patch_id_defined(struct commit *commit)
10 /* must be 0 or 1 parents */
11 return !commit->parents || !commit->parents->next;
14 int commit_patch_id(struct commit *commit, struct diff_options *options,
15 struct object_id *oid, int diff_header_only)
17 if (!patch_id_defined(commit))
18 return -1;
20 if (commit->parents)
21 diff_tree_oid(&commit->parents->item->object.oid,
22 &commit->object.oid, "", options);
23 else
24 diff_root_tree_oid(&commit->object.oid, "", options);
25 diffcore_std(options);
26 return diff_flush_patch_id(options, oid, diff_header_only);
30 * When we cannot load the full patch-id for both commits for whatever
31 * reason, the function returns -1 (i.e. return error(...)). Despite
32 * the "neq" in the name of this function, the caller only cares about
33 * the return value being zero (a and b are equivalent) or non-zero (a
34 * and b are different), and returning non-zero would keep both in the
35 * result, even if they actually were equivalent, in order to err on
36 * the side of safety. The actual value being negative does not have
37 * any significance; only that it is non-zero matters.
39 static int patch_id_neq(const void *cmpfn_data,
40 const struct hashmap_entry *eptr,
41 const struct hashmap_entry *entry_or_key,
42 const void *keydata UNUSED)
44 /* NEEDSWORK: const correctness? */
45 struct diff_options *opt = (void *)cmpfn_data;
46 struct patch_id *a, *b;
48 a = container_of(eptr, struct patch_id, ent);
49 b = container_of(entry_or_key, struct patch_id, ent);
51 if (is_null_oid(&a->patch_id) &&
52 commit_patch_id(a->commit, opt, &a->patch_id, 0))
53 return error("Could not get patch ID for %s",
54 oid_to_hex(&a->commit->object.oid));
55 if (is_null_oid(&b->patch_id) &&
56 commit_patch_id(b->commit, opt, &b->patch_id, 0))
57 return error("Could not get patch ID for %s",
58 oid_to_hex(&b->commit->object.oid));
59 return !oideq(&a->patch_id, &b->patch_id);
62 int init_patch_ids(struct repository *r, struct patch_ids *ids)
64 memset(ids, 0, sizeof(*ids));
65 repo_diff_setup(r, &ids->diffopts);
66 ids->diffopts.detect_rename = 0;
67 ids->diffopts.flags.recursive = 1;
68 diff_setup_done(&ids->diffopts);
69 hashmap_init(&ids->patches, patch_id_neq, &ids->diffopts, 256);
70 return 0;
73 int free_patch_ids(struct patch_ids *ids)
75 hashmap_clear_and_free(&ids->patches, struct patch_id, ent);
76 return 0;
79 static int init_patch_id_entry(struct patch_id *patch,
80 struct commit *commit,
81 struct patch_ids *ids)
83 struct object_id header_only_patch_id;
85 patch->commit = commit;
86 if (commit_patch_id(commit, &ids->diffopts, &header_only_patch_id, 1))
87 return -1;
89 hashmap_entry_init(&patch->ent, oidhash(&header_only_patch_id));
90 return 0;
93 struct patch_id *patch_id_iter_first(struct commit *commit,
94 struct patch_ids *ids)
96 struct patch_id patch;
98 if (!patch_id_defined(commit))
99 return NULL;
101 memset(&patch, 0, sizeof(patch));
102 if (init_patch_id_entry(&patch, commit, ids))
103 return NULL;
105 return hashmap_get_entry(&ids->patches, &patch, ent, NULL);
108 struct patch_id *patch_id_iter_next(struct patch_id *cur,
109 struct patch_ids *ids)
111 return hashmap_get_next_entry(&ids->patches, cur, ent);
114 int has_commit_patch_id(struct commit *commit,
115 struct patch_ids *ids)
117 return !!patch_id_iter_first(commit, ids);
120 struct patch_id *add_commit_patch_id(struct commit *commit,
121 struct patch_ids *ids)
123 struct patch_id *key;
125 if (!patch_id_defined(commit))
126 return NULL;
128 CALLOC_ARRAY(key, 1);
129 if (init_patch_id_entry(key, commit, ids)) {
130 free(key);
131 return NULL;
134 hashmap_add(&ids->patches, &key->ent);
135 return key;