v3: * interdiff below, the only changes are renaming the variable - struct ref_store *main_ref_store; + struct ref_store *refs; in struct repository. as well as dropping the file rename patch. * improved commit messages from discussion on the single patches. v2: This applies on top of a merge of origin/bc/object-id and origin/sb/packfiles-in-repository, both of which are pending merge to master. It is also available at https://github.com/stefanbeller/git/tree/object-store-3 * removed whitespaces as noted by Stolee * incorporated Renes patch as the first patch of this series (It may go independently if this series takes too long) * Adressed Erics concern regarding sloppy commit messages (removed #Conflict markers), typo in comment * I did not drop the main_ from the ref store, yet, as asked by Duy. Thanks, Stefan v1: This applies on top of 464416a2eaadf84d2bfdf795007863d03b222b7c (sb/packfiles-in-repository). It is also available at https://github.com/stefanbeller/git/tree/object-store-3 This series will bring the replacement mechanism (git replace) into the object store. The first patches are cleaning up a bit, and patches 6-19 are converting one function at a time using the tick-tock pattern with the #define trick. See cfc62fc98c (sha1_file: add repository argument to link_alt_odb_entry, 2018-03-23) for explanation. Thanks, Stefan René Scharfe (1): replace_object: use oidmap Stefan Beller (14): replace-object: move replace_map to object store object-store: move lookup_replace_object to replace-object.h replace-object: eliminate replace objects prepared flag replace-object: check_replace_refs is safe in multi repo environment refs: add repository argument to get_main_ref_store refs: add repository argument to for_each_replace_ref replace-object: add repository argument to prepare_replace_object replace-object: add repository argument to do_lookup_replace_object replace-object: add repository argument to lookup_replace_object refs: store the main ref store inside the repository struct refs: allow for_each_replace_ref to handle arbitrary repositories replace-object: allow prepare_replace_object to handle arbitrary repositories replace-object: allow do_lookup_replace_object to handle arbitrary repositories replace-object: allow lookup_replace_object to handle arbitrary repositories builtin/mktag.c | 3 +- builtin/pack-refs.c | 3 +- builtin/replace.c | 4 +- cache.h | 19 -------- environment.c | 2 +- object-store.h | 8 ++++ object.c | 3 +- refs.c | 80 ++++++++++++++++---------------- refs.h | 4 +- refs/files-backend.c | 4 -- replace-object.h | 36 +++++++++++++++ replace_object.c | 97 ++++++++++----------------------------- repository.h | 3 ++ revision.c | 5 +- sha1_file.c | 7 +-- streaming.c | 3 +- t/helper/test-ref-store.c | 3 +- 17 files changed, 134 insertions(+), 150 deletions(-) create mode 100644 replace-object.h $ git diff github/object-store-3 diff --git c/Makefile w/Makefile index 94e0bf47b1..de4b8f0c02 100644 --- c/Makefile +++ w/Makefile @@ -871,7 +871,7 @@ LIB_OBJS += refs/packed-backend.o LIB_OBJS += refs/ref-cache.o LIB_OBJS += ref-filter.o LIB_OBJS += remote.o -LIB_OBJS += replace-object.o +LIB_OBJS += replace_object.o LIB_OBJS += repository.o LIB_OBJS += rerere.o LIB_OBJS += resolve-undo.o diff --git c/refs.c w/refs.c index bed5f88405..9b56fa9b81 100644 --- c/refs.c +++ w/refs.c @@ -1651,11 +1651,11 @@ static struct ref_store *ref_store_init(const char *gitdir, struct ref_store *get_main_ref_store(struct repository *r) { - if (r->main_ref_store) - return r->main_ref_store; + if (r->refs) + return r->refs; - r->main_ref_store = ref_store_init(r->gitdir, REF_STORE_ALL_CAPS); - return r->main_ref_store; + r->refs = ref_store_init(r->gitdir, REF_STORE_ALL_CAPS); + return r->refs; } /* diff --git c/refs/files-backend.c w/refs/files-backend.c index bec8e30e9e..5c76a75817 100644 --- c/refs/files-backend.c +++ w/refs/files-backend.c @@ -61,10 +61,6 @@ struct ref_lock { struct object_id old_oid; }; -/* - * Future: need to be in "struct repository" - * when doing a full libification. - */ struct files_ref_store { struct ref_store base; unsigned int store_flags; diff --git c/replace-object.c w/replace_object.c similarity index 100% rename from replace-object.c rename to replace_object.c diff --git c/repository.h w/repository.h index 7d0710b273..e6e00f541b 100644 --- c/repository.h +++ w/repository.h @@ -27,7 +27,7 @@ struct repository { struct raw_object_store *objects; /* The store in which the refs are held. */ - struct ref_store *main_ref_store; + struct ref_store *refs; /* * Path to the repository's graft file. -- 2.17.0.484.g0c8726318c-goog
