diff options
author | Vincent Ambo <mail@tazj.in> | 2021-09-21T10·03+0300 |
---|---|---|
committer | Vincent Ambo <mail@tazj.in> | 2021-09-21T11·29+0300 |
commit | 43b1791ec601732ac31195df96781a848360a9ac (patch) | |
tree | daae8d638343295d2f1f7da955e556ef4c958864 /third_party/git/oidset.c | |
parent | 2d8e7dc9d9c38127ec4ebd13aee8e8f586a43318 (diff) |
chore(3p/git): Unvendor git and track patches instead r/2903
This was vendored a long time ago under the expectation that keeping it in sync with cgit would be easier this way, but it has proven not to be a big issue. On the other hand, a vendored copy of git is an annoying maintenance burden. It is much easier to rebase the single (dottime) patch that we have. This removes the vendored copy of git and instead passes the git source code to cgit via `pkgs.srcOnly`, which includes the applied patch so that cgit can continue rendering dottime. Change-Id: If31f62dea7ce688fd1b9050204e9378019775f2b
Diffstat (limited to 'third_party/git/oidset.c')
-rw-r--r-- | third_party/git/oidset.c | 84 |
1 files changed, 0 insertions, 84 deletions
diff --git a/third_party/git/oidset.c b/third_party/git/oidset.c deleted file mode 100644 index 2d0ab76fb569..000000000000 --- a/third_party/git/oidset.c +++ /dev/null @@ -1,84 +0,0 @@ -#include "cache.h" -#include "oidset.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); -} - -int oidset_insert(struct oidset *set, const struct object_id *oid) -{ - int added; - kh_put_oid_set(&set->set, *oid, &added); - return !added; -} - -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); -} - -int oidset_size(struct oidset *set) -{ - return kh_size(&set->set); -} - -void oidset_parse_file(struct oidset *set, const char *path) -{ - oidset_parse_file_carefully(set, path, NULL, NULL); -} - -void oidset_parse_file_carefully(struct oidset *set, const char *path, - 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(sb.buf, &oid, &p) || *p != '\0' || - (fn && fn(&oid, cbdata))) - die("invalid object name: %s", sb.buf); - oidset_insert(set, &oid); - } - if (ferror(fp)) - die_errno("Could not read '%s'", path); - fclose(fp); - strbuf_release(&sb); -} |