setup_revisions(): Allow walking history in a submodule

hvoigt · gitster · commit 9ef6aeb09ffe · 2010-07-07T09:48:33.000-07:00
By passing the path to a submodule in opt-&gt;submodule, the function can
be used to walk history in the named submodule repository, instead of
the toplevel repository.

Signed-off-by: Heiko Voigt &lt;hvoigt@hvoigt.net&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/refs.c b/refs.c
@@ -721,31 +721,62 @@ int head_ref(each_ref_fn fn, void *cb_data)
 	return do_head_ref(NULL, fn, cb_data);
 }
 
+int head_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data)
+{
+	return do_head_ref(submodule, fn, cb_data);
+}
+
 int for_each_ref(each_ref_fn fn, void *cb_data)
 {
 	return do_for_each_ref(NULL, "refs/", fn, 0, 0, cb_data);
 }
 
+int for_each_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data)
+{
+	return do_for_each_ref(submodule, "refs/", fn, 0, 0, cb_data);
+}
+
 int for_each_ref_in(const char *prefix, each_ref_fn fn, void *cb_data)
 {
 	return do_for_each_ref(NULL, prefix, fn, strlen(prefix), 0, cb_data);
 }
 
+int for_each_ref_in_submodule(const char *submodule, const char *prefix,
+		each_ref_fn fn, void *cb_data)
+{
+	return do_for_each_ref(submodule, prefix, fn, strlen(prefix), 0, cb_data);
+}
+
 int for_each_tag_ref(each_ref_fn fn, void *cb_data)
 {
 	return for_each_ref_in("refs/tags/", fn, cb_data);
 }
 
+int for_each_tag_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data)
+{
+	return for_each_ref_in_submodule(submodule, "refs/tags/", fn, cb_data);
+}
+
 int for_each_branch_ref(each_ref_fn fn, void *cb_data)
 {
 	return for_each_ref_in("refs/heads/", fn, cb_data);
 }
 
+int for_each_branch_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data)
+{
+	return for_each_ref_in_submodule(submodule, "refs/heads/", fn, cb_data);
+}
+
 int for_each_remote_ref(each_ref_fn fn, void *cb_data)
 {
 	return for_each_ref_in("refs/remotes/", fn, cb_data);
 }
 
+int for_each_remote_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data)
+{
+	return for_each_ref_in_submodule(submodule, "refs/remotes/", fn, cb_data);
+}
+
 int for_each_replace_ref(each_ref_fn fn, void *cb_data)
 {
 	return do_for_each_ref(NULL, "refs/replace/", fn, 13, 0, cb_data);
diff --git a/refs.h b/refs.h
@@ -28,6 +28,14 @@ extern int for_each_replace_ref(each_ref_fn, void *);
 extern int for_each_glob_ref(each_ref_fn, const char *pattern, void *);
 extern int for_each_glob_ref_in(each_ref_fn, const char *pattern, const char* prefix, void *);
 
+extern int head_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data);
+extern int for_each_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data);
+extern int for_each_ref_in_submodule(const char *submodule, const char *prefix,
+		each_ref_fn fn, void *cb_data);
+extern int for_each_tag_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data);
+extern int for_each_branch_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data);
+extern int for_each_remote_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data);
+
 static inline const char *has_glob_specials(const char *pattern)
 {
 	return strpbrk(pattern, "?*[");
diff --git a/revision.c b/revision.c
@@ -820,12 +820,12 @@ static void init_all_refs_cb(struct all_refs_cb *cb, struct rev_info *revs,
 	cb->all_flags = flags;
 }
 
-static void handle_refs(struct rev_info *revs, unsigned flags,
-		int (*for_each)(each_ref_fn, void *))
+static void handle_refs(const char *submodule, struct rev_info *revs, unsigned flags,
+		int (*for_each)(const char *, each_ref_fn, void *))
 {
 	struct all_refs_cb cb;
 	init_all_refs_cb(&cb, revs, flags);
-	for_each(handle_one_ref, &cb);
+	for_each(submodule, handle_one_ref, &cb);
 }
 
 static void handle_one_reflog_commit(unsigned char *sha1, void *cb_data)
@@ -1417,14 +1417,14 @@ void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx,
 	ctx->argc -= n;
 }
 
