Merge branch 'stable'

[ps-cgit] / ui-log.c

diff --git a/ui-log.c b/ui-log.c
index 8add66aa0f41c16081a2ead29ba2c19a8f41ace5..4a295bd4a484bb86ba3373a07a62f3b2ed4b1d35 100644 (file)
--- a/ui-log.c
+++ b/ui-log.c
@@ -95,16 +95,14 @@ void show_commit_decorations(struct commit *commit)
 void print_commit(struct commit *commit, struct rev_info *revs)
 {
        struct commitinfo *info;
 void print_commit(struct commit *commit, struct rev_info *revs)
 {
        struct commitinfo *info;

-       char *tmp;

        int cols = revs->graph ? 3 : 2;
        struct strbuf graphbuf = STRBUF_INIT;
        struct strbuf msgbuf = STRBUF_INIT;
 
        int cols = revs->graph ? 3 : 2;
        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 */
 
        if (revs->graph) {
                /* Advance graph until current commit */


@@ -130,11 +128,7 @@ void print_commit(struct commit *commit, struct rev_info *revs)
        }
        else {
                html("<td>");
        }
        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);
                cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE);

-               html_link_close();

                html("</td>");
        }
 
                html("</td>");
        }
 


@@ -172,25 +166,21 @@ void print_commit(struct commit *commit, struct rev_info *revs)
 
        if (revs->graph) {
                html("</td><td>");
 
        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);
                cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE);

-               html_link_close();

        }
 
        }
 

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


@@ -379,10 +369,10 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
        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");