commit/revisions: bookkeeping before refactoring

There are a few things that need to move around a little before
making a big refactoring in the topo-order logic:

1. We need access to record_author_date() and
compare_commits_by_author_date() in revision.c. These are used
currently by sort_in_topological_order() in commit.c.

2. Moving these methods to commit.h requires adding an author_date_slab
declaration to commit.h. Consumers will need their own implementation.

3. The add_parents_to_list() method in revision.c performs logic
around the UNINTERESTING flag and other special cases depending
on the struct rev_info. Allow this method to ignore a NULL 'list'
parameter, as we will not be populating the list for our walk.
Also rename the method to the slightly more generic name
process_parents() to make clear that this method does more than
add to a list (and no list is required anymore).

Helped-by: Jeff King <peff@peff.net>
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/commit.c b/commit.c
index d0f199e12286983c3f9f23b6567dc78a2ceeaf79..a025a0db6079f6cc6fce122fceabbc2db355732f 100644 (file)
--- a/commit.c
+++ b/commit.c
@@ -655,11 +655,10 @@ struct commit *pop_commit(struct commit_list **stack)
 /* count number of children that have not been emitted */
 define_commit_slab(indegree_slab, int);
 
 /* count number of children that have not been emitted */
 define_commit_slab(indegree_slab, int);
 

-/* record author-date for each commit object */

 define_commit_slab(author_date_slab, timestamp_t);
 
 define_commit_slab(author_date_slab, timestamp_t);
 

