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>
126 lines
2.9 KiB
C
126 lines
2.9 KiB
C
#define USE_THE_REPOSITORY_VARIABLE
|
|
|
|
#include "test-tool.h"
|
|
#include "hex.h"
|
|
#include "object-name.h"
|
|
#include "oidmap.h"
|
|
#include "repository.h"
|
|
#include "setup.h"
|
|
#include "strbuf.h"
|
|
#include "string-list.h"
|
|
|
|
/* key is an oid and value is a name (could be a refname for example) */
|
|
struct test_entry {
|
|
struct oidmap_entry entry;
|
|
char name[FLEX_ARRAY];
|
|
};
|
|
|
|
#define DELIM " \t\r\n"
|
|
|
|
/*
|
|
* Read stdin line by line and print result of commands to stdout:
|
|
*
|
|
* hash oidkey -> sha1hash(oidkey)
|
|
* put oidkey namevalue -> NULL / old namevalue
|
|
* get oidkey -> NULL / namevalue
|
|
* remove oidkey -> NULL / old namevalue
|
|
* iterate -> oidkey1 namevalue1\noidkey2 namevalue2\n...
|
|
*
|
|
*/
|
|
int cmd__oidmap(int argc UNUSED, const char **argv UNUSED)
|
|
{
|
|
struct string_list parts = STRING_LIST_INIT_NODUP;
|
|
struct strbuf line = STRBUF_INIT;
|
|
struct oidmap map = OIDMAP_INIT;
|
|
|
|
setup_git_directory();
|
|
|
|
/* init oidmap */
|
|
oidmap_init(&map, 0);
|
|
|
|
/* process commands from stdin */
|
|
while (strbuf_getline(&line, stdin) != EOF) {
|
|
char *cmd, *p1, *p2;
|
|
struct test_entry *entry;
|
|
struct object_id oid;
|
|
|
|
/* break line into command and up to two parameters */
|
|
string_list_setlen(&parts, 0);
|
|
string_list_split_in_place(&parts, line.buf, DELIM, 2);
|
|
string_list_remove_empty_items(&parts, 0);
|
|
|
|
/* ignore empty lines */
|
|
if (!parts.nr)
|
|
continue;
|
|
if (!*parts.items[0].string || *parts.items[0].string == '#')
|
|
continue;
|
|
|
|
cmd = parts.items[0].string;
|
|
p1 = parts.nr >= 1 ? parts.items[1].string : NULL;
|
|
p2 = parts.nr >= 2 ? parts.items[2].string : NULL;
|
|
|
|
if (!strcmp("put", cmd) && p1 && p2) {
|
|
|
|
if (repo_get_oid(the_repository, p1, &oid)) {
|
|
printf("Unknown oid: %s\n", p1);
|
|
continue;
|
|
}
|
|
|
|
/* create entry with oid_key = p1, name_value = p2 */
|
|
FLEX_ALLOC_STR(entry, name, p2);
|
|
oidcpy(&entry->entry.oid, &oid);
|
|
|
|
/* add / replace entry */
|
|
entry = oidmap_put(&map, entry);
|
|
|
|
/* print and free replaced entry, if any */
|
|
puts(entry ? entry->name : "NULL");
|
|
free(entry);
|
|
|
|
} else if (!strcmp("get", cmd) && p1) {
|
|
|
|
if (repo_get_oid(the_repository, p1, &oid)) {
|
|
printf("Unknown oid: %s\n", p1);
|
|
continue;
|
|
}
|
|
|
|
/* lookup entry in oidmap */
|
|
entry = oidmap_get(&map, &oid);
|
|
|
|
/* print result */
|
|
puts(entry ? entry->name : "NULL");
|
|
|
|
} else if (!strcmp("remove", cmd) && p1) {
|
|
|
|
if (repo_get_oid(the_repository, p1, &oid)) {
|
|
printf("Unknown oid: %s\n", p1);
|
|
continue;
|
|
}
|
|
|
|
/* remove entry from oidmap */
|
|
entry = oidmap_remove(&map, &oid);
|
|
|
|
/* print result and free entry*/
|
|
puts(entry ? entry->name : "NULL");
|
|
free(entry);
|
|
|
|
} else if (!strcmp("iterate", cmd)) {
|
|
|
|
struct oidmap_iter iter;
|
|
oidmap_iter_init(&map, &iter);
|
|
while ((entry = oidmap_iter_next(&iter)))
|
|
printf("%s %s\n", oid_to_hex(&entry->entry.oid), entry->name);
|
|
|
|
} else {
|
|
|
|
printf("Unknown command %s\n", cmd);
|
|
|
|
}
|
|
}
|
|
|
|
string_list_clear(&parts, 0);
|
|
strbuf_release(&line);
|
|
oidmap_free(&map, 1);
|
|
return 0;
|
|
}
|