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

15
submodule.c
View File

@ -429,10 +429,13 @@ static int has_remote(const char *refname, const unsigned char *sha1, int flags,
static int submodule_needs_pushing(const char *path, const unsigned char sha1[20])
{
struct each_ref_fn_sha1_adapter wrapped_has_remote =
{has_remote, NULL};
if (add_submodule_odb(path) || !lookup_commit_reference(sha1))
return 0;
if (for_each_remote_ref_submodule(path, has_remote, NULL) > 0) {
if (for_each_remote_ref_submodule(path, each_ref_fn_adapter, &wrapped_has_remote) > 0) {
struct child_process cp = CHILD_PROCESS_INIT;
const char *argv[] = {"rev-list", NULL, "--not", "--remotes", "-n", "1" , NULL};
struct strbuf buf = STRBUF_INIT;
@ -519,10 +522,13 @@ int find_unpushed_submodules(unsigned char new_sha1[20],
static int push_submodule(const char *path)
{
struct each_ref_fn_sha1_adapter wrapped_has_remote =
{has_remote, NULL};
if (add_submodule_odb(path))
return 1;
if (for_each_remote_ref_submodule(path, has_remote, NULL) > 0) {
if (for_each_remote_ref_submodule(path, each_ref_fn_adapter, &wrapped_has_remote) > 0) {
struct child_process cp = CHILD_PROCESS_INIT;
const char *argv[] = {"push", NULL};
@ -626,7 +632,10 @@ static int add_sha1_to_array(const char *ref, const unsigned char *sha1,
void check_for_new_submodule_commits(unsigned char new_sha1[20])
{
if (!initialized_fetch_ref_tips) {
for_each_ref(add_sha1_to_array, &ref_tips_before_fetch);
struct each_ref_fn_sha1_adapter wrapped_add_sha1_to_array =
{add_sha1_to_array, &ref_tips_before_fetch};
for_each_ref(each_ref_fn_adapter, &wrapped_add_sha1_to_array);
initialized_fetch_ref_tips = 1;
}