mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

each_ref_fn: change to take an object_id parameter

Browse Source 
Change typedef each_ref_fn to take a "const struct object_id *oid"
parameter instead of "const unsigned char *sha1".

To aid this transition, implement an adapter that can be used to wrap
old-style functions matching the old typedef, which is now called
"each_ref_sha1_fn"), and make such functions callable via the new
interface. This requires the old function and its cb_data to be
wrapped in a "struct each_ref_fn_sha1_adapter", and that object to be
used as the cb_data for an adapter function, each_ref_fn_adapter().

This is an enormous diff, but most of it consists of simple,
mechanical changes to the sites that call any of the "for_each_ref"
family of functions. Subsequent to this change, the call sites can be
rewritten one by one to use the new interface.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Michael Haggerty
2015-05-25 18:38:28 +00:00
committed by Junio C Hamano
parent 8353847e85
commit 2b2a5be394
36 changed files with 275 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
builtin/show-ref.c
View File

@ -109,8 +109,10 @@ static int exclude_existing(const char *match)
static struct string_list existing_refs = STRING_LIST_INIT_DUP;
char buf[1024];
int matchlen = match ? strlen(match) : 0;
struct each_ref_fn_sha1_adapter wrapped_add_existing =
{add_existing, &existing_refs};
for_each_ref(add_existing, &existing_refs);
for_each_ref(each_ref_fn_adapter, &wrapped_add_existing);
while (fgets(buf, sizeof(buf), stdin)) {
char *ref;
int len = strlen(buf);
@ -191,6 +193,9 @@ static const struct option show_ref_options[] = {
int cmd_show_ref(int argc, const char **argv, const char *prefix)
{
struct each_ref_fn_sha1_adapter wrapped_show_ref =
{show_ref, NULL};
if (argc == 2 && !strcmp(argv[1], "-h"))
usage_with_options(show_ref_usage, show_ref_options);
@ -225,8 +230,8 @@ int cmd_show_ref(int argc, const char **argv, const char *prefix)
}
if (show_head)
head_ref(show_ref, NULL);
for_each_ref(show_ref, NULL);
head_ref(each_ref_fn_adapter, &wrapped_show_ref);
for_each_ref(each_ref_fn_adapter, &wrapped_show_ref);
if (!found_match) {
if (verify && !quiet)
die("No match");