kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

unpack-trees: factor progress setup out of check_updates 

This makes check_updates shorter and easier to understand.

Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Stefan Beller 2017-01-09 11:46:19 -08:00 committed by Junio C Hamano
parent c4bfc7728b
commit 384f1a167b
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
unpack-trees.c
View File

@ -218,9 +218,27 @@ static void unlink_entry(const struct cache_entry *ce)
schedule_dir_for_removal(ce->name, ce_namelen(ce)); schedule_dir_for_removal(ce->name, ce_namelen(ce));
} }


static int check_updates(struct unpack_trees_options *o) static struct progress *get_progress(struct unpack_trees_options *o)
{ {
unsigned cnt = 0, total = 0; unsigned cnt = 0, total = 0;
struct index_state *index = &o->result;

if (!o->update || !o->verbose_update)
return NULL;

for (; cnt < index->cache_nr; cnt++) {
const struct cache_entry *ce = index->cache[cnt];
if (ce->ce_flags & (CE_UPDATE | CE_WT_REMOVE))
total++;
}

return start_progress_delay(_("Checking out files"),
total, 50, 1);
}

static int check_updates(struct unpack_trees_options *o)
{
unsigned cnt = 0;
int errs = 0; int errs = 0;
struct progress *progress = NULL; struct progress *progress = NULL;
struct index_state *index = &o->result; struct index_state *index = &o->result;
@ -232,17 +250,7 @@ static int check_updates(struct unpack_trees_options *o)
state.refresh_cache = 1; state.refresh_cache = 1;
state.istate = index; state.istate = index;


if (o->update && o->verbose_update) { progress = get_progress(o);
for (total = cnt = 0; cnt < index->cache_nr; cnt++) {
const struct cache_entry *ce = index->cache[cnt];
if (ce->ce_flags & (CE_UPDATE | CE_WT_REMOVE))
total++;
}

progress = start_progress_delay(_("Checking out files"),
total, 50, 1);
cnt = 0;
}


if (o->update) if (o->update)
git_attr_set_direction(GIT_ATTR_CHECKOUT, index); git_attr_set_direction(GIT_ATTR_CHECKOUT, index);