Now that the flags stored in struct diff_flags are being accessed directly and not through macros, change all struct members from being uppercase to lowercase. This conversion is done using the following semantic patch: @@ expression E; @@ - E.RECURSIVE + E.recursive @@ expression E; @@ - E.TREE_IN_RECURSIVE + E.tree_in_recursive @@ expression E; @@ - E.BINARY + E.binary @@ expression E; @@ - E.TEXT + E.text @@ expression E; @@ - E.FULL_INDEX + E.full_index @@ expression E; @@ - E.SILENT_ON_REMOVE + E.silent_on_remove @@ expression E; @@ - E.FIND_COPIES_HARDER + E.find_copies_harder @@ expression E; @@ - E.FOLLOW_RENAMES + E.follow_renames @@ expression E; @@ - E.RENAME_EMPTY + E.rename_empty @@ expression E; @@ - E.HAS_CHANGES + E.has_changes @@ expression E; @@ - E.QUICK + E.quick @@ expression E; @@ - E.NO_INDEX + E.no_index @@ expression E; @@ - E.ALLOW_EXTERNAL + E.allow_external @@ expression E; @@ - E.EXIT_WITH_STATUS + E.exit_with_status @@ expression E; @@ - E.REVERSE_DIFF + E.reverse_diff @@ expression E; @@ - E.CHECK_FAILED + E.check_failed @@ expression E; @@ - E.RELATIVE_NAME + E.relative_name @@ expression E; @@ - E.IGNORE_SUBMODULES + E.ignore_submodules @@ expression E; @@ - E.DIRSTAT_CUMULATIVE + E.dirstat_cumulative @@ expression E; @@ - E.DIRSTAT_BY_FILE + E.dirstat_by_file @@ expression E; @@ - E.ALLOW_TEXTCONV + E.allow_textconv @@ expression E; @@ - E.TEXTCONV_SET_VIA_CMDLINE + E.textconv_set_via_cmdline @@ expression E; @@ - E.DIFF_FROM_CONTENTS + E.diff_from_contents @@ expression E; @@ - E.DIRTY_SUBMODULES + E.dirty_submodules @@ expression E; @@ - E.IGNORE_UNTRACKED_IN_SUBMODULES + E.ignore_untracked_in_submodules @@ expression E; @@ - E.IGNORE_DIRTY_SUBMODULES + E.ignore_dirty_submodules @@ expression E; @@ - E.OVERRIDE_SUBMODULE_CONFIG + E.override_submodule_config @@ expression E; @@ - E.DIRSTAT_BY_LINE + E.dirstat_by_line @@ expression E; @@ - E.FUNCCONTEXT + E.funccontext @@ expression E; @@ - E.PICKAXE_IGNORE_CASE + E.pickaxe_ignore_case @@ expression E; @@ - E.DEFAULT_FOLLOW_RENAMES + E.default_follow_renames Signed-off-by: Brandon Williams <bmwill@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
		
			
				
	
	
		
			122 lines
		
	
	
		
			3.2 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			122 lines
		
	
	
		
			3.2 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 *cmpfn_data,
 | 
						|
			const void *entry,
 | 
						|
			const void *entry_or_key,
 | 
						|
			const void *unused_keydata)
 | 
						|
{
 | 
						|
	/* NEEDSWORK: const correctness? */
 | 
						|
	struct diff_options *opt = (void *)cmpfn_data;
 | 
						|
	struct patch_id *a = (void *)entry;
 | 
						|
	struct patch_id *b = (void *)entry_or_key;
 | 
						|
 | 
						|
	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;
 | 
						|
	ids->diffopts.flags.recursive = 1;
 | 
						|
	diff_setup_done(&ids->diffopts);
 | 
						|
	hashmap_init(&ids->patches, patch_id_cmp, &ids->diffopts, 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, NULL);
 | 
						|
}
 | 
						|
 | 
						|
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;
 | 
						|
}
 |