Fix output of "git log --graph --boundary"

Previously the graphing API wasn't aware of the revs->boundary flag, and
it always assumed that commits marked UNINTERESTING would not be
displayed.  As a result, the boundary commits were printed at the end of
the log output, but they didn't have any branch lines connecting them to
their children in the graph.

There was also another bug in the get_revision() code that caused
graph_update() to be called twice on the first boundary commit.  This
caused the graph API to think that a commit had been skipped, and print
a "..." line in the output.

Signed-off-by: Adam Simpkins <adam@adamsimpkins.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/graph.c b/graph.c
index dc2c1ec5d77932dc1e30057603d02a79b4d60f94..9b3495c4614504f280a28e697091949b47560e34 100644 (file)
--- a/graph.c
+++ b/graph.c
@@ -189,8 +189,25 @@ static void graph_ensure_capacity(struct git_graph *graph, int num_columns)
  * Returns 1 if the commit will be printed in the graph output,
  * and 0 otherwise.
  */
-static int graph_is_interesting(struct commit *commit)
+static int graph_is_interesting(struct git_graph *graph, struct commit *commit)
 {
+       /*
+        * If revs->boundary is set, commits whose children have
+        * been shown are always interesting, even if they have the
+        * UNINTERESTING or TREESAME flags set.
+        *
+        * However, ignore the commit if SHOWN is set.  If SHOWN is set,
+        * the commit is interesting, but it has already been printed.
+        * This can happen because get_revision() doesn't return the
+        * boundary commits in topological order, even when
+        * revs->topo_order is set.
+        */
+       if (graph->revs && graph->revs->boundary) {
+               if ((commit->object.flags & (SHOWN | CHILD_SHOWN)) ==
+                   CHILD_SHOWN)
+                       return 1;
+       }
+
        /*
         * Uninteresting and pruned commits won't be printed
         */
@@ -206,7 +223,7 @@ static void graph_insert_into_new_columns(struct git_graph *graph,
        /*
         * Ignore uinteresting commits
         */
-       if (!graph_is_interesting(commit))
+       if (!graph_is_interesting(graph, commit))
                return;
 
        /*
@@ -380,7 +397,7 @@ void graph_update(struct git_graph *graph, struct commit *commit)
         */
        graph->num_parents = 0;
        for (parent = commit->parents; parent; parent = parent->next) {
-               if (graph_is_interesting(parent->item))
+               if (graph_is_interesting(graph, parent->item))
                        graph->num_parents++;
        }
 
@@ -543,6 +560,51 @@ static void graph_output_pre_commit_line(struct git_graph *graph,
                graph->state = GRAPH_COMMIT;
 }
 
+static void graph_output_commit_char(struct git_graph *graph, struct strbuf *sb)
+{
+       /*
+        * For boundary commits, print 'o'
+        * (We should only see boundary commits when revs->boundary is set.)
+        */
+       if (graph->commit->object.flags & BOUNDARY) {
+               assert(graph->revs->boundary);
+               strbuf_addch(sb, 'o');
+               return;
+       }
+
+       /*
+        * If revs->left_right is set, print '<' for commits that
+        * come from the left side, and '>' for commits from the right
+        * side.
+        */
+       if (graph->revs && graph->revs->left_right) {
+               if (graph->commit->object.flags & SYMMETRIC_LEFT)
+                       strbuf_addch(sb, '<');
+               else
+                       strbuf_addch(sb, '>');
+               return;
+       }
+
+       /*
+        * Print 'M' for merge commits
+        *
+        * Note that we don't check graph->num_parents to determine if the
+        * commit is a merge, since that only tracks the number of
+        * "interesting" parents.  We want to print 'M' for merge commits
+        * even if they have less than 2 interesting parents.
+        */
+       if (graph->commit->parents != NULL &&
+           graph->commit->parents->next != NULL) {
+               strbuf_addch(sb, 'M');
+               return;
+       }
+
+       /*
+        * Print '*' in all other cases
+        */
+       strbuf_addch(sb, '*');
+}
+
 void graph_output_commit_line(struct git_graph *graph, struct strbuf *sb)
 {
        int seen_this = 0;
@@ -568,16 +630,7 @@ void graph_output_commit_line(struct git_graph *graph, struct strbuf *sb)
 
                if (col_commit == graph->commit) {
                        seen_this = 1;
-
-                       if (graph->revs && graph->revs->left_right) {
-                               if (graph->commit->object.flags & SYMMETRIC_LEFT)
-                                       strbuf_addch(sb, '<');
-                               else
-                                       strbuf_addch(sb, '>');
-                       } else if (graph->num_parents > 1)
-                               strbuf_addch(sb, 'M');
-                       else
-                               strbuf_addch(sb, '*');
+                       graph_output_commit_char(graph, sb);
 
                        if (graph->num_parents < 2)
                                strbuf_addch(sb, ' ');

diff --git a/revision.c b/revision.c
index 1341f3d1259b4a5477ba15258071d0dc74ee519e..181fb0b954d49332602f5fecde7e8c605f916184 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -1697,7 +1697,7 @@ static struct commit *get_revision_internal(struct rev_info *revs)
                 * switch to boundary commits output mode.
                 */
                revs->boundary = 2;
-               return get_revision(revs);
+               return get_revision_internal(revs);
        }
 
        /*