has_sha1_kept_pack(): take "struct rev_info"

gitster · gitster · commit b8431b033f9e · 2009-02-28T01:06:06.000-08:00
Its "ignore_packed" parameter always comes from struct rev_info.  This
patch makes the function take a pointer to the surrounding structure, so
that the refactoring in the next patch becomes easier to review.

There is an unfortunate header file dependency and the easiest workaround
is to temporarily move the function declaration from cache.h to
revision.h; this will be moved back to cache.h once the function loses
this "ignore_packed" parameter altogether in the later part of the
series.

Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/cache.h b/cache.h
@@ -566,7 +566,6 @@ extern int check_sha1_signature(const unsigned char *sha1, void *buf, unsigned l
 extern int move_temp_to_file(const char *tmpfile, const char *filename);
 
 extern int has_sha1_pack(const unsigned char *sha1);
-extern int has_sha1_kept_pack(const unsigned char *sha1, const char **ignore);
 extern int has_sha1_file(const unsigned char *sha1);
 extern int has_loose_object_nonlocal(const unsigned char *sha1);
 
diff --git a/revision.c b/revision.c
@@ -1486,7 +1486,7 @@ enum commit_action simplify_commit(struct rev_info *revs, struct commit *commit)
 	if (commit->object.flags & SHOWN)
 		return commit_ignore;
 	if (revs->unpacked &&
-	    has_sha1_kept_pack(commit->object.sha1, revs->ignore_packed))
+	    has_sha1_kept_pack(commit->object.sha1, revs))
 		return commit_ignore;
 	if (revs->show_all)
 		return commit_show;
diff --git a/revision.h b/revision.h
@@ -158,4 +158,6 @@ enum commit_action {
 
 extern enum commit_action simplify_commit(struct rev_info *revs, struct commit *commit);
 
+extern int has_sha1_kept_pack(const unsigned char *sha1, const struct rev_info *);
+
 #endif
diff --git a/sha1_file.c b/sha1_file.c
@@ -16,6 +16,8 @@
 #include "refs.h"
 #include "pack-revindex.h"
 #include "sha1-lookup.h"
+#include "diff.h"
+#include "revision.h"
 
 #ifndef O_NOATIME
 #if defined(__linux__) && (defined(__i386__) || defined(__PPC__))
@@ -1875,7 +1877,7 @@ int matches_pack_name(struct packed_git *p, const char *name)
 }
 
 static int find_pack_ent(const unsigned char *sha1, struct pack_entry *e,
-			 const char **ignore_packed)
+			 const struct rev_info *revs)
 {
 	static struct packed_git *last_found = (void *)1;
 	struct packed_git *p;
@@ -1887,9 +1889,9 @@ static int find_pack_ent(const unsigned char *sha1, struct pack_entry *e,
 	p = (last_found == (void *)1) ? packed_git : last_found;
 
 	do {
-		if (ignore_packed) {
+		if (revs->ignore_packed) {
 			const char **ig;
-			for (ig = ignore_packed; *ig; ig++)
+			for (ig = revs->ignore_packed; *ig; ig++)
 				if (matches_pack_name(p, *ig))
 					break;
 			if (*ig)
@@ -1941,9 +1943,9 @@ static int find_pack_entry(const unsigned char *sha1, struct pack_entry *e)
 }
 
 static int find_kept_pack_entry(const unsigned char *sha1, struct pack_entry *e,
-				const char **ignore_packed)
+				const struct rev_info *revs)
 {
-	return find_pack_ent(sha1, e, ignore_packed);
+	return find_pack_ent(sha1, e, revs);
 }
 
 struct packed_git *find_sha1_pack(const unsigned char *sha1,
@@ -2413,10 +2415,10 @@ int has_sha1_pack(const unsigned char *sha1)
 	return find_pack_entry(sha1, &e);
 }
 
-int has_sha1_kept_pack(const unsigned char *sha1, const char **ignore_packed)
+int has_sha1_kept_pack(const unsigned char *sha1, const struct rev_info *revs)
 {
 	struct pack_entry e;
-	return find_kept_pack_entry(sha1, &e, ignore_packed);
+	return find_kept_pack_entry(sha1, &e, revs);
 }
 
 int has_sha1_file(const unsigned char *sha1)

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,8 @@`
`16`	`16`	`#include "refs.h"`
`17`	`17`	`#include "pack-revindex.h"`
`18`	`18`	`#include "sha1-lookup.h"`
	`19`	`+#include "diff.h"`
	`20`	`+#include "revision.h"`
`19`	`21`
`20`	`22`	`#ifndef O_NOATIME`
`21`	`23`	`#if defined(__linux__) && (defined(__i386__) \|\| defined(__PPC__))`
`@@ -1875,7 +1877,7 @@ int matches_pack_name(struct packed_git p, const char name)`
`1875`	`1877`	`}`
`1876`	`1878`
`1877`	`1879`	`static int find_pack_ent(const unsigned char sha1, struct pack_entry e,`
`1878`		`- const char **ignore_packed)`
	`1880`	`+ const struct rev_info *revs)`
`1879`	`1881`	`{`
`1880`	`1882`	`static struct packed_git last_found = (void )1;`
`1881`	`1883`	`struct packed_git *p;`
`@@ -1887,9 +1889,9 @@ static int find_pack_ent(const unsigned char sha1, struct pack_entry e,`
`1887`	`1889`	`p = (last_found == (void *)1) ? packed_git : last_found;`
`1888`	`1890`
`1889`	`1891`	`do {`
`1890`		`- if (ignore_packed) {`
	`1892`	`+ if (revs->ignore_packed) {`
`1891`	`1893`	`const char **ig;`
`1892`		`- for (ig = ignore_packed; *ig; ig++)`
	`1894`	`+ for (ig = revs->ignore_packed; *ig; ig++)`
`1893`	`1895`	`if (matches_pack_name(p, *ig))`
`1894`	`1896`	`break;`
`1895`	`1897`	`if (*ig)`
`@@ -1941,9 +1943,9 @@ static int find_pack_entry(const unsigned char sha1, struct pack_entry e)`
`1941`	`1943`	`}`
`1942`	`1944`
`1943`	`1945`	`static int find_kept_pack_entry(const unsigned char sha1, struct pack_entry e,`
`1944`		`- const char **ignore_packed)`
	`1946`	`+ const struct rev_info *revs)`
`1945`	`1947`	`{`
`1946`		`- return find_pack_ent(sha1, e, ignore_packed);`
	`1948`	`+ return find_pack_ent(sha1, e, revs);`
`1947`	`1949`	`}`
`1948`	`1950`
`1949`	`1951`	`struct packed_git find_sha1_pack(const unsigned char sha1,`
`@@ -2413,10 +2415,10 @@ int has_sha1_pack(const unsigned char *sha1)`
`2413`	`2415`	`return find_pack_entry(sha1, &e);`
`2414`	`2416`	`}`
`2415`	`2417`
`2416`		`-int has_sha1_kept_pack(const unsigned char sha1, const char *ignore_packed)`
	`2418`	`+int has_sha1_kept_pack(const unsigned char sha1, const struct rev_info revs)`
`2417`	`2419`	`{`
`2418`	`2420`	`struct pack_entry e;`
`2419`		`- return find_kept_pack_entry(sha1, &e, ignore_packed);`
	`2421`	`+ return find_kept_pack_entry(sha1, &e, revs);`
`2420`	`2422`	`}`
`2421`	`2423`
`2422`	`2424`	`int has_sha1_file(const unsigned char *sha1)`