make enable-log-linecount independent of -filecount

[ps-cgit] / ui-log.c

diff --git a/ui-log.c b/ui-log.c
index 05b5c297bb9885f0421178eb698558a19d959abd..2e6e9d66125064c3737954ef7420240c28d26eeb 100644 (file)
--- a/ui-log.c
+++ b/ui-log.c
@@ -96,21 +96,20 @@ void print_commit(struct commit *commit, struct rev_info *revs)
 {
        struct commitinfo *info;
        char *tmp;
 {
        struct commitinfo *info;
        char *tmp;

-       int cols = 2;
+       int cols = revs->graph ? 3 : 2;

        struct strbuf graphbuf = STRBUF_INIT;
        struct strbuf msgbuf = STRBUF_INIT;
 
        struct strbuf graphbuf = STRBUF_INIT;
        struct strbuf msgbuf = STRBUF_INIT;
 

-       if (ctx.repo->enable_log_filecount) {
+       if (ctx.repo->enable_log_filecount)
+               cols++;
+       if (ctx.repo->enable_log_linecount)

                cols++;
                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 */
 
        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);
                        html(graphbuf.buf);
                        htmlf("</td><td colspan='%d' /></tr>\n", cols);
                        strbuf_setlen(&graphbuf, 0);


@@ -119,14 +118,7 @@ void print_commit(struct commit *commit, struct rev_info *revs)
        }
 
        info = cgit_parse_commit(commit);
        }
 
        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 */
 
        if (revs->graph) {
                /* Print graph segment for current commit */


@@ -135,6 +127,15 @@ void print_commit(struct commit *commit, struct rev_info *revs)
                html("</td>");
                strbuf_setlen(&graphbuf, 0);
        }
                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) {
 
        htmlf("<td%s>", ctx.qry.showmsg ? " class='logsubject'" : "");
        if (ctx.qry.showmsg) {


@@ -167,22 +168,32 @@ void print_commit(struct commit *commit, struct rev_info *revs)
        show_commit_decorations(commit);
        html("</td><td>");
        html_txt(info->author);
        show_commit_decorations(commit);
        html("</td><td>");
        html_txt(info->author);

-       if (ctx.repo->enable_log_filecount) {
+
+       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 || ctx.repo->enable_log_linecount) {

                files = 0;
                add_lines = 0;
                rem_lines = 0;
                cgit_diff_commit(commit, inspect_files, ctx.qry.vpath);
                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);
-               }

        }
        }

+
+       if (ctx.repo->enable_log_filecount)
+               htmlf("</td><td>%d", files);
+       if (ctx.repo->enable_log_linecount)
+               htmlf("</td><td>-%d/+%d", rem_lines, add_lines);
+

        html("</td></tr>\n");
 
        if (revs->graph || ctx.qry.showmsg) { /* Print a second table row */
        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 (ctx.qry.showmsg) {
                        /* Concatenate commit message + notes in msgbuf */


@@ -223,6 +234,8 @@ void print_commit(struct commit *commit, struct rev_info *revs)
                        }
                        html("</td>\n");
                }
                        }
                        html("</td>\n");
                }

+               else
+                       html("<td/>"); /* Empty 'Age' column */

 
                /* Print msgbuf into remainder of table row */
                htmlf("<td colspan='%d'%s>\n", cols,
 
                /* Print msgbuf into remainder of table row */
                htmlf("<td colspan='%d'%s>\n", cols,


@@ -345,9 +358,11 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
        if (pager)
                html("<table class='list nowrap'>");
 
        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>");
        if (commit_graph)
                html("<th></th>");

+       else
+               html("<th class='left'>Age</th>");

        html("<th class='left'>Commit message");
        if (pager) {
                html(" (");
        html("<th class='left'>Commit message");
        if (pager) {
                html(" (");


@@ -358,13 +373,15 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
                html(")");
        }
        html("</th><th class='left'>Author</th>");
                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_filecount) {
                html("<th class='left'>Files</th>");
                columns++;

-               if (ctx.repo->enable_log_linecount) {
-                       html("<th class='left'>Lines</th>");
-                       columns++;
-               }
+       }
+       if (ctx.repo->enable_log_linecount) {
+               html("<th class='left'>Lines</th>");
+               columns++;

        }
        html("</tr>\n");
 
        }
        html("</tr>\n");