Commit fb79db15f5778760633c3283c43e4c9f1efc35d2
2019-02-01T21:01:58
add read support for packed refs
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167
diff --git a/include/got_repository.h b/include/got_repository.h
index cf943ea..c026e9b 100644
--- a/include/got_repository.h
+++ b/include/got_repository.h
@@ -36,6 +36,7 @@ const char *got_repo_get_path_git_dir(struct got_repository *);
char *got_repo_get_path_objects(struct got_repository *);
char *got_repo_get_path_objects_pack(struct got_repository *);
char *got_repo_get_path_refs(struct got_repository *);
+char *got_repo_get_path_packed_refs(struct got_repository *);
struct got_reference;
diff --git a/lib/reference.c b/lib/reference.c
index 75e50d1..5730c82 100644
--- a/lib/reference.c
+++ b/lib/reference.c
@@ -36,6 +36,10 @@
#include "got_lib_inflate.h"
#include "got_lib_object.h"
+#ifndef nitems
+#define nitems(_a) (sizeof(_a) / sizeof((_a)[0]))
+#endif
+
#define GOT_REF_HEADS "heads"
#define GOT_REF_TAGS "tags"
#define GOT_REF_REMOTES "remotes"
@@ -159,6 +163,66 @@ get_refs_dir_path(struct got_repository *repo, const char *refname)
}
static const struct got_error *
+parse_packed_ref_line(struct got_reference **ref, const char *abs_refname,
+ const char *line)
+{
+ uint8_t digest[SHA1_DIGEST_LENGTH];
+ char *name;
+
+ *ref = NULL;
+
+ if (line[0] == '#')
+ return NULL;
+
+ if (!got_parse_sha1_digest(digest, line))
+ return got_error(GOT_ERR_NOT_REF);
+
+ if (strcmp(line + SHA1_DIGEST_STRING_LENGTH, abs_refname) != 0)
+ return NULL;
+
+ name = strdup(abs_refname);
+ if (name == NULL)
+ return got_error_from_errno();
+
+ *ref = calloc(1, sizeof(**ref));
+ if (*ref == NULL)
+ return got_error_from_errno();
+ (*ref)->ref.ref.name = name;;
+ memcpy(&(*ref)->ref.ref.sha1, digest, SHA1_DIGEST_LENGTH);
+ return NULL;
+}
+
+static const struct got_error *
+open_packed_ref(struct got_reference **ref, FILE *f, const char *subdir,
+ const char *refname)
+{
+ const struct got_error *err = NULL;
+ char *abs_refname;
+ char *line;
+ size_t len;
+ const char delim[3] = {'\0', '\0', '\0'};
+
+ if (asprintf(&abs_refname, "refs/%s/%s", subdir, refname) == -1)
+ return got_error_from_errno();
+
+ do {
+ line = fparseln(f, &len, NULL, delim, 0);
+ if (line == NULL) {
+ err = got_error(GOT_ERR_NOT_REF);
+ break;
+ }
+
+ err = parse_packed_ref_line(ref, abs_refname, line);
+ free(line);
+ if (err)
+ break;
+ } while (*ref == NULL);
+
+ free(abs_refname);
+ return err;
+}
+
+static const struct got_error *
open_ref(struct got_reference **ref, const char *path_refs, const char *subdir,
const char *refname)
{
@@ -187,22 +251,37 @@ got_ref_open(struct got_reference **ref, struct got_repository *repo,
const char *refname)
{
const struct got_error *err = NULL;
- char *path_refs = get_refs_dir_path(repo, refname);
+ char *path_refs;
+ const char *subdirs[] = {
+ GOT_REF_HEADS, GOT_REF_TAGS, GOT_REF_REMOTES
+ };
+ char *packed_refs_path = got_repo_get_path_packed_refs(repo);
+ FILE *f = fopen(packed_refs_path, "rb");
+ int i;
+
+ if (f) {
+ for (i = 0; i < nitems(subdirs); i++) {
+ err = open_packed_ref(ref, f, subdirs[i], refname);
+ if (err == NULL)
+ return NULL;
+ rewind(f);
+ }
+ fclose(f);
+ f = NULL;
+ }
+ path_refs = get_refs_dir_path(repo, refname);
if (path_refs == NULL) {
err = got_error_from_errno();
goto done;
}
- /* XXX For now, this assumes that refs exist in the filesystem. */
-
- err = open_ref(ref, path_refs, GOT_REF_HEADS, refname);
- if (err != NULL)
- err = open_ref(ref, path_refs, GOT_REF_TAGS, refname);
- if (err != NULL)
- err = open_ref(ref, path_refs, GOT_REF_REMOTES, refname);
- if (err != NULL)
- err = open_ref(ref, path_refs, "", refname);
+ for (i = 0; i < nitems(subdirs); i++) {
+ err = open_ref(ref, path_refs, subdirs[i], refname);
+ if (err == NULL)
+ goto done;
+ }
+ err = open_ref(ref, path_refs, "", refname);
done:
free(path_refs);
return err;
diff --git a/lib/repository.c b/lib/repository.c
index d07b73f..7c1144d 100644
--- a/lib/repository.c
+++ b/lib/repository.c
@@ -65,6 +65,7 @@
#define GOT_FETCH_HEAD_FILE "FETCH_HEAD"
#define GOT_ORIG_HEAD_FILE "ORIG_HEAD"
#define GOT_OBJECTS_PACK_DIR "objects/pack"
+#define GOT_PACKED_REFS_FILE "packed-refs"
const char *
got_repo_get_path(struct got_repository *repo)
@@ -114,6 +115,12 @@ got_repo_get_path_refs(struct got_repository *repo)
return get_path_git_child(repo, GOT_REFS_DIR);
}
+char *
+got_repo_get_path_packed_refs(struct got_repository *repo)
+{
+ return get_path_git_child(repo, GOT_PACKED_REFS_FILE);
+}
+
static char *
get_path_head(struct got_repository *repo)
{