object-store: prepare has_{sha1, object}_file to handle any repo

stefanbeller · gitster · commit 9b45f499818f · 2018-11-14T17:22:40.000+09:00
Signed-off-by: Stefan Beller &lt;sbeller@google.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/contrib/coccinelle/the_repository.pending.cocci b/contrib/coccinelle/the_repository.pending.cocci
@@ -10,3 +10,33 @@ expression G;
 - read_object_file(
 + repo_read_object_file(the_repository,
   E, F, G)
+
+@@
+expression E;
+@@
+- has_sha1_file(
++ repo_has_sha1_file(the_repository,
+  E)
+
+@@
+expression E;
+expression F;
+@@
+- has_sha1_file_with_flags(
++ repo_has_sha1_file_with_flags(the_repository,
+  E)
+
+@@
+expression E;
+@@
+- has_object_file(
++ repo_has_object_file(the_repository,
+  E)
+
+@@
+expression E;
+expression F;
+@@
+- has_object_file_with_flags(
++ repo_has_object_file_with_flags(the_repository,
+  E)
diff --git a/object-store.h b/object-store.h
@@ -212,15 +212,27 @@ int read_loose_object(const char *path,
  * object_info. OBJECT_INFO_SKIP_CACHED is automatically set; pass
  * nonzero flags to also set other flags.
  */
-extern int has_sha1_file_with_flags(const unsigned char *sha1, int flags);
-static inline int has_sha1_file(const unsigned char *sha1)
+int repo_has_sha1_file_with_flags(struct repository *r,
+				  const unsigned char *sha1, int flags);
+static inline int repo_has_sha1_file(struct repository *r,
+				     const unsigned char *sha1)
 {
-	return has_sha1_file_with_flags(sha1, 0);
+	return repo_has_sha1_file_with_flags(r, sha1, 0);
 }
 
+#ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS
+#define has_sha1_file_with_flags(sha1, flags) repo_has_sha1_file_with_flags(the_repository, sha1, flags)
+#define has_sha1_file(sha1) repo_has_sha1_file(the_repository, sha1)
+#endif
+
 /* Same as the above, except for struct object_id. */
-extern int has_object_file(const struct object_id *oid);
-extern int has_object_file_with_flags(const struct object_id *oid, int flags);
+int repo_has_object_file(struct repository *r, const struct object_id *oid);
+int repo_has_object_file_with_flags(struct repository *r,
+				    const struct object_id *oid, int flags);
+#ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS
+#define has_object_file(oid) repo_has_object_file(the_repository, oid)
+#define has_object_file_with_flags(oid, flags) repo_has_object_file_with_flags(the_repository, oid, flags)
+#endif
 
 /*
  * Return true iff an alternate object database has a loose object
diff --git a/sha1-file.c b/sha1-file.c
@@ -1768,24 +1768,27 @@ int force_object_loose(const struct object_id *oid, time_t mtime)
 	return ret;
 }
 
-int has_sha1_file_with_flags(const unsigned char *sha1, int flags)
+int repo_has_sha1_file_with_flags(struct repository *r,
+				  const unsigned char *sha1, int flags)
 {
 	struct object_id oid;
 	if (!startup_info->have_repository)
 		return 0;
 	hashcpy(oid.hash, sha1);
-	return oid_object_info_extended(the_repository, &oid, NULL,
+	return oid_object_info_extended(r, &oid, NULL,
 					flags | OBJECT_INFO_SKIP_CACHED) >= 0;
 }
 
-int has_object_file(const struct object_id *oid)
+int repo_has_object_file(struct repository *r,
+			 const struct object_id *oid)
 {
-	return has_sha1_file(oid->hash);
+	return repo_has_sha1_file(r, oid->hash);
 }
 
-int has_object_file_with_flags(const struct object_id *oid, int flags)
+int repo_has_object_file_with_flags(struct repository *r,
+				    const struct object_id *oid, int flags)
 {
-	return has_sha1_file_with_flags(oid->hash, flags);
+	return repo_has_sha1_file_with_flags(r, oid->hash, flags);
 }
 
 static void check_tree(const void *buf, size_t size)

Original file line number	Diff line number	Diff line change
`@@ -1768,24 +1768,27 @@ int force_object_loose(const struct object_id *oid, time_t mtime)`
`1768`	`1768`	`return ret;`
`1769`	`1769`	`}`
`1770`	`1770`
`1771`		`-int has_sha1_file_with_flags(const unsigned char *sha1, int flags)`
	`1771`	`+int repo_has_sha1_file_with_flags(struct repository *r,`
	`1772`	`+ const unsigned char *sha1, int flags)`
`1772`	`1773`	`{`
`1773`	`1774`	`struct object_id oid;`
`1774`	`1775`	`if (!startup_info->have_repository)`
`1775`	`1776`	`return 0;`
`1776`	`1777`	`hashcpy(oid.hash, sha1);`
`1777`		`- return oid_object_info_extended(the_repository, &oid, NULL,`
	`1778`	`+ return oid_object_info_extended(r, &oid, NULL,`
`1778`	`1779`	`flags \| OBJECT_INFO_SKIP_CACHED) >= 0;`
`1779`	`1780`	`}`
`1780`	`1781`
`1781`		`-int has_object_file(const struct object_id *oid)`
	`1782`	`+int repo_has_object_file(struct repository *r,`
	`1783`	`+ const struct object_id *oid)`
`1782`	`1784`	`{`
`1783`		`- return has_sha1_file(oid->hash);`
	`1785`	`+ return repo_has_sha1_file(r, oid->hash);`
`1784`	`1786`	`}`
`1785`	`1787`
`1786`		`-int has_object_file_with_flags(const struct object_id *oid, int flags)`
	`1788`	`+int repo_has_object_file_with_flags(struct repository *r,`
	`1789`	`+ const struct object_id *oid, int flags)`
`1787`	`1790`	`{`
`1788`		`- return has_sha1_file_with_flags(oid->hash, flags);`
	`1791`	`+ return repo_has_sha1_file_with_flags(r, oid->hash, flags);`
`1789`	`1792`	`}`
`1790`	`1793`
`1791`	`1794`	`static void check_tree(const void *buf, size_t size)`