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

builtin/submodule--helper: store update_clone information in a struct

Browse Source 
The information that is printed for update_submodules in
'submodule--helper update-clone' and consumed by 'git submodule update'
is stored as a string per submodule. This made sense at the time of
48308681b0 (git submodule update: have a dedicated helper for cloning,
2016-02-29), but as we want to migrate the rest of the submodule update
into C, we're better off having access to the raw information in a helper
struct.

Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Stefan Beller 2018-08-03 15:23:19 -07:00 committed by Junio C Hamano
parent 90efe595c5
commit f1d15713fa
1 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
builtin/submodule--helper.c
View File

@ -1446,6 +1446,12 @@ static int module_clone(int argc, const char **argv, const char *prefix)
return 0; return 0;
} }
struct update_clone_data {
const struct submodule *sub;
struct object_id oid;
unsigned just_cloned;
};
struct submodule_update_clone { struct submodule_update_clone {
/* index into 'list', the list of submodules to look into for cloning */ /* index into 'list', the list of submodules to look into for cloning */
int current; int current;
@ -1465,8 +1471,9 @@ struct submodule_update_clone {
const char *recursive_prefix; const char *recursive_prefix;
const char *prefix; const char *prefix;
/* Machine-readable status lines to be consumed by git-submodule.sh */ /* to be consumed by git-submodule.sh */
struct string_list projectlines; struct update_clone_data *update_clone;
int update_clone_nr; int update_clone_alloc;
/* If we want to stop as fast as possible and return an error */ /* If we want to stop as fast as possible and return an error */
unsigned quickstop : 1; unsigned quickstop : 1;
@ -1480,7 +1487,7 @@ struct submodule_update_clone {
#define SUBMODULE_UPDATE_CLONE_INIT {0, MODULE_LIST_INIT, 0, \ #define SUBMODULE_UPDATE_CLONE_INIT {0, MODULE_LIST_INIT, 0, \
SUBMODULE_UPDATE_STRATEGY_INIT, 0, 0, -1, STRING_LIST_INIT_DUP, 0, \ SUBMODULE_UPDATE_STRATEGY_INIT, 0, 0, -1, STRING_LIST_INIT_DUP, 0, \
NULL, NULL, NULL, \ NULL, NULL, NULL, \
STRING_LIST_INIT_DUP, 0, NULL, 0, 0} NULL, 0, 0, 0, NULL, 0, 0, 0}
static void next_submodule_warn_missing(struct submodule_update_clone *suc, static void next_submodule_warn_missing(struct submodule_update_clone *suc,
@ -1574,10 +1581,12 @@ static int prepare_to_clone_next_submodule(const struct cache_entry *ce,
strbuf_addf(&sb, "%s/.git", ce->name); strbuf_addf(&sb, "%s/.git", ce->name);
needs_cloning = !file_exists(sb.buf); needs_cloning = !file_exists(sb.buf);
strbuf_reset(&sb); ALLOC_GROW(suc->update_clone, suc->update_clone_nr + 1,
strbuf_addf(&sb, "dummy %s %d\t%s\n", suc->update_clone_alloc);
oid_to_hex(&ce->oid), needs_cloning, ce->name); oidcpy(&suc->update_clone[suc->update_clone_nr].oid, &ce->oid);
string_list_append(&suc->projectlines, sb.buf); suc->update_clone[suc->update_clone_nr].just_cloned = needs_cloning;
suc->update_clone[suc->update_clone_nr].sub = sub;
suc->update_clone_nr++;
if (!needs_cloning) if (!needs_cloning)
goto cleanup; goto cleanup;
@ -1720,7 +1729,8 @@ static int git_update_clone_config(const char *var, const char *value,
static int update_submodules(struct submodule_update_clone *suc) static int update_submodules(struct submodule_update_clone *suc)
{ {
struct string_list_item *item; int i;
struct strbuf sb = STRBUF_INIT;
run_processes_parallel(suc->max_jobs, run_processes_parallel(suc->max_jobs,
update_clone_get_next_task, update_clone_get_next_task,
@ -1739,9 +1749,16 @@ static int update_submodules(struct submodule_update_clone *suc)
if (suc->quickstop) if (suc->quickstop)
return 1; return 1;
for_each_string_list_item(item, &suc->projectlines) for (i = 0; i < suc->update_clone_nr; i++) {
fprintf(stdout, "%s", item->string); strbuf_addf(&sb, "dummy %s %d\t%s\n",
oid_to_hex(&suc->update_clone[i].oid),
suc->update_clone[i].just_cloned,
suc->update_clone[i].sub->path);
fprintf(stdout, "%s", sb.buf);
strbuf_reset(&sb);
}
strbuf_release(&sb);
return 0; return 0;
} }