ui-log: Move 'Age' column when commit graph is present

When the commit graph is present, we prefer to draw it along the left edge,
and moving the 'Age' column to the right of the 'Author' column, like in gitk.

Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>

1 files changed, 30 insertions, 12 deletions

diff --git a/ui-log.c b/ui-log.c
index 05b5c29..8add66a 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -83,119 +83,131 @@ void show_commit_decorations(struct commit *commit)
                                       ctx.qry.showmsg);
                 }
                 else {
                         strncpy(buf, deco->name, sizeof(buf) - 1);
                         cgit_commit_link(buf, NULL, "deco", ctx.qry.head,
                                          sha1_to_hex(commit->object.sha1),
                                          ctx.qry.vpath, 0);
                 }
                 deco = deco->next;
         }
 }
 
 void print_commit(struct commit *commit, struct rev_info *revs)
 {
         struct commitinfo *info;
         char *tmp;
-        int cols = 2;
+        int cols = revs->graph ? 3 : 2;
         struct strbuf graphbuf = STRBUF_INIT;
         struct strbuf msgbuf = STRBUF_INIT;
 
         if (ctx.repo->enable_log_filecount) {
                 cols++;
                 if (ctx.repo->enable_log_linecount)
                         cols++;
         }
 
         if (revs->graph) {
                 /* Advance graph until current commit */
                 while (!graph_next_line(revs->graph, &graphbuf)) {
                         /* Print graph segment in otherwise empty table row */
-                        html("<tr class='nohover'><td/><td class='commitgraph'>");
+                        html("<tr class='nohover'><td class='commitgraph'>");
                         html(graphbuf.buf);
                         htmlf("</td><td colspan='%d' /></tr>\n", cols);
                         strbuf_setlen(&graphbuf, 0);
                 }
                 /* Current commit's graph segment is now ready in graphbuf */
         }
 
         info = cgit_parse_commit(commit);
-        htmlf("<tr%s><td>",
-                ctx.qry.showmsg ? " class='logheader'" : "");
-        tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1));
-        tmp = cgit_fileurl(ctx.repo->url, "commit", ctx.qry.vpath, tmp);
-        html_link_open(tmp, NULL, NULL);
-        cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE);
-        html_link_close();
-        html("</td>");
+        htmlf("<tr%s>", ctx.qry.showmsg ? " class='logheader'" : "");
 
         if (revs->graph) {
                 /* Print graph segment for current commit */
                 html("<td class='commitgraph'>");
                 html(graphbuf.buf);
                 html("</td>");
                 strbuf_setlen(&graphbuf, 0);
         }
+        else {
+                html("<td>");
+                tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1));
+                tmp = cgit_fileurl(ctx.repo->url, "commit", ctx.qry.vpath, tmp);
+                html_link_open(tmp, NULL, NULL);
+                cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE);
+                html_link_close();
+                html("</td>");
+        }
 
         htmlf("<td%s>", ctx.qry.showmsg ? " class='logsubject'" : "");
         if (ctx.qry.showmsg) {
                 /* line-wrap long commit subjects instead of truncating them */
                 size_t subject_len = strlen(info->subject);
 
                 if (subject_len > ctx.cfg.max_msg_len &&
                     ctx.cfg.max_msg_len >= 15) {
                         /* symbol for signaling line-wrap (in PAGE_ENCODING) */
                         const char wrap_symbol[] = { ' ', 0xE2, 0x86, 0xB5, 0 };
                         int i = ctx.cfg.max_msg_len - strlen(wrap_symbol);
 
                         /* Rewind i to preceding space character */
                         while (i > 0 && !isspace(info->subject[i]))
                                 --i;
                         if (!i) /* Oops, zero spaces. Reset i */
                                 i = ctx.cfg.max_msg_len - strlen(wrap_symbol);
 
                         /* add remainder starting at i to msgbuf */
                         strbuf_add(&msgbuf, info->subject + i, subject_len - i);
                         strbuf_trim(&msgbuf);
                         strbuf_add(&msgbuf, "\n\n", 2);
 
                         /* Place wrap_symbol at position i in info->subject */
                         strcpy(info->subject + i, wrap_symbol);
                 }
         }
         cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head,
                          sha1_to_hex(commit->object.sha1), ctx.qry.vpath, 0);
         show_commit_decorations(commit);
         html("</td><td>");
         html_txt(info->author);
