commit-graph: extract fill_oids_from_all_packs()
authorDerrick Stolee <dstolee@microsoft.com>
Wed, 12 Jun 2019 13:29:42 +0000 (06:29 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 12 Jun 2019 18:20:54 +0000 (11:20 -0700)
The write_commit_graph() method is too complex, so we are
extracting helper functions one by one.

Extract fill_oids_from_all_packs() that reads all pack-files
for commits and fills the oid list in the context.

Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit-graph.c

index 4fae1fc..61cb43d 100644 (file)
@@ -950,6 +950,19 @@ static void fill_oids_from_commit_hex(struct write_commit_graph_context *ctx,
        strbuf_release(&progress_title);
 }
 
        strbuf_release(&progress_title);
 }
 
+static void fill_oids_from_all_packs(struct write_commit_graph_context *ctx)
+{
+       if (ctx->report_progress)
+               ctx->progress = start_delayed_progress(
+                       _("Finding commits for commit graph among packed objects"),
+                       ctx->approx_nr_objects);
+       for_each_packed_object(add_packed_commits, ctx,
+                              FOR_EACH_OBJECT_PACK_ORDER);
+       if (ctx->progress_done < ctx->approx_nr_objects)
+               display_progress(ctx->progress, ctx->approx_nr_objects);
+       stop_progress(&ctx->progress);
+}
+
 int write_commit_graph(const char *obj_dir,
                       struct string_list *pack_indexes,
                       struct string_list *commit_hex,
 int write_commit_graph(const char *obj_dir,
                       struct string_list *pack_indexes,
                       struct string_list *commit_hex,
@@ -1006,17 +1019,8 @@ int write_commit_graph(const char *obj_dir,
        if (commit_hex)
                fill_oids_from_commit_hex(ctx, commit_hex);
 
        if (commit_hex)
                fill_oids_from_commit_hex(ctx, commit_hex);
 
-       if (!pack_indexes && !commit_hex) {
-               if (ctx->report_progress)
-                       ctx->progress = start_delayed_progress(
-                               _("Finding commits for commit graph among packed objects"),
-                               ctx->approx_nr_objects);
-               for_each_packed_object(add_packed_commits, ctx,
-                                      FOR_EACH_OBJECT_PACK_ORDER);
-               if (ctx->progress_done < ctx->approx_nr_objects)
-                       display_progress(ctx->progress, ctx->approx_nr_objects);
-               stop_progress(&ctx->progress);
-       }
+       if (!pack_indexes && !commit_hex)
+               fill_oids_from_all_packs(ctx);
 
        close_reachable(ctx);
 
 
        close_reachable(ctx);