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

Merge branch 'ls/convert-filter-progress' 

The codepath to call external process filter for smudge/clean
operation learned to show the progress meter.

* ls/convert-filter-progress:
  convert: display progress for filtered objects that have been delayed
maint
Junio C Hamano 2017-09-10 17:08:22 +09:00
parent 8e36002add 52f1d62eb4
commit 7fbbd3ec0f
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
entry.c
View File

@ -3,6 +3,7 @@
#include "dir.h" #include "dir.h"
#include "streaming.h" #include "streaming.h"
#include "submodule.h" #include "submodule.h"
#include "progress.h"


static void create_directories(const char *path, int path_len, static void create_directories(const char *path, int path_len,
const struct checkout *state) const struct checkout *state)
@ -161,16 +162,22 @@ static int remove_available_paths(struct string_list_item *item, void *cb_data)
int finish_delayed_checkout(struct checkout *state) int finish_delayed_checkout(struct checkout *state)
{ {
int errs = 0; int errs = 0;
unsigned delayed_object_count;
off_t filtered_bytes = 0;
struct string_list_item *filter, *path; struct string_list_item *filter, *path;
struct progress *progress;
struct delayed_checkout *dco = state->delayed_checkout; struct delayed_checkout *dco = state->delayed_checkout;


if (!state->delayed_checkout) if (!state->delayed_checkout)
return errs; return errs;


dco->state = CE_RETRY; dco->state = CE_RETRY;
delayed_object_count = dco->paths.nr;
progress = start_delayed_progress(_("Filtering content"), delayed_object_count);
while (dco->filters.nr > 0) { while (dco->filters.nr > 0) {
for_each_string_list_item(filter, &dco->filters) { for_each_string_list_item(filter, &dco->filters) {
struct string_list available_paths = STRING_LIST_INIT_NODUP; struct string_list available_paths = STRING_LIST_INIT_NODUP;
display_progress(progress, delayed_object_count - dco->paths.nr);


if (!async_query_available_blobs(filter->string, &available_paths)) { if (!async_query_available_blobs(filter->string, &available_paths)) {
/* Filter reported an error */ /* Filter reported an error */
@ -216,11 +223,17 @@ int finish_delayed_checkout(struct checkout *state)
} }
ce = index_file_exists(state->istate, path->string, ce = index_file_exists(state->istate, path->string,
strlen(path->string), 0); strlen(path->string), 0);
errs |= (ce ? checkout_entry(ce, state, NULL) : 1); if (ce) {
errs |= checkout_entry(ce, state, NULL);
filtered_bytes += ce->ce_stat_data.sd_size;
display_throughput(progress, filtered_bytes);
} else
errs = 1;
} }
} }
string_list_remove_empty_items(&dco->filters, 0); string_list_remove_empty_items(&dco->filters, 0);
} }
stop_progress(&progress);
string_list_clear(&dco->filters, 0); string_list_clear(&dco->filters, 0);


/* At this point we should not have any delayed paths anymore. */ /* At this point we should not have any delayed paths anymore. */

2
unpack-trees.c
View File

@ -383,8 +383,8 @@ static int check_updates(struct unpack_trees_options *o)
} }
} }
} }
errs |= finish_delayed_checkout(&state);
stop_progress(&progress); stop_progress(&progress);
errs |= finish_delayed_checkout(&state);
if (o->update) if (o->update)
git_attr_set_direction(GIT_ATTR_CHECKIN, NULL); git_attr_set_direction(GIT_ATTR_CHECKIN, NULL);
return errs != 0; return errs != 0;