提交 bdbdf42f 编写于 作者: J Jeff King 提交者: Junio C Hamano

delta-islands: respect progress flag

The delta island code always prints "Marked %d islands", even if
progress has been suppressed with --no-progress or by sending stderr to
a non-tty.

Let's pass a progress boolean to load_delta_islands(). We already do
the same thing for the progress meter in resolve_tree_islands().
Signed-off-by: NJeff King <peff@peff.net>
Signed-off-by: NJunio C Hamano <gitster@pobox.com>
上级 aeb582a9
...@@ -3131,7 +3131,7 @@ static void get_object_list(int ac, const char **av) ...@@ -3131,7 +3131,7 @@ static void get_object_list(int ac, const char **av)
return; return;
if (use_delta_islands) if (use_delta_islands)
load_delta_islands(the_repository); load_delta_islands(the_repository, progress);
if (prepare_revision_walk(&revs)) if (prepare_revision_walk(&revs))
die(_("revision walk setup failed")); die(_("revision walk setup failed"));
......
...@@ -454,7 +454,7 @@ static void deduplicate_islands(struct repository *r) ...@@ -454,7 +454,7 @@ static void deduplicate_islands(struct repository *r)
free(list); free(list);
} }
void load_delta_islands(struct repository *r) void load_delta_islands(struct repository *r, int progress)
{ {
island_marks = kh_init_sha1(); island_marks = kh_init_sha1();
remote_islands = kh_init_str(); remote_islands = kh_init_str();
...@@ -463,7 +463,8 @@ void load_delta_islands(struct repository *r) ...@@ -463,7 +463,8 @@ void load_delta_islands(struct repository *r)
for_each_ref(find_island_for_ref, NULL); for_each_ref(find_island_for_ref, NULL);
deduplicate_islands(r); deduplicate_islands(r);
fprintf(stderr, _("Marked %d islands, done.\n"), island_counter); if (progress)
fprintf(stderr, _("Marked %d islands, done.\n"), island_counter);
} }
void propagate_island_marks(struct commit *commit) void propagate_island_marks(struct commit *commit)
......
...@@ -11,7 +11,7 @@ int in_same_island(const struct object_id *, const struct object_id *); ...@@ -11,7 +11,7 @@ int in_same_island(const struct object_id *, const struct object_id *);
void resolve_tree_islands(struct repository *r, void resolve_tree_islands(struct repository *r,
int progress, int progress,
struct packing_data *to_pack); struct packing_data *to_pack);
void load_delta_islands(struct repository *r); void load_delta_islands(struct repository *r, int progress);
void propagate_island_marks(struct commit *commit); void propagate_island_marks(struct commit *commit);
int compute_pack_layers(struct packing_data *to_pack); int compute_pack_layers(struct packing_data *to_pack);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册