7663cdc86c
When using the hashmap a common need is to have access to caller provided data in the compare function. A couple of times we abuse the keydata field to pass in the data needed. This happens for example in patch-ids.c. This patch changes the function signature of the compare function to have one more void pointer available. The pointer given for each invocation of the compare function must be defined in the init function of the hashmap and is just passed through. Documentation of this new feature is deferred to a later patch. This is a rather mechanical conversion, just adding the new pass-through parameter. However while at it improve the naming of the fields of all compare functions used by hashmaps by ensuring unused parameters are prefixed with 'unused_' and naming the parameters what they are (instead of 'unused' make it 'unused_keydata'). Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
118 lines
3.1 KiB
C
118 lines
3.1 KiB
C
#include "cache.h"
|
|
#include "diff.h"
|
|
#include "commit.h"
|
|
#include "sha1-lookup.h"
|
|
#include "patch-ids.h"
|
|
|
|
static int patch_id_defined(struct commit *commit)
|
|
{
|
|
/* must be 0 or 1 parents */
|
|
return !commit->parents || !commit->parents->next;
|
|
}
|
|
|
|
int commit_patch_id(struct commit *commit, struct diff_options *options,
|
|
struct object_id *oid, int diff_header_only)
|
|
{
|
|
if (!patch_id_defined(commit))
|
|
return -1;
|
|
|
|
if (commit->parents)
|
|
diff_tree_oid(&commit->parents->item->object.oid,
|
|
&commit->object.oid, "", options);
|
|
else
|
|
diff_root_tree_oid(&commit->object.oid, "", options);
|
|
diffcore_std(options);
|
|
return diff_flush_patch_id(options, oid, diff_header_only);
|
|
}
|
|
|
|
/*
|
|
* When we cannot load the full patch-id for both commits for whatever
|
|
* reason, the function returns -1 (i.e. return error(...)). Despite
|
|
* the "cmp" in the name of this function, the caller only cares about
|
|
* the return value being zero (a and b are equivalent) or non-zero (a
|
|
* and b are different), and returning non-zero would keep both in the
|
|
* result, even if they actually were equivalent, in order to err on
|
|
* the side of safety. The actual value being negative does not have
|
|
* any significance; only that it is non-zero matters.
|
|
*/
|
|
static int patch_id_cmp(const void *unused_cmp_data,
|
|
struct patch_id *a,
|
|
struct patch_id *b,
|
|
struct diff_options *opt)
|
|
{
|
|
if (is_null_oid(&a->patch_id) &&
|
|
commit_patch_id(a->commit, opt, &a->patch_id, 0))
|
|
return error("Could not get patch ID for %s",
|
|
oid_to_hex(&a->commit->object.oid));
|
|
if (is_null_oid(&b->patch_id) &&
|
|
commit_patch_id(b->commit, opt, &b->patch_id, 0))
|
|
return error("Could not get patch ID for %s",
|
|
oid_to_hex(&b->commit->object.oid));
|
|
return oidcmp(&a->patch_id, &b->patch_id);
|
|
}
|
|
|
|
int init_patch_ids(struct patch_ids *ids)
|
|
{
|
|
memset(ids, 0, sizeof(*ids));
|
|
diff_setup(&ids->diffopts);
|
|
ids->diffopts.detect_rename = 0;
|
|
DIFF_OPT_SET(&ids->diffopts, RECURSIVE);
|
|
diff_setup_done(&ids->diffopts);
|
|
hashmap_init(&ids->patches, (hashmap_cmp_fn)patch_id_cmp,
|
|
NULL, 256);
|
|
return 0;
|
|
}
|
|
|
|
int free_patch_ids(struct patch_ids *ids)
|
|
{
|
|
hashmap_free(&ids->patches, 1);
|
|
return 0;
|
|
}
|
|
|
|
static int init_patch_id_entry(struct patch_id *patch,
|
|
struct commit *commit,
|
|
struct patch_ids *ids)
|
|
{
|
|
struct object_id header_only_patch_id;
|
|
|
|
patch->commit = commit;
|
|
if (commit_patch_id(commit, &ids->diffopts, &header_only_patch_id, 1))
|
|
return -1;
|
|
|
|
hashmap_entry_init(patch, sha1hash(header_only_patch_id.hash));
|
|
return 0;
|
|
}
|
|
|
|
struct patch_id *has_commit_patch_id(struct commit *commit,
|
|
struct patch_ids *ids)
|
|
{
|
|
struct patch_id patch;
|
|
|
|
if (!patch_id_defined(commit))
|
|
return NULL;
|
|
|
|
memset(&patch, 0, sizeof(patch));
|
|
if (init_patch_id_entry(&patch, commit, ids))
|
|
return NULL;
|
|
|
|
return hashmap_get(&ids->patches, &patch, &ids->diffopts);
|
|
}
|
|
|
|
struct patch_id *add_commit_patch_id(struct commit *commit,
|
|
struct patch_ids *ids)
|
|
{
|
|
struct patch_id *key;
|
|
|
|
if (!patch_id_defined(commit))
|
|
return NULL;
|
|
|
|
key = xcalloc(1, sizeof(*key));
|
|
if (init_patch_id_entry(key, commit, ids)) {
|
|
free(key);
|
|
return NULL;
|
|
}
|
|
|
|
hashmap_add(&ids->patches, key);
|
|
return key;
|
|
}
|