object-store: allow read_object_file_extended to read from any repo

read_object_file_extended is not widely used, so migrate it all at once.

Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/object-store.h b/object-store.h
index 63b7605a3e0b3000641d8f39f22e1d5c8139f19b..3d98a682b282204eb2fff5c3df044087ea1df0c4 100644 (file)
--- a/object-store.h
+++ b/object-store.h
@@ -161,12 +161,13 @@ void sha1_file_name(struct repository *r, struct strbuf *buf, const unsigned cha
 
 void *map_sha1_file(struct repository *r, const unsigned char *sha1, unsigned long *size);
 
 
 void *map_sha1_file(struct repository *r, const unsigned char *sha1, unsigned long *size);
 

-extern void *read_object_file_extended(const struct object_id *oid,
+extern void *read_object_file_extended(struct repository *r,
+                                      const struct object_id *oid,

                                       enum object_type *type,
                                       unsigned long *size, int lookup_replace);
 static inline void *read_object_file(const struct object_id *oid, enum object_type *type, unsigned long *size)
 {
                                       enum object_type *type,
                                       unsigned long *size, int lookup_replace);
 static inline void *read_object_file(const struct object_id *oid, enum object_type *type, unsigned long *size)
 {

-       return read_object_file_extended(oid, type, size, 1);
+       return read_object_file_extended(the_repository, oid, type, size, 1);

 }
 
 /* Read and unpack an object file into memory, write memory to an object file */
 }
 
 /* Read and unpack an object file into memory, write memory to an object file */

diff --git a/sha1-file.c b/sha1-file.c
index 856e000ee1afda078d5babb5609b5ad2ae21f0e9..c5b704aec50536b857c8211355419297d97532d7 100644 (file)
--- a/sha1-file.c
+++ b/sha1-file.c
@@ -1403,7 +1403,8 @@ int pretend_object_file(void *buf, unsigned long len, enum object_type type,
  * deal with them should arrange to call read_object() and give error
  * messages themselves.
  */
  * deal with them should arrange to call read_object() and give error
  * messages themselves.
  */

-void *read_object_file_extended(const struct object_id *oid,
+void *read_object_file_extended(struct repository *r,
+                               const struct object_id *oid,

                                enum object_type *type,
                                unsigned long *size,
                                int lookup_replace)
                                enum object_type *type,
                                unsigned long *size,
                                int lookup_replace)


@@ -1413,10 +1414,10 @@ void *read_object_file_extended(const struct object_id *oid,
        const char *path;
        struct stat st;
        const struct object_id *repl = lookup_replace ?
        const char *path;
        struct stat st;
        const struct object_id *repl = lookup_replace ?

-               lookup_replace_object(the_repository, oid) : oid;
+               lookup_replace_object(r, oid) : oid;

 
        errno = 0;
 
        errno = 0;

-       data = read_object(the_repository, repl->hash, type, size);
+       data = read_object(r, repl->hash, type, size);

        if (data)
                return data;
 
        if (data)
                return data;
 


@@ -1428,11 +1429,11 @@ void *read_object_file_extended(const struct object_id *oid,
                die(_("replacement %s not found for %s"),
                    oid_to_hex(repl), oid_to_hex(oid));
 
                die(_("replacement %s not found for %s"),
                    oid_to_hex(repl), oid_to_hex(oid));
 

-       if (!stat_sha1_file(the_repository, repl->hash, &st, &path))
+       if (!stat_sha1_file(r, repl->hash, &st, &path))

                die(_("loose object %s (stored in %s) is corrupt"),
                    oid_to_hex(repl), path);
 
                die(_("loose object %s (stored in %s) is corrupt"),
                    oid_to_hex(repl), path);
 

-       if ((p = has_packed_and_bad(the_repository, repl->hash)) != NULL)
+       if ((p = has_packed_and_bad(r, repl->hash)) != NULL)

                die(_("packed object %s (stored in %s) is corrupt"),
                    oid_to_hex(repl), p->pack_name);
 
                die(_("packed object %s (stored in %s) is corrupt"),
                    oid_to_hex(repl), p->pack_name);
 

diff --git a/streaming.c b/streaming.c
index d1e6b2dce6877cb1407ac9d38e65d8b2bae25daa..c843a1230f35e255ba627ef47e0873b103110425 100644 (file)
--- a/streaming.c
+++ b/streaming.c
@@ -490,7 +490,7 @@ static struct stream_vtbl incore_vtbl = {
 
 static open_method_decl(incore)
 {
 
 static open_method_decl(incore)
 {

-       st->u.incore.buf = read_object_file_extended(oid, type, &st->size, 0);
+       st->u.incore.buf = read_object_file_extended(the_repository, oid, type, &st->size, 0);

        st->u.incore.read_ptr = 0;
        st->vtbl = &incore_vtbl;
 
        st->u.incore.read_ptr = 0;
        st->vtbl = &incore_vtbl;