1 #define USE_THE_REPOSITORY_VARIABLE
3 #include "git-compat-util.h"
6 #include "environment.h"
9 #include "notes-utils.h"
12 void create_notes_commit(struct repository
*r
,
14 const struct commit_list
*parents
,
15 const char *msg
, size_t msg_len
,
16 struct object_id
*result_oid
)
18 struct commit_list
*parents_to_free
= NULL
;
19 struct object_id tree_oid
;
21 assert(t
->initialized
);
23 if (write_notes_tree(t
, &tree_oid
))
24 die("Failed to write notes tree to database");
27 /* Deduce parent commit from t->ref */
28 struct object_id parent_oid
;
29 if (!refs_read_ref(get_main_ref_store(the_repository
), t
->ref
, &parent_oid
)) {
30 struct commit
*parent
= lookup_commit(r
, &parent_oid
);
31 if (repo_parse_commit(r
, parent
))
32 die("Failed to find/parse commit %s", t
->ref
);
33 commit_list_insert(parent
, &parents_to_free
);
34 parents
= parents_to_free
;
36 /* else: t->ref points to nothing, assume root/orphan commit */
39 if (commit_tree(msg
, msg_len
, &tree_oid
, parents
, result_oid
, NULL
,
41 die("Failed to commit notes tree to database");
43 free_commit_list(parents_to_free
);
46 void commit_notes(struct repository
*r
, struct notes_tree
*t
, const char *msg
)
48 struct strbuf buf
= STRBUF_INIT
;
49 struct object_id commit_oid
;
52 t
= &default_notes_tree
;
53 if (!t
->initialized
|| !t
->update_ref
|| !*t
->update_ref
)
54 die(_("Cannot commit uninitialized/unreferenced notes tree"));
56 return; /* don't have to commit an unchanged tree */
58 /* Prepare commit message and reflog message */
59 strbuf_addstr(&buf
, msg
);
60 strbuf_complete_line(&buf
);
62 create_notes_commit(r
, t
, NULL
, buf
.buf
, buf
.len
, &commit_oid
);
63 strbuf_insertstr(&buf
, 0, "notes: ");
64 refs_update_ref(get_main_ref_store(the_repository
), buf
.buf
,
65 t
->update_ref
, &commit_oid
, NULL
, 0,
66 UPDATE_REFS_DIE_ON_ERR
);
71 int parse_notes_merge_strategy(const char *v
, enum notes_merge_strategy
*s
)
73 if (!strcmp(v
, "manual"))
74 *s
= NOTES_MERGE_RESOLVE_MANUAL
;
75 else if (!strcmp(v
, "ours"))
76 *s
= NOTES_MERGE_RESOLVE_OURS
;
77 else if (!strcmp(v
, "theirs"))
78 *s
= NOTES_MERGE_RESOLVE_THEIRS
;
79 else if (!strcmp(v
, "union"))
80 *s
= NOTES_MERGE_RESOLVE_UNION
;
81 else if (!strcmp(v
, "cat_sort_uniq"))
82 *s
= NOTES_MERGE_RESOLVE_CAT_SORT_UNIQ
;
89 static combine_notes_fn
parse_combine_notes_fn(const char *v
)
91 if (!strcasecmp(v
, "overwrite"))
92 return combine_notes_overwrite
;
93 else if (!strcasecmp(v
, "ignore"))
94 return combine_notes_ignore
;
95 else if (!strcasecmp(v
, "concatenate"))
96 return combine_notes_concatenate
;
97 else if (!strcasecmp(v
, "cat_sort_uniq"))
98 return combine_notes_cat_sort_uniq
;
103 static int notes_rewrite_config(const char *k
, const char *v
,
104 const struct config_context
*ctx UNUSED
,
107 struct notes_rewrite_cfg
*c
= cb
;
108 if (starts_with(k
, "notes.rewrite.") && !strcmp(k
+14, c
->cmd
)) {
109 c
->enabled
= git_config_bool(k
, v
);
111 } else if (!c
->mode_from_env
&& !strcmp(k
, "notes.rewritemode")) {
113 return config_error_nonbool(k
);
114 c
->combine
= parse_combine_notes_fn(v
);
116 error(_("Bad notes.rewriteMode value: '%s'"), v
);
120 } else if (!c
->refs_from_env
&& !strcmp(k
, "notes.rewriteref")) {
122 return config_error_nonbool(k
);
123 /* note that a refs/ prefix is implied in the
124 * underlying for_each_glob_ref */
125 if (starts_with(v
, "refs/notes/"))
126 string_list_add_refs_by_glob(c
->refs
, v
);
128 warning(_("Refusing to rewrite notes in %s"
129 " (outside of refs/notes/)"), v
);
137 struct notes_rewrite_cfg
*init_copy_notes_for_rewrite(const char *cmd
)
139 struct notes_rewrite_cfg
*c
= xmalloc(sizeof(struct notes_rewrite_cfg
));
140 const char *rewrite_mode_env
= getenv(GIT_NOTES_REWRITE_MODE_ENVIRONMENT
);
141 const char *rewrite_refs_env
= getenv(GIT_NOTES_REWRITE_REF_ENVIRONMENT
);
144 c
->combine
= combine_notes_concatenate
;
145 CALLOC_ARRAY(c
->refs
, 1);
146 c
->refs
->strdup_strings
= 1;
147 c
->refs_from_env
= 0;
148 c
->mode_from_env
= 0;
149 if (rewrite_mode_env
) {
150 c
->mode_from_env
= 1;
151 c
->combine
= parse_combine_notes_fn(rewrite_mode_env
);
154 * TRANSLATORS: The first %s is the name of
155 * the environment variable, the second %s is
158 error(_("Bad %s value: '%s'"), GIT_NOTES_REWRITE_MODE_ENVIRONMENT
,
161 if (rewrite_refs_env
) {
162 c
->refs_from_env
= 1;
163 string_list_add_refs_from_colon_sep(c
->refs
, rewrite_refs_env
);
165 git_config(notes_rewrite_config
, c
);
166 if (!c
->enabled
|| !c
->refs
->nr
) {
167 string_list_clear(c
->refs
, 0);
172 c
->trees
= load_notes_trees(c
->refs
, NOTES_INIT_WRITABLE
);
173 string_list_clear(c
->refs
, 0);
178 int copy_note_for_rewrite(struct notes_rewrite_cfg
*c
,
179 const struct object_id
*from_obj
, const struct object_id
*to_obj
)
183 for (i
= 0; c
->trees
[i
]; i
++)
184 ret
= copy_note(c
->trees
[i
], from_obj
, to_obj
, 1, c
->combine
) || ret
;
188 void finish_copy_notes_for_rewrite(struct repository
*r
,
189 struct notes_rewrite_cfg
*c
,
193 for (i
= 0; c
->trees
[i
]; i
++) {
194 commit_notes(r
, c
->trees
[i
], msg
);
195 free_notes(c
->trees
[i
]);