merge-recursive: fix merging a subdirectory into the root directory
[git/raj.git] / oidset.c
blobf63ce818f67766378485ab16075dd11e87c00ca0
1 #include "cache.h"
2 #include "oidset.h"
4 void oidset_init(struct oidset *set, size_t initial_size)
6 memset(&set->set, 0, sizeof(set->set));
7 if (initial_size)
8 kh_resize_oid_set(&set->set, initial_size);
11 int oidset_contains(const struct oidset *set, const struct object_id *oid)
13 khiter_t pos = kh_get_oid_set(&set->set, *oid);
14 return pos != kh_end(&set->set);
17 int oidset_insert(struct oidset *set, const struct object_id *oid)
19 int added;
20 kh_put_oid_set(&set->set, *oid, &added);
21 return !added;
24 int oidset_remove(struct oidset *set, const struct object_id *oid)
26 khiter_t pos = kh_get_oid_set(&set->set, *oid);
27 if (pos == kh_end(&set->set))
28 return 0;
29 kh_del_oid_set(&set->set, pos);
30 return 1;
33 void oidset_clear(struct oidset *set)
35 kh_release_oid_set(&set->set);
36 oidset_init(set, 0);
39 void oidset_parse_file(struct oidset *set, const char *path)
41 FILE *fp;
42 struct strbuf sb = STRBUF_INIT;
43 struct object_id oid;
45 fp = fopen(path, "r");
46 if (!fp)
47 die("could not open object name list: %s", path);
48 while (!strbuf_getline(&sb, fp)) {
49 const char *p;
50 const char *name;
53 * Allow trailing comments, leading whitespace
54 * (including before commits), and empty or whitespace
55 * only lines.
57 name = strchr(sb.buf, '#');
58 if (name)
59 strbuf_setlen(&sb, name - sb.buf);
60 strbuf_trim(&sb);
61 if (!sb.len)
62 continue;
64 if (parse_oid_hex(sb.buf, &oid, &p) || *p != '\0')
65 die("invalid object name: %s", sb.buf);
66 oidset_insert(set, &oid);
68 if (ferror(fp))
69 die_errno("Could not read '%s'", path);
70 fclose(fp);
71 strbuf_release(&sb);