mirror of
https://github.com/git-for-windows/git.git
synced 2026-06-27 13:21:17 -05:00
9759608622
The Git project is not exactly the easiest project to get started in: it's written in C and POSIX shell, with bits of Perl, Rust and other languages sprinkled into it. On top of that, the project has grown somewhat organically over time, making the codebase hard to navigate. These are problems that we're aware of, and there have been and still are efforts to clean up some of the technical debt that is natural to exist an a project that is more than 20 years old. Furthermore, we provide resources to newcomers that help them out like our coding guidelines, code of conduct or "MyFirstContribution.adoc". But there is a rather practical problem: finding your way around in our project's tree is not easy. Doing a directory listing in the top-level directory will present you with more than 550 files, which makes it extremely hard for a newcomer to figure out what files they are even supposed to look at. This makes the onboarding experience somewhat harder than it really needs to be. This isn't only a problem for newcomers though, as I myself struggle to find the files I am looking for because of the sheer number of files. Besides the problem of discoverability it also creates a problem of structure. It is not obvious at all which files are part of "libgit.a" and which files are only linked into our final executables. So while we have this split in our build systems, that split is not evident at all in our tree. Introduce a new "lib/" directory and move all of our sources for "libgit.a" into it to fix these issues. It makes the split we have evident and reduces the number of files in our top-level tree from 550 files to ~80 files. This is still a lot of files, but it's significantly easier to navigate already. Furthermore, we can further iterate after this step and think about introducing a better structure for remaining files, as well. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
111 lines
2.5 KiB
C
111 lines
2.5 KiB
C
#include "git-compat-util.h"
|
|
#include "oidset.h"
|
|
#include "hex.h"
|
|
#include "strbuf.h"
|
|
|
|
void oidset_init(struct oidset *set, size_t initial_size)
|
|
{
|
|
memset(&set->set, 0, sizeof(set->set));
|
|
if (initial_size)
|
|
kh_resize_oid_set(&set->set, initial_size);
|
|
}
|
|
|
|
int oidset_contains(const struct oidset *set, const struct object_id *oid)
|
|
{
|
|
khiter_t pos = kh_get_oid_set(&set->set, *oid);
|
|
return pos != kh_end(&set->set);
|
|
}
|
|
|
|
bool oidset_equal(const struct oidset *a, const struct oidset *b)
|
|
{
|
|
struct oidset_iter iter;
|
|
struct object_id *a_oid;
|
|
|
|
if (oidset_size(a) != oidset_size(b))
|
|
return false;
|
|
|
|
oidset_iter_init(a, &iter);
|
|
while ((a_oid = oidset_iter_next(&iter)))
|
|
if (!oidset_contains(b, a_oid))
|
|
return false;
|
|
|
|
return true;
|
|
}
|
|
|
|
int oidset_insert(struct oidset *set, const struct object_id *oid)
|
|
{
|
|
int added;
|
|
kh_put_oid_set(&set->set, *oid, &added);
|
|
return !added;
|
|
}
|
|
|
|
void oidset_insert_from_set(struct oidset *dest, struct oidset *src)
|
|
{
|
|
struct oidset_iter iter;
|
|
struct object_id *src_oid;
|
|
|
|
oidset_iter_init(src, &iter);
|
|
while ((src_oid = oidset_iter_next(&iter)))
|
|
oidset_insert(dest, src_oid);
|
|
}
|
|
|
|
int oidset_remove(struct oidset *set, const struct object_id *oid)
|
|
{
|
|
khiter_t pos = kh_get_oid_set(&set->set, *oid);
|
|
if (pos == kh_end(&set->set))
|
|
return 0;
|
|
kh_del_oid_set(&set->set, pos);
|
|
return 1;
|
|
}
|
|
|
|
void oidset_clear(struct oidset *set)
|
|
{
|
|
kh_release_oid_set(&set->set);
|
|
oidset_init(set, 0);
|
|
}
|
|
|
|
void oidset_parse_file(struct oidset *set, const char *path,
|
|
const struct git_hash_algo *algop)
|
|
{
|
|
oidset_parse_file_carefully(set, path, algop, NULL, NULL);
|
|
}
|
|
|
|
void oidset_parse_file_carefully(struct oidset *set, const char *path,
|
|
const struct git_hash_algo *algop,
|
|
oidset_parse_tweak_fn fn, void *cbdata)
|
|
{
|
|
FILE *fp;
|
|
struct strbuf sb = STRBUF_INIT;
|
|
struct object_id oid;
|
|
|
|
fp = fopen(path, "r");
|
|
if (!fp)
|
|
die("could not open object name list: %s", path);
|
|
while (!strbuf_getline(&sb, fp)) {
|
|
const char *p;
|
|
const char *name;
|
|
|
|
/*
|
|
* Allow trailing comments, leading whitespace
|
|
* (including before commits), and empty or whitespace
|
|
* only lines.
|
|
*/
|
|
name = strchr(sb.buf, '#');
|
|
if (name)
|
|
strbuf_setlen(&sb, name - sb.buf);
|
|
strbuf_trim(&sb);
|
|
if (!sb.len)
|
|
continue;
|
|
|
|
if (parse_oid_hex_algop(sb.buf, &oid, &p, algop) || *p != '\0')
|
|
die("invalid object name: %s", sb.buf);
|
|
if (fn && fn(&oid, cbdata))
|
|
continue;
|
|
oidset_insert(set, &oid);
|
|
}
|
|
if (ferror(fp))
|
|
die_errno("Could not read '%s'", path);
|
|
fclose(fp);
|
|
strbuf_release(&sb);
|
|
}
|