revision: export commit_stack

Dynamic arrays of commit pointers are used in several places.  Some of
them use a custom struct to hold array, item count and capacity, others
have them as separate variables linked by a common name part.

Pick one succinct, clean implementation -- commit_stack -- and convert
the different variants to it to reduce code duplication.

Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/commit.c b/commit.c
index 709c9eed58a790194e0f7e6555e84844c6e67a26..f2edafa49cf09e823513673a1e3f4bdc784339a8 100644 (file)
--- a/commit.c
+++ b/commit.c
@@ -1981,3 +1981,20 @@ int run_commit_hook(int editor_is_used, const char *index_file,
        opt.invoked_hook = invoked_hook;
        return run_hooks_opt(the_repository, name, &opt);
 }
+
+void commit_stack_push(struct commit_stack *stack, struct commit *commit)
+{
+       ALLOC_GROW(stack->items, stack->nr + 1, stack->alloc);
+       stack->items[stack->nr++] = commit;
+}
+
+struct commit *commit_stack_pop(struct commit_stack *stack)
+{
+       return stack->nr ? stack->items[--stack->nr] : NULL;
+}
+
+void commit_stack_clear(struct commit_stack *stack)
+{
+       FREE_AND_NULL(stack->items);
+       stack->nr = stack->alloc = 0;
+}

diff --git a/commit.h b/commit.h
index 5406dd266327d4e3c3141c05c099d1bee9e0b999..81e047f820acb45837c5f3613b083255b24b9371 100644 (file)
--- a/commit.h
+++ b/commit.h
@@ -381,4 +381,14 @@ int parse_buffer_signed_by_header(const char *buffer,
                                  const struct git_hash_algo *algop);
 int add_header_signature(struct strbuf *buf, struct strbuf *sig, const struct git_hash_algo *algo);
 
+struct commit_stack {
+       struct commit **items;
+       size_t nr, alloc;
+};
+#define COMMIT_STACK_INIT { 0 }
+
+void commit_stack_push(struct commit_stack *, struct commit *);
+struct commit *commit_stack_pop(struct commit_stack *);
+void commit_stack_clear(struct commit_stack *);
+
 #endif /* COMMIT_H */

diff --git a/revision.c b/revision.c
index 5f0850ae5c9c1aec7838b0a9e05e2951a6f50fdd..1858e093eeeb89e0cad0422c9bda909d5b96593f 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -250,29 +250,6 @@ void mark_trees_uninteresting_sparse(struct repository *r,
        paths_and_oids_clear(&map);
 }
 
-struct commit_stack {
-       struct commit **items;
-       size_t nr, alloc;
-};
-#define COMMIT_STACK_INIT { 0 }
-
-static void commit_stack_push(struct commit_stack *stack, struct commit *commit)
-{
-       ALLOC_GROW(stack->items, stack->nr + 1, stack->alloc);
-       stack->items[stack->nr++] = commit;
-}
-
-static struct commit *commit_stack_pop(struct commit_stack *stack)
-{
-       return stack->nr ? stack->items[--stack->nr] : NULL;
-}
-
-static void commit_stack_clear(struct commit_stack *stack)
-{
-       FREE_AND_NULL(stack->items);
-       stack->nr = stack->alloc = 0;
-}
-
 static void mark_one_parent_uninteresting(struct rev_info *revs, struct commit *commit,
                                          struct commit_stack *pending)
 {