2023-03-21 06:26:04 +00:00
|
|
|
#include "git-compat-util.h"
|
2017-06-14 18:07:36 +00:00
|
|
|
#include "config.h"
|
2013-06-12 00:13:00 +00:00
|
|
|
#include "commit.h"
|
2023-03-21 06:26:03 +00:00
|
|
|
#include "environment.h"
|
2023-03-21 06:25:54 +00:00
|
|
|
#include "gettext.h"
|
2013-06-12 00:13:00 +00:00
|
|
|
#include "refs.h"
|
|
|
|
#include "notes-utils.h"
|
2023-04-22 20:17:26 +00:00
|
|
|
#include "strbuf.h"
|
2013-06-12 00:13:01 +00:00
|
|
|
|
2019-01-12 02:13:23 +00:00
|
|
|
void create_notes_commit(struct repository *r,
|
|
|
|
struct notes_tree *t,
|
|
|
|
struct commit_list *parents,
|
2014-06-10 21:36:52 +00:00
|
|
|
const char *msg, size_t msg_len,
|
2018-01-28 00:13:16 +00:00
|
|
|
struct object_id *result_oid)
|
2013-06-12 00:13:01 +00:00
|
|
|
{
|
2017-05-06 22:10:04 +00:00
|
|
|
struct object_id tree_oid;
|
2013-06-12 00:13:01 +00:00
|
|
|
|
|
|
|
assert(t->initialized);
|
|
|
|
|
2018-01-28 00:13:18 +00:00
|
|
|
if (write_notes_tree(t, &tree_oid))
|
2013-06-12 00:13:01 +00:00
|
|
|
die("Failed to write notes tree to database");
|
|
|
|
|
|
|
|
if (!parents) {
|
|
|
|
/* Deduce parent commit from t->ref */
|
2017-05-06 22:10:04 +00:00
|
|
|
struct object_id parent_oid;
|
2017-10-15 22:06:56 +00:00
|
|
|
if (!read_ref(t->ref, &parent_oid)) {
|
2019-01-12 02:13:23 +00:00
|
|
|
struct commit *parent = lookup_commit(r, &parent_oid);
|
libs: use "struct repository *" argument, not "the_repository"
As can easily be seen from grepping in our sources, we had these uses
of "the_repository" in various library code in cases where the
function in question was already getting a "struct repository *"
argument. Let's use that argument instead.
Out of these changes only the changes to "cache-tree.c",
"commit-reach.c", "shallow.c" and "upload-pack.c" would have cleanly
applied before the migration away from the "repo_*()" wrapper macros
in the preceding commits.
The rest aren't new, as we'd previously implicitly refer to
"the_repository", but it's now more obvious that we were doing the
wrong thing all along, and should have used the parameter instead.
The change to change "get_index_format_default(the_repository)" in
"read-cache.c" to use the "r" variable instead should arguably have
been part of [1], or in the subsequent cleanup in [2]. Let's do it
here, as can be seen from the initial code in [3] it's not important
that we use "the_repository" there, but would prefer to always use the
current repository.
This change excludes the "the_repository" use in "upload-pack.c"'s
upload_pack_advertise(), as the in-flight [4] makes that change.
1. ee1f0c242ef (read-cache: add index.skipHash config option,
2023-01-06)
2. 6269f8eaad0 (treewide: always have a valid "index_state.repo"
member, 2023-01-17)
3. 7211b9e7534 (repo-settings: consolidate some config settings,
2019-08-13)
4. <Y/hbUsGPVNAxTdmS@coredump.intra.peff.net>
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2023-03-28 13:58:58 +00:00
|
|
|
if (repo_parse_commit(r, parent))
|
2013-06-12 00:13:01 +00:00
|
|
|
die("Failed to find/parse commit %s", t->ref);
|
|
|
|
commit_list_insert(parent, &parents);
|
|
|
|
}
|
|
|
|
/* else: t->ref points to nothing, assume root/orphan commit */
|
|
|
|
}
|
|
|
|
|
2018-01-28 00:13:16 +00:00
|
|
|
if (commit_tree(msg, msg_len, &tree_oid, parents, result_oid, NULL,
|
|
|
|
NULL))
|
2013-06-12 00:13:01 +00:00
|
|
|
die("Failed to commit notes tree to database");
|
|
|
|
}
|
2013-06-12 00:13:00 +00:00
|
|
|
|
2019-01-12 02:13:23 +00:00
|
|
|
void commit_notes(struct repository *r, struct notes_tree *t, const char *msg)
|
2013-06-12 00:13:00 +00:00
|
|
|
{
|
|
|
|
struct strbuf buf = STRBUF_INIT;
|
2017-05-06 22:10:04 +00:00
|
|
|
struct object_id commit_oid;
|
2013-06-12 00:13:00 +00:00
|
|
|
|
|
|
|
if (!t)
|
|
|
|
t = &default_notes_tree;
|
2015-10-08 02:54:43 +00:00
|
|
|
if (!t->initialized || !t->update_ref || !*t->update_ref)
|
2013-06-12 00:13:00 +00:00
|
|
|
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);
|
2014-12-12 19:16:38 +00:00
|
|
|
strbuf_complete_line(&buf);
|
2013-06-12 00:13:00 +00:00
|
|
|
|
2019-01-12 02:13:23 +00:00
|
|
|
create_notes_commit(r, t, NULL, buf.buf, buf.len, &commit_oid);
|
2020-02-09 13:44:23 +00:00
|
|
|
strbuf_insertstr(&buf, 0, "notes: ");
|
2017-10-15 22:06:51 +00:00
|
|
|
update_ref(buf.buf, t->update_ref, &commit_oid, NULL, 0,
|
2014-04-07 13:47:56 +00:00
|
|
|
UPDATE_REFS_DIE_ON_ERR);
|
2013-06-12 00:13:00 +00:00
|
|
|
|
|
|
|
strbuf_release(&buf);
|
|
|
|
}
|
|
|
|
|
2015-08-17 21:33:31 +00:00
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
2013-06-12 00:13:00 +00:00
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
config: add ctx arg to config_fn_t
Add a new "const struct config_context *ctx" arg to config_fn_t to hold
additional information about the config iteration operation.
config_context has a "struct key_value_info kvi" member that holds
metadata about the config source being read (e.g. what kind of config
source it is, the filename, etc). In this series, we're only interested
in .kvi, so we could have just used "struct key_value_info" as an arg,
but config_context makes it possible to add/adjust members in the future
without changing the config_fn_t signature. We could also consider other
ways of organizing the args (e.g. moving the config name and value into
config_context or key_value_info), but in my experiments, the
incremental benefit doesn't justify the added complexity (e.g. a
config_fn_t will sometimes invoke another config_fn_t but with a
different config value).
In subsequent commits, the .kvi member will replace the global "struct
config_reader" in config.c, making config iteration a global-free
operation. It requires much more work for the machinery to provide
meaningful values of .kvi, so for now, merely change the signature and
call sites, pass NULL as a placeholder value, and don't rely on the arg
in any meaningful way.
Most of the changes are performed by
contrib/coccinelle/config_fn_ctx.pending.cocci, which, for every
config_fn_t:
- Modifies the signature to accept "const struct config_context *ctx"
- Passes "ctx" to any inner config_fn_t, if needed
- Adds UNUSED attributes to "ctx", if needed
Most config_fn_t instances are easily identified by seeing if they are
called by the various config functions. Most of the remaining ones are
manually named in the .cocci patch. Manual cleanups are still needed,
but the majority of it is trivial; it's either adjusting config_fn_t
that the .cocci patch didn't catch, or adding forward declarations of
"struct config_context ctx" to make the signatures make sense.
The non-trivial changes are in cases where we are invoking a config_fn_t
outside of config machinery, and we now need to decide what value of
"ctx" to pass. These cases are:
- trace2/tr2_cfg.c:tr2_cfg_set_fl()
This is indirectly called by git_config_set() so that the trace2
machinery can notice the new config values and update its settings
using the tr2 config parsing function, i.e. tr2_cfg_cb().
- builtin/checkout.c:checkout_main()
This calls git_xmerge_config() as a shorthand for parsing a CLI arg.
This might be worth refactoring away in the future, since
git_xmerge_config() can call git_default_config(), which can do much
more than just parsing.
Handle them by creating a KVI_INIT macro that initializes "struct
key_value_info" to a reasonable default, and use that to construct the
"ctx" arg.
Signed-off-by: Glen Choo <chooglen@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2023-06-28 19:26:22 +00:00
|
|
|
static int notes_rewrite_config(const char *k, const char *v,
|
|
|
|
const struct config_context *ctx UNUSED,
|
|
|
|
void *cb)
|
2013-06-12 00:13:00 +00:00
|
|
|
{
|
|
|
|
struct notes_rewrite_cfg *c = cb;
|
2013-11-30 20:55:40 +00:00
|
|
|
if (starts_with(k, "notes.rewrite.") && !strcmp(k+14, c->cmd)) {
|
2013-06-12 00:13:00 +00:00
|
|
|
c->enabled = git_config_bool(k, v);
|
|
|
|
return 0;
|
|
|
|
} else if (!c->mode_from_env && !strcmp(k, "notes.rewritemode")) {
|
|
|
|
if (!v)
|
2014-02-16 16:06:02 +00:00
|
|
|
return config_error_nonbool(k);
|
2013-06-12 00:13:00 +00:00
|
|
|
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")) {
|
2023-12-07 07:11:14 +00:00
|
|
|
if (!v)
|
|
|
|
return config_error_nonbool(k);
|
2013-06-12 00:13:00 +00:00
|
|
|
/* note that a refs/ prefix is implied in the
|
|
|
|
* underlying for_each_glob_ref */
|
2013-11-30 20:55:40 +00:00
|
|
|
if (starts_with(v, "refs/notes/"))
|
2013-06-12 00:13:00 +00:00
|
|
|
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;
|
2021-03-13 16:17:22 +00:00
|
|
|
CALLOC_ARRAY(c->refs, 1);
|
2013-06-12 00:13:00 +00:00
|
|
|
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)
|
C style: use standard style for "TRANSLATORS" comments
Change all the "TRANSLATORS: [...]" comments in the C code to use the
regular Git coding style, and amend the style guide so that the
example there uses that style.
This custom style was necessary back in 2010 when the gettext support
was initially added, and was subsequently documented in commit
cbcfd4e3ea ("i18n: mention "TRANSLATORS:" marker in
Documentation/CodingGuidelines", 2014-04-18).
GNU xgettext hasn't had the parsing limitation that necessitated this
exception for almost 3 years. Since its 0.19 release on 2014-06-02
it's been able to recognize TRANSLATOR comments in the standard Git
comment syntax[1].
Usually we'd like to keep compatibility with software that's that
young, but in this case literally the only person who needs to be
using a gettext newer than 3 years old is Jiang Xin (the only person
who runs & commits "make pot" results), so I think in this case we can
make an exception.
This xgettext parsing feature was added after a thread on the Git
mailing list[2] which continued on the bug-gettext[3] list, but we
never subsequently changed our style & styleguide, do so.
There are already longstanding changes in git that use the standard
comment style & have their TRANSLATORS comments extracted properly
without getting the literal "*"'s mixed up in the text, as would
happen before xgettext 0.19.
Commit 7ff2683253 ("builtin-am: implement -i/--interactive",
2015-08-04) added one such comment, which in commit df0617bfa7 ("l10n:
git.pot: v2.6.0 round 1 (123 new, 41 removed)", 2015-09-05) got picked
up in the po/git.pot file with the right format, showing that Jiang
already runs a modern xgettext.
The xgettext parser does not handle the sort of non-standard comment
style that I'm amending here in sequencer.c, but that isn't standard
Git comment syntax anyway. With this change to sequencer.c & "make
pot" the comment in the pot file is now correct:
#. TRANSLATORS: %s will be "revert", "cherry-pick" or
-#. * "rebase -i".
+#. "rebase -i".
1. http://git.savannah.gnu.org/cgit/gettext.git/commit/?id=10af7fe6bd
2. <2ce9ec406501d112e032c8208417f8100bed04c6.1397712142.git.worldhello.net@gmail.com>
(https://public-inbox.org/git/2ce9ec406501d112e032c8208417f8100bed04c6.1397712142.git.worldhello.net@gmail.com/)
3. https://lists.gnu.org/archive/html/bug-gettext/2014-04/msg00016.html
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Acked-by: Jiang Xin <worldhello.net@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2017-05-11 21:20:12 +00:00
|
|
|
/*
|
|
|
|
* TRANSLATORS: The first %s is the name of
|
|
|
|
* the environment variable, the second %s is
|
|
|
|
* its value.
|
|
|
|
*/
|
2013-06-12 00:13:00 +00:00
|
|
|
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;
|
|
|
|
}
|
2015-10-08 02:54:43 +00:00
|
|
|
c->trees = load_notes_trees(c->refs, NOTES_INIT_WRITABLE);
|
2013-06-12 00:13:00 +00:00
|
|
|
string_list_clear(c->refs, 0);
|
|
|
|
free(c->refs);
|
|
|
|
return c;
|
|
|
|
}
|
|
|
|
|
|
|
|
int copy_note_for_rewrite(struct notes_rewrite_cfg *c,
|
2017-05-30 17:30:42 +00:00
|
|
|
const struct object_id *from_obj, const struct object_id *to_obj)
|
2013-06-12 00:13:00 +00:00
|
|
|
{
|
|
|
|
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;
|
|
|
|
}
|
|
|
|
|
2019-01-12 02:13:23 +00:00
|
|
|
void finish_copy_notes_for_rewrite(struct repository *r,
|
|
|
|
struct notes_rewrite_cfg *c,
|
|
|
|
const char *msg)
|
2013-06-12 00:13:00 +00:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
for (i = 0; c->trees[i]; i++) {
|
2019-01-12 02:13:23 +00:00
|
|
|
commit_notes(r, c->trees[i], msg);
|
2013-06-12 00:13:00 +00:00
|
|
|
free_notes(c->trees[i]);
|
|
|
|
}
|
|
|
|
free(c->trees);
|
|
|
|
free(c);
|
|
|
|
}
|