From 30ac275b1c893697e25abefbd872de534bb8c046 Mon Sep 17 00:00:00 2001 From: Stefan Beller Date: Mon, 9 Jan 2017 11:46:17 -0800 Subject: unpack-trees: move checkout state into check_updates MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The checkout state was introduced via 16da134b1f9 (read-trees: refactor the unpack_trees() part, 2006-07-30). An attempt to refactor the checkout state was done in b56aa5b268e (unpack-trees: pass checkout state explicitly to check_updates(), 2016-09-13), but we can go even further. The `struct checkout state` is not used in unpack_trees apart from initializing it, so move it into the function that makes use of it, which is `check_updates`. Signed-off-by: Stefan Beller Reviewed-by: René Scharfe Signed-off-by: Junio C Hamano --- unpack-trees.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'unpack-trees.c') diff --git a/unpack-trees.c b/unpack-trees.c index ea6bdd20e..b6f0bc6d4 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -218,14 +218,19 @@ static void unlink_entry(const struct cache_entry *ce) schedule_dir_for_removal(ce->name, ce_namelen(ce)); } -static int check_updates(struct unpack_trees_options *o, - const struct checkout *state) +static int check_updates(struct unpack_trees_options *o) { unsigned cnt = 0, total = 0; + int errs = 0; struct progress *progress = NULL; struct index_state *index = &o->result; + struct checkout state = CHECKOUT_INIT; int i; - int errs = 0; + + state.force = 1; + state.quiet = 1; + state.refresh_cache = 1; + state.istate = index; if (o->update && o->verbose_update) { for (total = cnt = 0; cnt < index->cache_nr; cnt++) { @@ -240,7 +245,7 @@ static int check_updates(struct unpack_trees_options *o, } if (o->update) - git_attr_set_direction(GIT_ATTR_CHECKOUT, &o->result); + git_attr_set_direction(GIT_ATTR_CHECKOUT, index); for (i = 0; i < index->cache_nr; i++) { const struct cache_entry *ce = index->cache[i]; @@ -251,7 +256,7 @@ static int check_updates(struct unpack_trees_options *o, continue; } } - remove_marked_cache_entries(&o->result); + remove_marked_cache_entries(index); remove_scheduled_dirs(); for (i = 0; i < index->cache_nr; i++) { @@ -264,7 +269,7 @@ static int check_updates(struct unpack_trees_options *o, display_progress(progress, ++cnt); ce->ce_flags &= ~CE_UPDATE; if (o->update && !o->dry_run) { - errs |= checkout_entry(ce, state, NULL); + errs |= checkout_entry(ce, &state, NULL); } } } @@ -1094,14 +1099,9 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options int i, ret; static struct cache_entry *dfc; struct exclude_list el; - struct checkout state = CHECKOUT_INIT; if (len > MAX_UNPACK_TREES) die("unpack_trees takes at most %d trees", MAX_UNPACK_TREES); - state.force = 1; - state.quiet = 1; - state.refresh_cache = 1; - state.istate = &o->result; memset(&el, 0, sizeof(el)); if (!core_apply_sparse_checkout || !o->update) @@ -1238,7 +1238,7 @@ int unpack_trees(unsigned len, struct tree_desc *t, struct unpack_trees_options } o->src_index = NULL; - ret = check_updates(o, &state) ? (-2) : 0; + ret = check_updates(o) ? (-2) : 0; if (o->dst_index) { if (!ret) { if (!o->result.cache_tree) -- cgit v1.2.1 From c4bfc7728b32294c33661c16a861419290549a2b Mon Sep 17 00:00:00 2001 From: Stefan Beller Date: Mon, 9 Jan 2017 11:46:18 -0800 Subject: unpack-trees: remove unneeded continue The continue is the last statement in the loop, so not needed. This situation arose in 700e66d66 (2010-07-30, unpack-trees: let read-tree -u remove index entries outside sparse area) when statements after the continue were removed. Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano --- unpack-trees.c | 1 - 1 file changed, 1 deletion(-) (limited to 'unpack-trees.c') diff --git a/unpack-trees.c b/unpack-trees.c index b6f0bc6d4..9e48a4048 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -253,7 +253,6 @@ static int check_updates(struct unpack_trees_options *o) display_progress(progress, ++cnt); if (o->update && !o->dry_run) unlink_entry(ce); - continue; } } remove_marked_cache_entries(index); -- cgit v1.2.1 From 384f1a167bdf0b68f90ec54e9845c1b4a68cb670 Mon Sep 17 00:00:00 2001 From: Stefan Beller Date: Mon, 9 Jan 2017 11:46:19 -0800 Subject: unpack-trees: factor progress setup out of check_updates This makes check_updates shorter and easier to understand. Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano --- unpack-trees.c | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) (limited to 'unpack-trees.c') diff --git a/unpack-trees.c b/unpack-trees.c index 9e48a4048..b90c54072 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -218,9 +218,27 @@ static void unlink_entry(const struct cache_entry *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; + 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; struct progress *progress = NULL; struct index_state *index = &o->result; @@ -232,17 +250,7 @@ static int check_updates(struct unpack_trees_options *o) state.refresh_cache = 1; state.istate = index; - if (o->update && o->verbose_update) { - 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; - } + progress = get_progress(o); if (o->update) git_attr_set_direction(GIT_ATTR_CHECKOUT, index); -- cgit v1.2.1