+
+        if (revs->graph) {
+                html("</td><td>");
+                tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1));
+                tmp = cgit_fileurl(ctx.repo->url, "commit", ctx.qry.vpath, tmp);
+                html_link_open(tmp, NULL, NULL);
+                cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE);
+                html_link_close();
+        }
+
         if (ctx.repo->enable_log_filecount) {
                 files = 0;
                 add_lines = 0;
                 rem_lines = 0;
                 cgit_diff_commit(commit, inspect_files, ctx.qry.vpath);
                 html("</td><td>");
                 htmlf("%d", files);
                 if (ctx.repo->enable_log_linecount) {
                         html("</td><td>");
                         htmlf("-%d/+%d", rem_lines, add_lines);
                 }
         }
         html("</td></tr>\n");
 
         if (revs->graph || ctx.qry.showmsg) { /* Print a second table row */
-                html("<tr class='nohover'><td/>"); /* Empty 'Age' column */
+                html("<tr class='nohover'>");
 
                 if (ctx.qry.showmsg) {
                         /* Concatenate commit message + notes in msgbuf */
                         if (info->msg && *(info->msg)) {
                                 strbuf_addstr(&msgbuf, info->msg);
                                 strbuf_addch(&msgbuf, '\n');
                         }
                         format_note(NULL, commit->object.sha1, &msgbuf,
                                     PAGE_ENCODING,
                                     NOTES_SHOW_HEADER | NOTES_INDENT);
                         strbuf_addch(&msgbuf, '\n');
                         strbuf_ltrim(&msgbuf);
                 }
 
                 if (revs->graph) {
                         int lines = 0;
@@ -210,32 +222,34 @@ void print_commit(struct commit *commit, struct rev_info *revs)
                                         lines++;
                                 }
                         }
 
                         /* Print graph padding */
                         html("<td class='commitgraph'>");
                         while (lines > 0 || !graph_is_commit_finished(revs->graph)) {
                                 if (graphbuf.len)
                                         html("\n");
                                 strbuf_setlen(&graphbuf, 0);
                                 graph_next_line(revs->graph, &graphbuf);
                                 html(graphbuf.buf);
                                 lines--;
                         }
                         html("</td>\n");
                 }
+                else
+                        html("<td/>"); /* Empty 'Age' column */
 
                 /* Print msgbuf into remainder of table row */
                 htmlf("<td colspan='%d'%s>\n", cols,
                         ctx.qry.showmsg ? " class='logmsg'" : "");
                 html_txt(msgbuf.buf);
                 html("</td></tr>\n");
         }
 
         strbuf_release(&msgbuf);
         strbuf_release(&graphbuf);
         cgit_free_commitinfo(info);
 }
 
 static const char *disambiguate_ref(const char *ref)
 {
         unsigned char sha1[20];
@@ -332,45 +346,49 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
 
         init_revisions(&rev, NULL);
         rev.abbrev = DEFAULT_ABBREV;
         rev.commit_format = CMIT_FMT_DEFAULT;
         rev.verbose_header = 1;
         rev.show_root_diff = 0;
         setup_revisions(vec.count, vec.data, &rev, NULL);
         load_ref_decorations(DECORATE_FULL_REFS);
         rev.show_decorations = 1;
         rev.grep_filter.regflags |= REG_ICASE;
         compile_grep_patterns(&rev.grep_filter);
         prepare_revision_walk(&rev);
 
         if (pager)
                 html("<table class='list nowrap'>");
 
-        html("<tr class='nohover'><th class='left'>Age</th>");
+        html("<tr class='nohover'>");
         if (commit_graph)
                 html("<th></th>");
+        else
+                html("<th class='left'>Age</th>");
         html("<th class='left'>Commit message");
         if (pager) {
                 html(" (");
                 cgit_log_link(ctx.qry.showmsg ? "Collapse" : "Expand", NULL,
                               NULL, ctx.qry.head, ctx.qry.sha1,
                               ctx.qry.vpath, ctx.qry.ofs, ctx.qry.grep,
                               ctx.qry.search, ctx.qry.showmsg ? 0 : 1);
                 html(")");
         }
         html("</th><th class='left'>Author</th>");
+        if (commit_graph)
+                html("<th class='left'>Age</th>");
         if (ctx.repo->enable_log_filecount) {
                 html("<th class='left'>Files</th>");
                 columns++;
                 if (ctx.repo->enable_log_linecount) {
                         html("<th class='left'>Lines</th>");
                         columns++;
                 }
         }
         html("</tr>\n");
 
         if (ofs<0)
                 ofs = 0;
 
         for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; i++) {
                 free(commit->buffer);
                 commit->buffer = NULL;