-static int for_each_bad_bisect_ref(each_ref_fn fn, void *cb_data)
+static int for_each_bad_bisect_ref(const char *submodule, each_ref_fn fn, void *cb_data)
 {
-	return for_each_ref_in("refs/bisect/bad", fn, cb_data);
+	return for_each_ref_in_submodule(submodule, "refs/bisect/bad", fn, cb_data);
 }
 
-static int for_each_good_bisect_ref(each_ref_fn fn, void *cb_data)
+static int for_each_good_bisect_ref(const char *submodule, each_ref_fn fn, void *cb_data)
 {
-	return for_each_ref_in("refs/bisect/good", fn, cb_data);
+	return for_each_ref_in_submodule(submodule, "refs/bisect/good", fn, cb_data);
 }
 
 static void append_prune_data(const char ***prune_data, const char **av)
@@ -1466,6 +1466,10 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
 {
 	int i, flags, left, seen_dashdash, read_from_stdin, got_rev_arg = 0;
 	const char **prune_data = NULL;
+	const char *submodule = NULL;
+
+	if (opt)
+		submodule = opt->submodule;
 
 	/* First, search for "--" */
 	seen_dashdash = 0;
@@ -1490,26 +1494,26 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
 			int opts;
 
 			if (!strcmp(arg, "--all")) {
-				handle_refs(revs, flags, for_each_ref);
-				handle_refs(revs, flags, head_ref);
+				handle_refs(submodule, revs, flags, for_each_ref_submodule);
+				handle_refs(submodule, revs, flags, head_ref_submodule);
 				continue;
 			}
 			if (!strcmp(arg, "--branches")) {
-				handle_refs(revs, flags, for_each_branch_ref);
+				handle_refs(submodule, revs, flags, for_each_branch_ref_submodule);
 				continue;
 			}
 			if (!strcmp(arg, "--bisect")) {
-				handle_refs(revs, flags, for_each_bad_bisect_ref);
-				handle_refs(revs, flags ^ UNINTERESTING, for_each_good_bisect_ref);
+				handle_refs(submodule, revs, flags, for_each_bad_bisect_ref);
+				handle_refs(submodule, revs, flags ^ UNINTERESTING, for_each_good_bisect_ref);
 				revs->bisect = 1;
 				continue;
 			}
 			if (!strcmp(arg, "--tags")) {
-				handle_refs(revs, flags, for_each_tag_ref);
+				handle_refs(submodule, revs, flags, for_each_tag_ref_submodule);
 				continue;
 			}
 			if (!strcmp(arg, "--remotes")) {
-				handle_refs(revs, flags, for_each_remote_ref);
+				handle_refs(submodule, revs, flags, for_each_remote_ref_submodule);
 				continue;
 			}
 			if (!prefixcmp(arg, "--glob=")) {
diff --git a/revision.h b/revision.h
@@ -151,6 +151,7 @@ extern volatile show_early_output_fn_t show_early_output;
 struct setup_revision_opt {
 	const char *def;
 	void (*tweak)(struct rev_info *, struct setup_revision_opt *);
+	const char *submodule;
 };
 
 extern void init_revisions(struct rev_info *revs, const char *prefix);

Original file line number	Diff line number	Diff line change
`@@ -721,31 +721,62 @@ int head_ref(each_ref_fn fn, void *cb_data)`
`721`	`721`	`return do_head_ref(NULL, fn, cb_data);`
`722`	`722`	`}`
`723`	`723`
	`724`	`+int head_ref_submodule(const char submodule, each_ref_fn fn, void cb_data)`
	`725`	`+{`
	`726`	`+ return do_head_ref(submodule, fn, cb_data);`
	`727`	`+}`
	`728`	`+`
`724`	`729`	`int for_each_ref(each_ref_fn fn, void *cb_data)`
`725`	`730`	`{`
`726`	`731`	`return do_for_each_ref(NULL, "refs/", fn, 0, 0, cb_data);`
`727`	`732`	`}`
`728`	`733`
	`734`	`+int for_each_ref_submodule(const char submodule, each_ref_fn fn, void cb_data)`
	`735`	`+{`
	`736`	`+ return do_for_each_ref(submodule, "refs/", fn, 0, 0, cb_data);`
	`737`	`+}`
	`738`	`+`
`729`	`739`	`int for_each_ref_in(const char prefix, each_ref_fn fn, void cb_data)`
`730`	`740`	`{`
`731`	`741`	`return do_for_each_ref(NULL, prefix, fn, strlen(prefix), 0, cb_data);`
`732`	`742`	`}`
`733`	`743`
	`744`	`+int for_each_ref_in_submodule(const char submodule, const char prefix,`
	`745`	`+ each_ref_fn fn, void *cb_data)`
	`746`	`+{`
	`747`	`+ return do_for_each_ref(submodule, prefix, fn, strlen(prefix), 0, cb_data);`
	`748`	`+}`
	`749`	`+`
`734`	`750`	`int for_each_tag_ref(each_ref_fn fn, void *cb_data)`
`735`	`751`	`{`
`736`	`752`	`return for_each_ref_in("refs/tags/", fn, cb_data);`
`737`	`753`	`}`
`738`	`754`
	`755`	`+int for_each_tag_ref_submodule(const char submodule, each_ref_fn fn, void cb_data)`
	`756`	`+{`
	`757`	`+ return for_each_ref_in_submodule(submodule, "refs/tags/", fn, cb_data);`
	`758`	`+}`
	`759`	`+`
`739`	`760`	`int for_each_branch_ref(each_ref_fn fn, void *cb_data)`
`740`	`761`	`{`
`741`	`762`	`return for_each_ref_in("refs/heads/", fn, cb_data);`
`742`	`763`	`}`
`743`	`764`
	`765`	`+int for_each_branch_ref_submodule(const char submodule, each_ref_fn fn, void cb_data)`
	`766`	`+{`
	`767`	`+ return for_each_ref_in_submodule(submodule, "refs/heads/", fn, cb_data);`
	`768`	`+}`
	`769`	`+`
`744`	`770`	`int for_each_remote_ref(each_ref_fn fn, void *cb_data)`
`745`	`771`	`{`
`746`	`772`	`return for_each_ref_in("refs/remotes/", fn, cb_data);`
`747`	`773`	`}`
`748`	`774`
	`775`	`+int for_each_remote_ref_submodule(const char submodule, each_ref_fn fn, void cb_data)`
	`776`	`+{`
	`777`	`+ return for_each_ref_in_submodule(submodule, "refs/remotes/", fn, cb_data);`
	`778`	`+}`
	`779`	`+`
`749`	`780`	`int for_each_replace_ref(each_ref_fn fn, void *cb_data)`
`750`	`781`	`{`
`751`	`782`	`return do_for_each_ref(NULL, "refs/replace/", fn, 13, 0, cb_data);`
Original file line number	Diff line number	Diff line change
`@@ -820,12 +820,12 @@ static void init_all_refs_cb(struct all_refs_cb cb, struct rev_info revs,`
`820`	`820`	`cb->all_flags = flags;`
`821`	`821`	`}`
`822`	`822`
`823`		`-static void handle_refs(struct rev_info *revs, unsigned flags,`
`824`		`- int (for_each)(each_ref_fn, void ))`
	`823`	`+static void handle_refs(const char submodule, struct rev_info revs, unsigned flags,`
	`824`	`+ int (for_each)(const char , each_ref_fn, void *))`
`825`	`825`	`{`
`826`	`826`	`struct all_refs_cb cb;`
`827`	`827`	`init_all_refs_cb(&cb, revs, flags);`
`828`		`- for_each(handle_one_ref, &cb);`
	`828`	`+ for_each(submodule, handle_one_ref, &cb);`
`829`	`829`	`}`
`830`	`830`
`831`	`831`	`static void handle_one_reflog_commit(unsigned char sha1, void cb_data)`
`@@ -1417,14 +1417,14 @@ void parse_revision_opt(struct rev_info revs, struct parse_opt_ctx_t ctx,`
`1417`	`1417`	`ctx->argc -= n;`
`1418`	`1418`	`}`
`1419`	`1419`
`1420`		`-static int for_each_bad_bisect_ref(each_ref_fn fn, void *cb_data)`
	`1420`	`+static int for_each_bad_bisect_ref(const char submodule, each_ref_fn fn, void cb_data)`
`1421`	`1421`	`{`
`1422`		`- return for_each_ref_in("refs/bisect/bad", fn, cb_data);`
	`1422`	`+ return for_each_ref_in_submodule(submodule, "refs/bisect/bad", fn, cb_data);`
`1423`	`1423`	`}`
`1424`	`1424`
`1425`		`-static int for_each_good_bisect_ref(each_ref_fn fn, void *cb_data)`
	`1425`	`+static int for_each_good_bisect_ref(const char submodule, each_ref_fn fn, void cb_data)`
`1426`	`1426`	`{`
`1427`		`- return for_each_ref_in("refs/bisect/good", fn, cb_data);`
	`1427`	`+ return for_each_ref_in_submodule(submodule, "refs/bisect/good", fn, cb_data);`
`1428`	`1428`	`}`
`1429`	`1429`
`1430`	`1430`	`static void append_prune_data(const char *prune_data, const char av)`
`@@ -1466,6 +1466,10 @@ int setup_revisions(int argc, const char *argv, struct rev_info revs, struct s`
`1466`	`1466`	`{`
`1467`	`1467`	`int i, flags, left, seen_dashdash, read_from_stdin, got_rev_arg = 0;`
`1468`	`1468`	`const char **prune_data = NULL;`
	`1469`	`+ const char *submodule = NULL;`
	`1470`	`+`
	`1471`	`+ if (opt)`
	`1472`	`+ submodule = opt->submodule;`
`1469`	`1473`
`1470`	`1474`	`/* First, search for "--" */`
`1471`	`1475`	`seen_dashdash = 0;`
`@@ -1490,26 +1494,26 @@ int setup_revisions(int argc, const char *argv, struct rev_info revs, struct s`
`1490`	`1494`	`int opts;`
`1491`	`1495`
`1492`	`1496`	`if (!strcmp(arg, "--all")) {`
`1493`		`- handle_refs(revs, flags, for_each_ref);`
`1494`		`- handle_refs(revs, flags, head_ref);`
	`1497`	`+ handle_refs(submodule, revs, flags, for_each_ref_submodule);`
	`1498`	`+ handle_refs(submodule, revs, flags, head_ref_submodule);`
`1495`	`1499`	`continue;`
`1496`	`1500`	`}`
`1497`	`1501`	`if (!strcmp(arg, "--branches")) {`
`1498`		`- handle_refs(revs, flags, for_each_branch_ref);`
	`1502`	`+ handle_refs(submodule, revs, flags, for_each_branch_ref_submodule);`
`1499`	`1503`	`continue;`
`1500`	`1504`	`}`
`1501`	`1505`	`if (!strcmp(arg, "--bisect")) {`
`1502`		`- handle_refs(revs, flags, for_each_bad_bisect_ref);`
`1503`		`- handle_refs(revs, flags ^ UNINTERESTING, for_each_good_bisect_ref);`
	`1506`	`+ handle_refs(submodule, revs, flags, for_each_bad_bisect_ref);`
	`1507`	`+ handle_refs(submodule, revs, flags ^ UNINTERESTING, for_each_good_bisect_ref);`
`1504`	`1508`	`revs->bisect = 1;`
`1505`	`1509`	`continue;`
`1506`	`1510`	`}`
`1507`	`1511`	`if (!strcmp(arg, "--tags")) {`
`1508`		`- handle_refs(revs, flags, for_each_tag_ref);`
	`1512`	`+ handle_refs(submodule, revs, flags, for_each_tag_ref_submodule);`
`1509`	`1513`	`continue;`
`1510`	`1514`	`}`
`1511`	`1515`	`if (!strcmp(arg, "--remotes")) {`
`1512`		`- handle_refs(revs, flags, for_each_remote_ref);`
	`1516`	`+ handle_refs(submodule, revs, flags, for_each_remote_ref_submodule);`
`1513`	`1517`	`continue;`
`1514`	`1518`	`}`
`1515`	`1519`	`if (!prefixcmp(arg, "--glob=")) {`