2023-03-21 06:25:56 +00:00
|
|
|
#include "git-compat-util.h"
|
2010-04-02 00:07:40 +00:00
|
|
|
#include "notes-cache.h"
|
2023-05-16 06:34:06 +00:00
|
|
|
#include "object-store-ll.h"
|
2023-04-22 20:17:26 +00:00
|
|
|
#include "pretty.h"
|
2018-06-29 01:21:57 +00:00
|
|
|
#include "repository.h"
|
2010-04-02 00:07:40 +00:00
|
|
|
#include "commit.h"
|
|
|
|
#include "refs.h"
|
2023-05-16 06:34:06 +00:00
|
|
|
#include "strbuf.h"
|
2010-04-02 00:07:40 +00:00
|
|
|
|
2018-11-10 05:49:06 +00:00
|
|
|
static int notes_cache_match_validity(struct repository *r,
|
|
|
|
const char *ref,
|
|
|
|
const char *validity)
|
2010-04-02 00:07:40 +00:00
|
|
|
{
|
2017-05-06 22:09:58 +00:00
|
|
|
struct object_id oid;
|
2010-04-02 00:07:40 +00:00
|
|
|
struct commit *commit;
|
|
|
|
struct pretty_print_context pretty_ctx;
|
|
|
|
struct strbuf msg = STRBUF_INIT;
|
|
|
|
int ret;
|
|
|
|
|
2017-10-15 22:06:56 +00:00
|
|
|
if (read_ref(ref, &oid) < 0)
|
2010-04-02 00:07:40 +00:00
|
|
|
return 0;
|
|
|
|
|
2018-11-10 05:49:06 +00:00
|
|
|
commit = lookup_commit_reference_gently(r, &oid, 1);
|
2010-04-02 00:07:40 +00:00
|
|
|
if (!commit)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
memset(&pretty_ctx, 0, sizeof(pretty_ctx));
|
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
|
|
|
repo_format_commit_message(r, commit, "%s", &msg,
|
2023-03-28 13:58:51 +00:00
|
|
|
&pretty_ctx);
|
2010-04-02 00:07:40 +00:00
|
|
|
strbuf_trim(&msg);
|
|
|
|
|
|
|
|
ret = !strcmp(msg.buf, validity);
|
|
|
|
strbuf_release(&msg);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2018-11-10 05:49:06 +00:00
|
|
|
void notes_cache_init(struct repository *r, struct notes_cache *c,
|
|
|
|
const char *name, const char *validity)
|
2010-04-02 00:07:40 +00:00
|
|
|
{
|
|
|
|
struct strbuf ref = STRBUF_INIT;
|
2015-10-08 02:54:43 +00:00
|
|
|
int flags = NOTES_INIT_WRITABLE;
|
2010-04-02 00:07:40 +00:00
|
|
|
|
|
|
|
memset(c, 0, sizeof(*c));
|
|
|
|
c->validity = xstrdup(validity);
|
|
|
|
|
|
|
|
strbuf_addf(&ref, "refs/notes/%s", name);
|
2018-11-10 05:49:06 +00:00
|
|
|
if (!notes_cache_match_validity(r, ref.buf, validity))
|
2015-10-08 02:54:43 +00:00
|
|
|
flags |= NOTES_INIT_EMPTY;
|
2010-04-02 00:07:40 +00:00
|
|
|
init_notes(&c->tree, ref.buf, combine_notes_overwrite, flags);
|
|
|
|
strbuf_release(&ref);
|
|
|
|
}
|
|
|
|
|
|
|
|
int notes_cache_write(struct notes_cache *c)
|
|
|
|
{
|
2017-05-06 22:09:58 +00:00
|
|
|
struct object_id tree_oid, commit_oid;
|
2010-04-02 00:07:40 +00:00
|
|
|
|
2015-10-08 02:54:43 +00:00
|
|
|
if (!c || !c->tree.initialized || !c->tree.update_ref ||
|
|
|
|
!*c->tree.update_ref)
|
2010-04-02 00:07:40 +00:00
|
|
|
return -1;
|
|
|
|
if (!c->tree.dirty)
|
|
|
|
return 0;
|
|
|
|
|
2018-01-28 00:13:18 +00:00
|
|
|
if (write_notes_tree(&c->tree, &tree_oid))
|
2010-04-02 00:07:40 +00:00
|
|
|
return -1;
|
2018-01-28 00:13:16 +00:00
|
|
|
if (commit_tree(c->validity, strlen(c->validity), &tree_oid, NULL,
|
|
|
|
&commit_oid, NULL, NULL) < 0)
|
2010-04-02 00:07:40 +00:00
|
|
|
return -1;
|
2017-10-15 22:06:51 +00:00
|
|
|
if (update_ref("update notes cache", c->tree.update_ref, &commit_oid,
|
2015-10-08 02:54:43 +00:00
|
|
|
NULL, 0, UPDATE_REFS_QUIET_ON_ERR) < 0)
|
2010-04-02 00:07:40 +00:00
|
|
|
return -1;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2017-05-06 22:09:58 +00:00
|
|
|
char *notes_cache_get(struct notes_cache *c, struct object_id *key_oid,
|
2010-04-02 00:07:40 +00:00
|
|
|
size_t *outsize)
|
|
|
|
{
|
2017-05-30 17:30:40 +00:00
|
|
|
const struct object_id *value_oid;
|
2010-04-02 00:07:40 +00:00
|
|
|
enum object_type type;
|
|
|
|
char *value;
|
|
|
|
unsigned long size;
|
|
|
|
|
2017-05-30 17:30:43 +00:00
|
|
|
value_oid = get_note(&c->tree, key_oid);
|
2017-05-30 17:30:40 +00:00
|
|
|
if (!value_oid)
|
2010-04-02 00:07:40 +00:00
|
|
|
return NULL;
|
2023-03-28 13:58:50 +00:00
|
|
|
value = repo_read_object_file(the_repository, value_oid, &type, &size);
|
2010-04-02 00:07:40 +00:00
|
|
|
|
|
|
|
*outsize = size;
|
|
|
|
return value;
|
|
|
|
}
|
|
|
|
|
2017-05-06 22:09:58 +00:00
|
|
|
int notes_cache_put(struct notes_cache *c, struct object_id *key_oid,
|
2010-04-02 00:07:40 +00:00
|
|
|
const char *data, size_t size)
|
|
|
|
{
|
2017-05-06 22:09:58 +00:00
|
|
|
struct object_id value_oid;
|
2010-04-02 00:07:40 +00:00
|
|
|
|
2022-02-04 23:48:26 +00:00
|
|
|
if (write_object_file(data, size, OBJ_BLOB, &value_oid) < 0)
|
2010-04-02 00:07:40 +00:00
|
|
|
return -1;
|
2017-05-30 17:30:43 +00:00
|
|
|
return add_note(&c->tree, key_oid, &value_oid, NULL);
|
2010-04-02 00:07:40 +00:00
|
|
|
}
|