notes-utils.c 5.02 KB
Newer Older
1
#include "cache.h"
2
#include "config.h"
3 4 5
#include "commit.h"
#include "refs.h"
#include "notes-utils.h"
6
#include "repository.h"
7

8 9 10
void create_notes_commit(struct repository *r,
			 struct notes_tree *t,
			 struct commit_list *parents,
11
			 const char *msg, size_t msg_len,
12
			 struct object_id *result_oid)
13
{
14
	struct object_id tree_oid;
15 16 17

	assert(t->initialized);

18
	if (write_notes_tree(t, &tree_oid))
19 20 21 22
		die("Failed to write notes tree to database");

	if (!parents) {
		/* Deduce parent commit from t->ref */
23
		struct object_id parent_oid;
24
		if (!read_ref(t->ref, &parent_oid)) {
25
			struct commit *parent = lookup_commit(r, &parent_oid);
26
			if (parse_commit(parent))
27 28 29 30 31 32
				die("Failed to find/parse commit %s", t->ref);
			commit_list_insert(parent, &parents);
		}
		/* else: t->ref points to nothing, assume root/orphan commit */
	}

33 34
	if (commit_tree(msg, msg_len, &tree_oid, parents, result_oid, NULL,
			NULL))
35 36
		die("Failed to commit notes tree to database");
}
37

38
void commit_notes(struct repository *r, struct notes_tree *t, const char *msg)
39 40
{
	struct strbuf buf = STRBUF_INIT;
41
	struct object_id commit_oid;
42 43 44

	if (!t)
		t = &default_notes_tree;
45
	if (!t->initialized || !t->update_ref || !*t->update_ref)
46 47 48 49 50 51
		die(_("Cannot commit uninitialized/unreferenced notes tree"));
	if (!t->dirty)
		return; /* don't have to commit an unchanged tree */

	/* Prepare commit message and reflog message */
	strbuf_addstr(&buf, msg);
52
	strbuf_complete_line(&buf);
53

54
	create_notes_commit(r, t, NULL, buf.buf, buf.len, &commit_oid);
55
	strbuf_insert(&buf, 0, "notes: ", 7); /* commit message starts at index 7 */
56
	update_ref(buf.buf, t->update_ref, &commit_oid, NULL, 0,
57
		   UPDATE_REFS_DIE_ON_ERR);
58 59 60 61

	strbuf_release(&buf);
}

62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79
int parse_notes_merge_strategy(const char *v, enum notes_merge_strategy *s)
{
	if (!strcmp(v, "manual"))
		*s = NOTES_MERGE_RESOLVE_MANUAL;
	else if (!strcmp(v, "ours"))
		*s = NOTES_MERGE_RESOLVE_OURS;
	else if (!strcmp(v, "theirs"))
		*s = NOTES_MERGE_RESOLVE_THEIRS;
	else if (!strcmp(v, "union"))
		*s = NOTES_MERGE_RESOLVE_UNION;
	else if (!strcmp(v, "cat_sort_uniq"))
		*s = NOTES_MERGE_RESOLVE_CAT_SORT_UNIQ;
	else
		return -1;

	return 0;
}

80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96
static combine_notes_fn parse_combine_notes_fn(const char *v)
{
	if (!strcasecmp(v, "overwrite"))
		return combine_notes_overwrite;
	else if (!strcasecmp(v, "ignore"))
		return combine_notes_ignore;
	else if (!strcasecmp(v, "concatenate"))
		return combine_notes_concatenate;
	else if (!strcasecmp(v, "cat_sort_uniq"))
		return combine_notes_cat_sort_uniq;
	else
		return NULL;
}

static int notes_rewrite_config(const char *k, const char *v, void *cb)
{
	struct notes_rewrite_cfg *c = cb;
97
	if (starts_with(k, "notes.rewrite.") && !strcmp(k+14, c->cmd)) {
98 99 100 101
		c->enabled = git_config_bool(k, v);
		return 0;
	} else if (!c->mode_from_env && !strcmp(k, "notes.rewritemode")) {
		if (!v)
102
			return config_error_nonbool(k);
103 104 105 106 107 108 109 110 111
		c->combine = parse_combine_notes_fn(v);
		if (!c->combine) {
			error(_("Bad notes.rewriteMode value: '%s'"), v);
			return 1;
		}
		return 0;
	} else if (!c->refs_from_env && !strcmp(k, "notes.rewriteref")) {
		/* note that a refs/ prefix is implied in the
		 * underlying for_each_glob_ref */
112
		if (starts_with(v, "refs/notes/"))
113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139
			string_list_add_refs_by_glob(c->refs, v);
		else
			warning(_("Refusing to rewrite notes in %s"
				" (outside of refs/notes/)"), v);
		return 0;
	}

	return 0;
}


struct notes_rewrite_cfg *init_copy_notes_for_rewrite(const char *cmd)
{
	struct notes_rewrite_cfg *c = xmalloc(sizeof(struct notes_rewrite_cfg));
	const char *rewrite_mode_env = getenv(GIT_NOTES_REWRITE_MODE_ENVIRONMENT);
	const char *rewrite_refs_env = getenv(GIT_NOTES_REWRITE_REF_ENVIRONMENT);
	c->cmd = cmd;
	c->enabled = 1;
	c->combine = combine_notes_concatenate;
	c->refs = xcalloc(1, sizeof(struct string_list));
	c->refs->strdup_strings = 1;
	c->refs_from_env = 0;
	c->mode_from_env = 0;
	if (rewrite_mode_env) {
		c->mode_from_env = 1;
		c->combine = parse_combine_notes_fn(rewrite_mode_env);
		if (!c->combine)
140 141 142 143 144
			/*
			 * TRANSLATORS: The first %s is the name of
			 * the environment variable, the second %s is
			 * its value.
			 */
145 146 147 148 149 150 151 152 153 154 155 156 157 158
			error(_("Bad %s value: '%s'"), GIT_NOTES_REWRITE_MODE_ENVIRONMENT,
					rewrite_mode_env);
	}
	if (rewrite_refs_env) {
		c->refs_from_env = 1;
		string_list_add_refs_from_colon_sep(c->refs, rewrite_refs_env);
	}
	git_config(notes_rewrite_config, c);
	if (!c->enabled || !c->refs->nr) {
		string_list_clear(c->refs, 0);
		free(c->refs);
		free(c);
		return NULL;
	}
159
	c->trees = load_notes_trees(c->refs, NOTES_INIT_WRITABLE);
160 161 162 163 164 165
	string_list_clear(c->refs, 0);
	free(c->refs);
	return c;
}

int copy_note_for_rewrite(struct notes_rewrite_cfg *c,
166
			  const struct object_id *from_obj, const struct object_id *to_obj)
167 168 169 170 171 172 173 174
{
	int ret = 0;
	int i;
	for (i = 0; c->trees[i]; i++)
		ret = copy_note(c->trees[i], from_obj, to_obj, 1, c->combine) || ret;
	return ret;
}

175 176 177
void finish_copy_notes_for_rewrite(struct repository *r,
				   struct notes_rewrite_cfg *c,
				   const char *msg)
178 179 180
{
	int i;
	for (i = 0; c->trees[i]; i++) {
181
		commit_notes(r, c->trees[i], msg);
182 183 184 185 186
		free_notes(c->trees[i]);
	}
	free(c->trees);
	free(c);
}