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: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
index a9fac7c128c1eb45026965a79db1387a8bdb92de..15f90afc34f49ec2fa5219864e12af169c2b7e7b 100644 (file)
--- a/builtin/pack-objects.c
+++ b/builtin/pack-objects.c
@@ -3131,7 +3131,7 @@ static void get_object_list(int ac, const char **av)
                return;
 
        if (use_delta_islands)
                return;
 
        if (use_delta_islands)

-               load_delta_islands(the_repository);
+               load_delta_islands(the_repository, progress);

 
        if (prepare_revision_walk(&revs))
                die(_("revision walk setup failed"));
 
        if (prepare_revision_walk(&revs))
                die(_("revision walk setup failed"));

diff --git a/delta-islands.c b/delta-islands.c
index 2186bd0738ed2fcbe216cf24a6c99ed4dc4ccd9b..b959f6c380a6f42849db570cf0a51fed23f2b2a8 100644 (file)
--- a/delta-islands.c
+++ b/delta-islands.c
@@ -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();
        remote_islands = kh_init_str();
 {
        island_marks = kh_init_sha1();
        remote_islands = kh_init_str();


@@ -463,7 +463,8 @@ void load_delta_islands(struct repository *r)
        for_each_ref(find_island_for_ref, NULL);
        deduplicate_islands(r);
 
        for_each_ref(find_island_for_ref, NULL);
        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)

diff --git a/delta-islands.h b/delta-islands.h
index 3ac8045d8c528be81ac1cbefe9942c534e3c498a..eb0f952629fc0a6cdcc113e19a04ddaa54bb32dd 100644 (file)
--- a/delta-islands.h
+++ b/delta-islands.h
@@ -11,7 +11,7 @@ int in_same_island(const struct object_id *, const struct object_id *);
 void resolve_tree_islands(struct repository *r,
                          int progress,
                          struct packing_data *to_pack);
 void resolve_tree_islands(struct repository *r,
                          int progress,
                          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);
 int compute_pack_layers(struct packing_data *to_pack);
 
 void propagate_island_marks(struct commit *commit);
 int compute_pack_layers(struct packing_data *to_pack);