diff options
author | Stefan Beller <sbeller@google.com> | 2017-08-30 00:10:36 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-09-07 08:49:46 +0900 |
commit | 3b98541b844fecd35cd97410329e8ca09332797e (patch) | |
tree | d06a0c7033580b0c3ac3ffeed5ad093c12a9a49e | |
parent | 152c4bc858a614e85da7b09076b5dd6a0494baff (diff) | |
download | git-3b98541b844fecd35cd97410329e8ca09332797e.tar.gz |
object-store: allow prepare_alt_odb to handle arbitrary repositories
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r-- | cache.h | 4 | ||||
-rw-r--r-- | object-store.h | 3 | ||||
-rw-r--r-- | sha1_file.c | 65 |
3 files changed, 39 insertions, 33 deletions
@@ -1512,6 +1512,10 @@ struct alternate_object_database { char loose_objects_subdir_seen[256]; struct oid_array loose_objects_cache; + /* + * Path to the alternate object database, relative to the + * current working directory. + */ char path[FLEX_ARRAY]; }; extern char *compute_alternate_path(const char *path, struct strbuf *err); diff --git a/object-store.h b/object-store.h index 92fbf4a9ca..fcf36c7370 100644 --- a/object-store.h +++ b/object-store.h @@ -65,8 +65,7 @@ extern const char *sha1_file_name_the_repository(const unsigned char *sha1); #define map_sha1_file(r, s, sz) map_sha1_file_##r(s, sz) extern void *map_sha1_file_the_repository(const unsigned char *sha1, unsigned long *size); -#define prepare_alt_odb(r) prepare_alt_odb_##r() -extern void prepare_alt_odb_the_repository(void); +extern void prepare_alt_odb(struct repository *r); typedef int alt_odb_fn(struct alternate_object_database *, void *); #define foreach_alt_odb(r, fn, cb) foreach_alt_odb_##r(fn, cb) diff --git a/sha1_file.c b/sha1_file.c index b854cad970..452c8f0bbd 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -326,11 +326,10 @@ static int alt_odb_usable(struct repository *r, struct strbuf *path, * SHA1, an extra slash for the first level indirection, and the * terminating NUL. */ -#define read_info_alternates(r, rb, d) read_info_alternates_##r(rb, d) -static void read_info_alternates_the_repository(const char *relative_base, - int depth); -#define link_alt_odb_entry(r, e, rb, d, n) link_alt_odb_entry_##r(e, rb, d, n) -static int link_alt_odb_entry_the_repository(const char *entry, +static void read_info_alternates(struct repository *r, + const char *relative_base, + int depth); +static int link_alt_odb_entry(struct repository *r, const char *entry, const char *relative_base, int depth, const char *normalized_objdir) { struct alternate_object_database *ent; @@ -356,7 +355,7 @@ static int link_alt_odb_entry_the_repository(const char *entry, while (pathbuf.len && pathbuf.buf[pathbuf.len - 1] == '/') strbuf_setlen(&pathbuf, pathbuf.len - 1); - if (!alt_odb_usable(the_repository, &pathbuf, normalized_objdir)) { + if (!alt_odb_usable(r, &pathbuf, normalized_objdir)) { strbuf_release(&pathbuf); return -1; } @@ -364,12 +363,12 @@ static int link_alt_odb_entry_the_repository(const char *entry, ent = alloc_alt_odb(pathbuf.buf); /* add the alternate entry */ - *the_repository->objects.alt_odb_tail = ent; - the_repository->objects.alt_odb_tail = &(ent->next); + *r->objects.alt_odb_tail = ent; + r->objects.alt_odb_tail = &(ent->next); ent->next = NULL; /* recursively add alternates */ - read_info_alternates(the_repository, pathbuf.buf, depth + 1); + read_info_alternates(r, pathbuf.buf, depth + 1); strbuf_release(&pathbuf); return 0; @@ -404,12 +403,8 @@ static const char *parse_alt_odb_entry(const char *string, return end; } -#define link_alt_odb_entries(r, a, l, s, rb, d) \ - link_alt_odb_entries_##r(a, l, s, rb, d) -static void link_alt_odb_entries_the_repository(const char *alt, int len, - int sep, - const char *relative_base, - int depth) +static void link_alt_odb_entries(struct repository *r, const char *alt, int len, + int sep, const char *relative_base, int depth) { struct strbuf objdirbuf = STRBUF_INIT; struct strbuf entry = STRBUF_INIT; @@ -420,7 +415,7 @@ static void link_alt_odb_entries_the_repository(const char *alt, int len, return; } - strbuf_add_absolute_path(&objdirbuf, get_object_directory()); + strbuf_add_absolute_path(&objdirbuf, r->objectdir); if (strbuf_normalize_path(&objdirbuf) < 0) die("unable to normalize object directory: %s", objdirbuf.buf); @@ -429,15 +424,16 @@ static void link_alt_odb_entries_the_repository(const char *alt, int len, alt = parse_alt_odb_entry(alt, sep, &entry); if (!entry.len) continue; - link_alt_odb_entry(the_repository, entry.buf, + link_alt_odb_entry(r, entry.buf, relative_base, depth, objdirbuf.buf); } strbuf_release(&entry); strbuf_release(&objdirbuf); } -static void read_info_alternates_the_repository(const char *relative_base, - int depth) +static void read_info_alternates(struct repository *r, + const char *relative_base, + int depth) { char *map; size_t mapsz; @@ -458,7 +454,7 @@ static void read_info_alternates_the_repository(const char *relative_base, map = xmmap(NULL, mapsz, PROT_READ, MAP_PRIVATE, fd, 0); close(fd); - link_alt_odb_entries(the_repository, map, mapsz, '\n', relative_base, depth); + link_alt_odb_entries(r, map, mapsz, '\n', relative_base, depth); munmap(map, mapsz); } @@ -622,22 +618,29 @@ int foreach_alt_odb_the_repository(alt_odb_fn fn, void *cb) return r; } -void prepare_alt_odb_the_repository(void) +void prepare_alt_odb(struct repository *r) { - const char *alt; - - if (the_repository->objects.alt_odb_tail) + if (r->objects.alt_odb_tail) return; - alt = getenv(ALTERNATE_DB_ENVIRONMENT); - if (!alt) alt = ""; + r->objects.alt_odb_tail = &r->objects.alt_odb_list; + + if (!r->ignore_env) { + const char *alt = getenv(ALTERNATE_DB_ENVIRONMENT); + if (!alt) + alt = ""; - the_repository->objects.alt_odb_tail = - &the_repository->objects.alt_odb_list; - link_alt_odb_entries(the_repository, alt, strlen(alt), - PATH_SEP, NULL, 0); + /* + * Paths in alt are relative to the cwd. We ignore environment + * settings like this for all repositories except for + * the_repository, so we don't have to worry about transforming + * the path to be relative to another repository. + */ + link_alt_odb_entries(r, alt, strlen(alt), + PATH_SEP, NULL, 0); + } - read_info_alternates(the_repository, get_object_directory(), 0); + read_info_alternates(r, r->objectdir, 0); } /* Returns 1 if we have successfully freshened the file, 0 otherwise. */ |