summaryrefslogtreecommitdiffabout
authorLars Hjemli <hjemli@gmail.com>2008-11-29 17:58:31 (UTC)
committer Lars Hjemli <hjemli@gmail.com>2008-11-29 17:58:31 (UTC)
commit951f550b60befeacd7334aebd64c891e72be5ac4 (patch) (unidiff)
tree334c9bff80857a27a0daca9a0f78c760bb4be6f3
parent0274b57d55a12ed38259757dbfae96b79cfa2e0b (diff)
downloadcgit-951f550b60befeacd7334aebd64c891e72be5ac4.zip
cgit-951f550b60befeacd7334aebd64c891e72be5ac4.tar.gz
cgit-951f550b60befeacd7334aebd64c891e72be5ac4.tar.bz2
ui-log: (ab)use extra columns for commit message when showmsg=1
If the commit message has extra long lines it's better to use the author/ files/lines columns to show those lines than to push the columns of screen and force the users to hscroll. Signed-off-by: Lars Hjemli <hjemli@gmail.com>
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--ui-log.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/ui-log.c b/ui-log.c
index 631e46d..adc9a66 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -14,88 +14,89 @@ int files, add_lines, rem_lines;
14 14
15void count_lines(char *line, int size) 15void count_lines(char *line, int size)
16{ 16{
17 if (size <= 0) 17 if (size <= 0)
18 return; 18 return;
19 19
20 if (line[0] == '+') 20 if (line[0] == '+')
21 add_lines++; 21 add_lines++;
22 22
23 else if (line[0] == '-') 23 else if (line[0] == '-')
24 rem_lines++; 24 rem_lines++;
25} 25}
26 26
27void inspect_files(struct diff_filepair *pair) 27void inspect_files(struct diff_filepair *pair)
28{ 28{
29 files++; 29 files++;
30 if (ctx.repo->enable_log_linecount) 30 if (ctx.repo->enable_log_linecount)
31 cgit_diff_files(pair->one->sha1, pair->two->sha1, count_lines); 31 cgit_diff_files(pair->one->sha1, pair->two->sha1, count_lines);
32} 32}
33 33
34void print_commit(struct commit *commit) 34void print_commit(struct commit *commit)
35{ 35{
36 struct commitinfo *info; 36 struct commitinfo *info;
37 char *tmp; 37 char *tmp;
38 int cols = 2;
38 39
39 info = cgit_parse_commit(commit); 40 info = cgit_parse_commit(commit);
40 html("<tr><td>"); 41 html("<tr><td>");
41 tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1)); 42 tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1));
42 tmp = cgit_pageurl(ctx.repo->url, "commit", tmp); 43 tmp = cgit_pageurl(ctx.repo->url, "commit", tmp);
43 html_link_open(tmp, NULL, NULL); 44 html_link_open(tmp, NULL, NULL);
44 cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); 45 cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE);
45 html_link_close(); 46 html_link_close();
46 html("</td><td>"); 47 html("</td><td>");
47 if (ctx.qry.showmsg) 48 if (ctx.qry.showmsg)
48 html("<u>"); 49 html("<u>");
49 cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head, 50 cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head,
50 sha1_to_hex(commit->object.sha1)); 51 sha1_to_hex(commit->object.sha1));
51 if (ctx.qry.showmsg) 52 if (ctx.qry.showmsg)
52 html("</u>"); 53 html("</u>");
53 html("</td><td>"); 54 html("</td><td>");
54 html_txt(info->author); 55 html_txt(info->author);
55 if (ctx.repo->enable_log_filecount) { 56 if (ctx.repo->enable_log_filecount) {
56 files = 0; 57 files = 0;
57 add_lines = 0; 58 add_lines = 0;
58 rem_lines = 0; 59 rem_lines = 0;
59 cgit_diff_commit(commit, inspect_files); 60 cgit_diff_commit(commit, inspect_files);
60 html("</td><td>"); 61 html("</td><td>");
61 htmlf("%d", files); 62 htmlf("%d", files);
62 if (ctx.repo->enable_log_linecount) { 63 if (ctx.repo->enable_log_linecount) {
63 html("</td><td>"); 64 html("</td><td>");
64 htmlf("-%d/+%d", rem_lines, add_lines); 65 htmlf("-%d/+%d", rem_lines, add_lines);
65 } 66 }
66 } 67 }
67 html("</td></tr>\n"); 68 html("</td></tr>\n");
68 if (ctx.qry.showmsg) { 69 if (ctx.qry.showmsg) {
69 html("<tr class='nohover'><td></td><td><div class='commit-msg'>");
70 html_txt(info->msg);
71 html("</div><br/></td><td></td>");
72 if (ctx.repo->enable_log_filecount) { 70 if (ctx.repo->enable_log_filecount) {
73 html("<td></td>"); 71 cols++;
74 if (ctx.repo->enable_log_linecount) 72 if (ctx.repo->enable_log_linecount)
75 html("<td></td>"); 73 cols++;
76 } 74 }
77 html("</tr>\n"); 75 htmlf("<tr class='nohover'><td></td><td colspan='%d'><div class='commit-msg'>",
76 cols);
77 html_txt(info->msg);
78 html("</div><br/></td></tr>\n");
78 } 79 }
79 cgit_free_commitinfo(info); 80 cgit_free_commitinfo(info);
80} 81}
81 82
82 83
83void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern, 84void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern,
84 char *path, int pager) 85 char *path, int pager)
85{ 86{
86 struct rev_info rev; 87 struct rev_info rev;
87 struct commit *commit; 88 struct commit *commit;
88 const char *argv[] = {NULL, tip, NULL, NULL, NULL}; 89 const char *argv[] = {NULL, tip, NULL, NULL, NULL};
89 int argc = 2; 90 int argc = 2;
90 int i, columns = 3; 91 int i, columns = 3;
91 92
92 if (!tip) 93 if (!tip)
93 argv[1] = ctx.qry.head; 94 argv[1] = ctx.qry.head;
94 95
95 if (grep && pattern && (!strcmp(grep, "grep") || 96 if (grep && pattern && (!strcmp(grep, "grep") ||
96 !strcmp(grep, "author") || 97 !strcmp(grep, "author") ||
97 !strcmp(grep, "committer"))) 98 !strcmp(grep, "committer")))
98 argv[argc++] = fmt("--%s=%s", grep, pattern); 99 argv[argc++] = fmt("--%s=%s", grep, pattern);
99 100
100 if (path) { 101 if (path) {
101 argv[argc++] = "--"; 102 argv[argc++] = "--";