-static void record_author_date(struct author_date_slab *author_date,
-                              struct commit *commit)
+void record_author_date(struct author_date_slab *author_date,
+                       struct commit *commit)

 {
        const char *buffer = get_commit_buffer(commit, NULL);
        struct ident_split ident;
 {
        const char *buffer = get_commit_buffer(commit, NULL);
        struct ident_split ident;


@@ -684,8 +683,8 @@ static void record_author_date(struct author_date_slab *author_date,
        unuse_commit_buffer(commit, buffer);
 }
 
        unuse_commit_buffer(commit, buffer);
 }
 

-static int compare_commits_by_author_date(const void *a_, const void *b_,
-                                         void *cb_data)
+int compare_commits_by_author_date(const void *a_, const void *b_,
+                                  void *cb_data)

 {
        const struct commit *a = a_, *b = b_;
        struct author_date_slab *author_date = cb_data;
 {
        const struct commit *a = a_, *b = b_;
        struct author_date_slab *author_date = cb_data;

diff --git a/commit.h b/commit.h
index 2b1a73438873f20e2c9e570121a2e024d7762fbe..ec5b9093adf4b7a17a2387d8da7aca4cadade78f 100644 (file)
--- a/commit.h
+++ b/commit.h
@@ -8,6 +8,7 @@
 #include "gpg-interface.h"
 #include "string-list.h"
 #include "pretty.h"
 #include "gpg-interface.h"
 #include "string-list.h"
 #include "pretty.h"

+#include "commit-slab.h"

 
 #define COMMIT_NOT_FROM_GRAPH 0xFFFFFFFF
 #define GENERATION_NUMBER_INFINITY 0xFFFFFFFF
 
 #define COMMIT_NOT_FROM_GRAPH 0xFFFFFFFF
 #define GENERATION_NUMBER_INFINITY 0xFFFFFFFF


@@ -328,6 +329,12 @@ extern int remove_signature(struct strbuf *buf);
  */
 extern int check_commit_signature(const struct commit *commit, struct signature_check *sigc);
 
  */
 extern int check_commit_signature(const struct commit *commit, struct signature_check *sigc);
 

+/* record author-date for each commit object */
+struct author_date_slab;
+void record_author_date(struct author_date_slab *author_date,
+                       struct commit *commit);
+
+int compare_commits_by_author_date(const void *a_, const void *b_, void *unused);

 int compare_commits_by_commit_date(const void *a_, const void *b_, void *unused);
 int compare_commits_by_gen_then_commit_date(const void *a_, const void *b_, void *unused);
 
 int compare_commits_by_commit_date(const void *a_, const void *b_, void *unused);
 int compare_commits_by_gen_then_commit_date(const void *a_, const void *b_, void *unused);
 

diff --git a/revision.c b/revision.c
index 2dcde8a8ac7926991faf23b650c2f6ada17d7e5a..36458265a01bf0aa7f7e8c081e49dadb1882c2ce 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -768,8 +768,8 @@ static void commit_list_insert_by_date_cached(struct commit *p, struct commit_li
                *cache = new_entry;
 }
 
                *cache = new_entry;
 }
 

-static int add_parents_to_list(struct rev_info *revs, struct commit *commit,
-                   struct commit_list **list, struct commit_list **cache_ptr)
+static int process_parents(struct rev_info *revs, struct commit *commit,
+                          struct commit_list **list, struct commit_list **cache_ptr)

 {
        struct commit_list *parent = commit->parents;
        unsigned left_flag;
 {
        struct commit_list *parent = commit->parents;
        unsigned left_flag;


@@ -808,7 +808,8 @@ static int add_parents_to_list(struct rev_info *revs, struct commit *commit,
                        if (p->object.flags & SEEN)
                                continue;
                        p->object.flags |= SEEN;
                        if (p->object.flags & SEEN)
                                continue;
                        p->object.flags |= SEEN;

-                       commit_list_insert_by_date_cached(p, list, cached_base, cache_ptr);
+                       if (list)
+                               commit_list_insert_by_date_cached(p, list, cached_base, cache_ptr);

                }
                return 0;
        }
                }
                return 0;
        }


@@ -847,7 +848,8 @@ static int add_parents_to_list(struct rev_info *revs, struct commit *commit,
                p->object.flags |= left_flag;
                if (!(p->object.flags & SEEN)) {
                        p->object.flags |= SEEN;
                p->object.flags |= left_flag;
                if (!(p->object.flags & SEEN)) {
                        p->object.flags |= SEEN;

-                       commit_list_insert_by_date_cached(p, list, cached_base, cache_ptr);
+                       if (list)
+                               commit_list_insert_by_date_cached(p, list, cached_base, cache_ptr);

                }
                if (revs->first_parent_only)
                        break;
                }
                if (revs->first_parent_only)
                        break;


@@ -1091,7 +1093,7 @@ static int limit_list(struct rev_info *revs)
 
                if (revs->max_age != -1 && (commit->date < revs->max_age))
                        obj->flags |= UNINTERESTING;
 
                if (revs->max_age != -1 && (commit->date < revs->max_age))
                        obj->flags |= UNINTERESTING;

-               if (add_parents_to_list(revs, commit, &list, NULL) < 0)
+               if (process_parents(revs, commit, &list, NULL) < 0)

                        return -1;
                if (obj->flags & UNINTERESTING) {
                        mark_parents_uninteresting(commit);
                        return -1;
                if (obj->flags & UNINTERESTING) {
                        mark_parents_uninteresting(commit);


@@ -2913,7 +2915,7 @@ static struct commit *next_topo_commit(struct rev_info *revs)
 
 static void expand_topo_walk(struct rev_info *revs, struct commit *commit)
 {
 
 static void expand_topo_walk(struct rev_info *revs, struct commit *commit)
 {

-       if (add_parents_to_list(revs, commit, &revs->commits, NULL) < 0) {
+       if (process_parents(revs, commit, &revs->commits, NULL) < 0) {

                if (!revs->ignore_missing_links)
                        die("Failed to traverse parents of commit %s",
                            oid_to_hex(&commit->object.oid));
                if (!revs->ignore_missing_links)
                        die("Failed to traverse parents of commit %s",
                            oid_to_hex(&commit->object.oid));


@@ -2979,7 +2981,7 @@ static enum rewrite_result rewrite_one(struct rev_info *revs, struct commit **pp
        for (;;) {
                struct commit *p = *pp;
                if (!revs->limited)
        for (;;) {
                struct commit *p = *pp;
                if (!revs->limited)

-                       if (add_parents_to_list(revs, p, &revs->commits, &cache) < 0)
+                       if (process_parents(revs, p, &revs->commits, &cache) < 0)

                                return rewrite_one_error;
                if (p->object.flags & UNINTERESTING)
                        return rewrite_one_ok;
                                return rewrite_one_error;
                if (p->object.flags & UNINTERESTING)
                        return rewrite_one_ok;


@@ -3312,7 +3314,7 @@ static struct commit *get_revision_1(struct rev_info *revs)
                                try_to_simplify_commit(revs, commit);
                        else if (revs->topo_walk_info)
                                expand_topo_walk(revs, commit);
                                try_to_simplify_commit(revs, commit);
                        else if (revs->topo_walk_info)
                                expand_topo_walk(revs, commit);

-                       else if (add_parents_to_list(revs, commit, &revs->commits, NULL) < 0) {
+                       else if (process_parents(revs, commit, &revs->commits, NULL) < 0) {

                                if (!revs->ignore_missing_links)
                                        die("Failed to traverse parents of commit %s",
                                                oid_to_hex(&commit->object.oid));
                                if (!revs->ignore_missing_links)
                                        die("Failed to traverse parents of commit %s",
                                                oid_to_hex(&commit->object.oid));