mirror of
https://github.com/git/git.git
synced 2024-09-19 03:02:51 +02:00
e7da938570
Use of the `the_repository` variable is deprecated nowadays, and we slowly but steadily convert the codebase to not use it anymore. Instead, callers should be passing down the repository to work on via parameters. It is hard though to prove that a given code unit does not use this variable anymore. The most trivial case, merely demonstrating that there is no direct use of `the_repository`, is already a bit of a pain during code reviews as the reviewer needs to manually verify claims made by the patch author. The bigger problem though is that we have many interfaces that implicitly rely on `the_repository`. Introduce a new `USE_THE_REPOSITORY_VARIABLE` macro that allows code units to opt into usage of `the_repository`. The intent of this macro is to demonstrate that a certain code unit does not use this variable anymore, and to keep it from new dependencies on it in future changes, be it explicit or implicit For now, the macro only guards `the_repository` itself as well as `the_hash_algo`. There are many more known interfaces where we have an implicit dependency on `the_repository`, but those are not guarded at the current point in time. Over time though, we should start to add guards as required (or even better, just remove them). Define the macro as required in our code units. As expected, most of our code still relies on the global variable. Nearly all of our builtins rely on the variable as there is no way yet to pass `the_repository` to their entry point. For now, declare the macro in "biultin.h" to keep the required changes at least a little bit more contained. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
104 lines
2.5 KiB
C
104 lines
2.5 KiB
C
#define USE_THE_REPOSITORY_VARIABLE
|
|
|
|
#include "git-compat-util.h"
|
|
#include "notes-cache.h"
|
|
#include "object-store-ll.h"
|
|
#include "pretty.h"
|
|
#include "repository.h"
|
|
#include "commit.h"
|
|
#include "refs.h"
|
|
#include "strbuf.h"
|
|
|
|
static int notes_cache_match_validity(struct repository *r,
|
|
const char *ref,
|
|
const char *validity)
|
|
{
|
|
struct object_id oid;
|
|
struct commit *commit;
|
|
struct pretty_print_context pretty_ctx;
|
|
struct strbuf msg = STRBUF_INIT;
|
|
int ret;
|
|
|
|
if (refs_read_ref(get_main_ref_store(the_repository), ref, &oid) < 0)
|
|
return 0;
|
|
|
|
commit = lookup_commit_reference_gently(r, &oid, 1);
|
|
if (!commit)
|
|
return 0;
|
|
|
|
memset(&pretty_ctx, 0, sizeof(pretty_ctx));
|
|
repo_format_commit_message(r, commit, "%s", &msg,
|
|
&pretty_ctx);
|
|
strbuf_trim(&msg);
|
|
|
|
ret = !strcmp(msg.buf, validity);
|
|
strbuf_release(&msg);
|
|
|
|
return ret;
|
|
}
|
|
|
|
void notes_cache_init(struct repository *r, struct notes_cache *c,
|
|
const char *name, const char *validity)
|
|
{
|
|
struct strbuf ref = STRBUF_INIT;
|
|
int flags = NOTES_INIT_WRITABLE;
|
|
|
|
memset(c, 0, sizeof(*c));
|
|
c->validity = xstrdup(validity);
|
|
|
|
strbuf_addf(&ref, "refs/notes/%s", name);
|
|
if (!notes_cache_match_validity(r, ref.buf, validity))
|
|
flags |= NOTES_INIT_EMPTY;
|
|
init_notes(&c->tree, ref.buf, combine_notes_overwrite, flags);
|
|
strbuf_release(&ref);
|
|
}
|
|
|
|
int notes_cache_write(struct notes_cache *c)
|
|
{
|
|
struct object_id tree_oid, commit_oid;
|
|
|
|
if (!c || !c->tree.initialized || !c->tree.update_ref ||
|
|
!*c->tree.update_ref)
|
|
return -1;
|
|
if (!c->tree.dirty)
|
|
return 0;
|
|
|
|
if (write_notes_tree(&c->tree, &tree_oid))
|
|
return -1;
|
|
if (commit_tree(c->validity, strlen(c->validity), &tree_oid, NULL,
|
|
&commit_oid, NULL, NULL) < 0)
|
|
return -1;
|
|
if (refs_update_ref(get_main_ref_store(the_repository), "update notes cache", c->tree.update_ref, &commit_oid,
|
|
NULL, 0, UPDATE_REFS_QUIET_ON_ERR) < 0)
|
|
return -1;
|
|
|
|
return 0;
|
|
}
|
|
|
|
char *notes_cache_get(struct notes_cache *c, struct object_id *key_oid,
|
|
size_t *outsize)
|
|
{
|
|
const struct object_id *value_oid;
|
|
enum object_type type;
|
|
char *value;
|
|
unsigned long size;
|
|
|
|
value_oid = get_note(&c->tree, key_oid);
|
|
if (!value_oid)
|
|
return NULL;
|
|
value = repo_read_object_file(the_repository, value_oid, &type, &size);
|
|
|
|
*outsize = size;
|
|
return value;
|
|
}
|
|
|
|
int notes_cache_put(struct notes_cache *c, struct object_id *key_oid,
|
|
const char *data, size_t size)
|
|
{
|
|
struct object_id value_oid;
|
|
|
|
if (write_object_file(data, size, OBJ_BLOB, &value_oid) < 0)
|
|
return -1;
|
|
return add_note(&c->tree, key_oid, &value_oid, NULL);
|
|
}
|