commit-graph: use string-list API for input

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

diff --git a/builtin/commit-graph.c b/builtin/commit-graph.c
index 9d108f43a907d2aafc3d27b3ecd35fab8586904f..ea28bc311a24e3d05af4ec3158b677819dd03e9b 100644 (file)
--- a/builtin/commit-graph.c
+++ b/builtin/commit-graph.c
@@ -119,13 +119,9 @@ static int graph_read(int argc, const char **argv)
 
 static int graph_write(int argc, const char **argv)
 {
 
 static int graph_write(int argc, const char **argv)
 {

-       const char **pack_indexes = NULL;
-       int packs_nr = 0;
-       const char **commit_hex = NULL;
-       int commits_nr = 0;
-       const char **lines = NULL;
-       int lines_nr = 0;
-       int lines_alloc = 0;
+       struct string_list *pack_indexes = NULL;
+       struct string_list *commit_hex = NULL;
+       struct string_list lines;

 
        static struct option builtin_commit_graph_write_options[] = {
                OPT_STRING(0, "object-dir", &opts.obj_dir,
 
        static struct option builtin_commit_graph_write_options[] = {
                OPT_STRING(0, "object-dir", &opts.obj_dir,


@@ -149,34 +145,25 @@ static int graph_write(int argc, const char **argv)
        if (!opts.obj_dir)
                opts.obj_dir = get_object_directory();
 
        if (!opts.obj_dir)
                opts.obj_dir = get_object_directory();
 

+       string_list_init(&lines, 0);

        if (opts.stdin_packs || opts.stdin_commits) {
                struct strbuf buf = STRBUF_INIT;
        if (opts.stdin_packs || opts.stdin_commits) {
                struct strbuf buf = STRBUF_INIT;

-               lines_nr = 0;
-               lines_alloc = 128;
-               ALLOC_ARRAY(lines, lines_alloc);
-
-               while (strbuf_getline(&buf, stdin) != EOF) {
-                       ALLOC_GROW(lines, lines_nr + 1, lines_alloc);
-                       lines[lines_nr++] = strbuf_detach(&buf, NULL);
-               }
-
-               if (opts.stdin_packs) {
-                       pack_indexes = lines;
-                       packs_nr = lines_nr;
-               }
-               if (opts.stdin_commits) {
-                       commit_hex = lines;
-                       commits_nr = lines_nr;
-               }
+
+               while (strbuf_getline(&buf, stdin) != EOF)
+                       string_list_append(&lines, strbuf_detach(&buf, NULL));
+
+               if (opts.stdin_packs)
+                       pack_indexes = &lines;
+               if (opts.stdin_commits)
+                       commit_hex = &lines;

        }
 
        write_commit_graph(opts.obj_dir,
                           pack_indexes,
        }
 
        write_commit_graph(opts.obj_dir,
                           pack_indexes,

-                          packs_nr,

                           commit_hex,
                           commit_hex,

-                          commits_nr,

                           opts.append);
 
                           opts.append);
 

+       string_list_clear(&lines, 0);

        return 0;
 }
 
        return 0;
 }
 

diff --git a/commit-graph.c b/commit-graph.c
index aca9e5e2dc994fdd4febce79982efd323f6558db..5b7fa707a5201b8b376463e220cdb53d96f660b8 100644 (file)
--- a/commit-graph.c
+++ b/commit-graph.c
@@ -657,10 +657,8 @@ static void compute_generation_numbers(struct packed_commit_list* commits)
 }
 
 void write_commit_graph(const char *obj_dir,
 }
 
 void write_commit_graph(const char *obj_dir,

-                       const char **pack_indexes,
-                       int nr_packs,
-                       const char **commit_hex,
-                       int nr_commits,
+                       struct string_list *pack_indexes,
+                       struct string_list *commit_hex,

                        int append)
 {
        struct packed_oid_list oids;
                        int append)
 {
        struct packed_oid_list oids;


@@ -701,10 +699,10 @@ void write_commit_graph(const char *obj_dir,
                int dirlen;
                strbuf_addf(&packname, "%s/pack/", obj_dir);
                dirlen = packname.len;
                int dirlen;
                strbuf_addf(&packname, "%s/pack/", obj_dir);
                dirlen = packname.len;

-               for (i = 0; i < nr_packs; i++) {
+               for (i = 0; i < pack_indexes->nr; i++) {

                        struct packed_git *p;
                        strbuf_setlen(&packname, dirlen);
                        struct packed_git *p;
                        strbuf_setlen(&packname, dirlen);

-                       strbuf_addstr(&packname, pack_indexes[i]);
+                       strbuf_addstr(&packname, pack_indexes->items[i].string);

                        p = add_packed_git(packname.buf, packname.len, 1);
                        if (!p)
                                die("error adding pack %s", packname.buf);
                        p = add_packed_git(packname.buf, packname.len, 1);
                        if (!p)
                                die("error adding pack %s", packname.buf);


@@ -717,12 +715,13 @@ void write_commit_graph(const char *obj_dir,
        }
 
        if (commit_hex) {
        }
 
        if (commit_hex) {

-               for (i = 0; i < nr_commits; i++) {
+               for (i = 0; i < commit_hex->nr; i++) {

                        const char *end;
                        struct object_id oid;
                        struct commit *result;
 
                        const char *end;
                        struct object_id oid;
                        struct commit *result;
 

-                       if (commit_hex[i] && parse_oid_hex(commit_hex[i], &oid, &end))
+                       if (commit_hex->items[i].string &&
+                           parse_oid_hex(commit_hex->items[i].string, &oid, &end))

                                continue;
 
                        result = lookup_commit_reference_gently(&oid, 1);
                                continue;
 
                        result = lookup_commit_reference_gently(&oid, 1);

diff --git a/commit-graph.h b/commit-graph.h
index 4359812fb4dc53bc5d03e13085685832a8bff79e..a79b8544705d52e8f69c4441dceaa70a549dc720 100644 (file)
--- a/commit-graph.h
+++ b/commit-graph.h
@@ -3,6 +3,7 @@
 
 #include "git-compat-util.h"
 #include "repository.h"
 
 #include "git-compat-util.h"
 #include "repository.h"

+#include "string-list.h"

 
 char *get_commit_graph_filename(const char *obj_dir);
 
 
 char *get_commit_graph_filename(const char *obj_dir);
 


@@ -48,10 +49,8 @@ struct commit_graph {
 struct commit_graph *load_commit_graph_one(const char *graph_file);
 
 void write_commit_graph(const char *obj_dir,
 struct commit_graph *load_commit_graph_one(const char *graph_file);
 
 void write_commit_graph(const char *obj_dir,

-                       const char **pack_indexes,
-                       int nr_packs,
-                       const char **commit_hex,
-                       int nr_commits,
+                       struct string_list *pack_indexes,
+                       struct string_list *commit_hex,

                        int append);
 
 int verify_commit_graph(struct repository *r, struct commit_graph *g);
                        int append);
 
 int verify_commit_graph(struct repository *r, struct commit_graph *g);