summaryrefslogtreecommitdiffabout
path: root/ui-log.c
Unidiff
Diffstat (limited to 'ui-log.c') (more/less context) (ignore whitespace changes)
-rw-r--r--ui-log.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/ui-log.c b/ui-log.c
index 4237921..c80fd73 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -1,132 +1,128 @@
1/* ui-log.c: functions for log output 1/* ui-log.c: functions for log output
2 * 2 *
3 * Copyright (C) 2006 Lars Hjemli 3 * Copyright (C) 2006 Lars Hjemli
4 * 4 *
5 * Licensed under GNU General Public License v2 5 * Licensed under GNU General Public License v2
6 * (see COPYING for full license text) 6 * (see COPYING for full license text)
7 */ 7 */
8 8
9#include "cgit.h" 9#include "cgit.h"
10 10
11int files, lines; 11int files, lines;
12 12
13void count_lines(char *line, int size) 13void count_lines(char *line, int size)
14{ 14{
15 if (size>0 && (line[0] == '+' || line[0] == '-')) 15 if (size>0 && (line[0] == '+' || line[0] == '-'))
16 lines++; 16 lines++;
17} 17}
18 18
19void inspect_files(struct diff_filepair *pair) 19void inspect_files(struct diff_filepair *pair)
20{ 20{
21 files++; 21 files++;
22 if (cgit_repo->enable_log_linecount) 22 if (cgit_repo->enable_log_linecount)
23 cgit_diff_files(pair->one->sha1, pair->two->sha1, count_lines); 23 cgit_diff_files(pair->one->sha1, pair->two->sha1, count_lines);
24} 24}
25 25
26void print_commit(struct commit *commit) 26void print_commit(struct commit *commit)
27{ 27{
28 char buf[32];
29 struct commitinfo *info; 28 struct commitinfo *info;
30 struct tm *time;
31 29
32 info = cgit_parse_commit(commit); 30 info = cgit_parse_commit(commit);
33 time = gmtime(&commit->date);
34 html("<tr><td>"); 31 html("<tr><td>");
35 strftime(buf, sizeof(buf), "%Y-%m-%d %H:%M", time); 32 cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE);
36 html_txt(buf);
37 html("</td><td>"); 33 html("</td><td>");
38 char *qry = fmt("h=%s", sha1_to_hex(commit->object.sha1)); 34 char *qry = fmt("h=%s", sha1_to_hex(commit->object.sha1));
39 char *url = cgit_pageurl(cgit_query_repo, "commit", qry); 35 char *url = cgit_pageurl(cgit_query_repo, "commit", qry);
40 html_link_open(url, NULL, NULL); 36 html_link_open(url, NULL, NULL);
41 html_ntxt(cgit_max_msg_len, info->subject); 37 html_ntxt(cgit_max_msg_len, info->subject);
42 html_link_close(); 38 html_link_close();
43 if (cgit_repo->enable_log_filecount) { 39 if (cgit_repo->enable_log_filecount) {
44 files = 0; 40 files = 0;
45 lines = 0; 41 lines = 0;
46 cgit_diff_commit(commit, inspect_files); 42 cgit_diff_commit(commit, inspect_files);
47 html("</td><td class='right'>"); 43 html("</td><td class='right'>");
48 htmlf("%d", files); 44 htmlf("%d", files);
49 if (cgit_repo->enable_log_linecount) { 45 if (cgit_repo->enable_log_linecount) {
50 html("</td><td class='right'>"); 46 html("</td><td class='right'>");
51 htmlf("%d", lines); 47 htmlf("%d", lines);
52 } 48 }
53 } 49 }
54 html("</td><td>"); 50 html("</td><td>");
55 html_txt(info->author); 51 html_txt(info->author);
56 html("</td></tr>\n"); 52 html("</td></tr>\n");
57 cgit_free_commitinfo(info); 53 cgit_free_commitinfo(info);
58} 54}
59 55
60 56
61void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path) 57void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *path)
62{ 58{
63 struct rev_info rev; 59 struct rev_info rev;
64 struct commit *commit; 60 struct commit *commit;
65 const char *argv[] = {NULL, tip, NULL, NULL, NULL}; 61 const char *argv[] = {NULL, tip, NULL, NULL, NULL};
66 int argc = 2; 62 int argc = 2;
67 int i; 63 int i;
68 64
69 if (grep) 65 if (grep)
70 argv[argc++] = fmt("--grep=%s", grep); 66 argv[argc++] = fmt("--grep=%s", grep);
71 if (path) { 67 if (path) {
72 argv[argc++] = "--"; 68 argv[argc++] = "--";
73 argv[argc++] = path; 69 argv[argc++] = path;
74 } 70 }
75 init_revisions(&rev, NULL); 71 init_revisions(&rev, NULL);
76 rev.abbrev = DEFAULT_ABBREV; 72 rev.abbrev = DEFAULT_ABBREV;
77 rev.commit_format = CMIT_FMT_DEFAULT; 73 rev.commit_format = CMIT_FMT_DEFAULT;
78 rev.verbose_header = 1; 74 rev.verbose_header = 1;
79 rev.show_root_diff = 0; 75 rev.show_root_diff = 0;
80 setup_revisions(argc, argv, &rev, NULL); 76 setup_revisions(argc, argv, &rev, NULL);
81 if (rev.grep_filter) { 77 if (rev.grep_filter) {
82 rev.grep_filter->regflags |= REG_ICASE; 78 rev.grep_filter->regflags |= REG_ICASE;
83 compile_grep_patterns(rev.grep_filter); 79 compile_grep_patterns(rev.grep_filter);
84 } 80 }
85 prepare_revision_walk(&rev); 81 prepare_revision_walk(&rev);
86 82
87 html("<table class='list nowrap'>"); 83 html("<table class='list nowrap'>");
88 html("<tr class='nohover'><th class='left'>Date</th>" 84 html("<tr class='nohover'><th class='left'>Age</th>"
89 "<th class='left'>Message</th>"); 85 "<th class='left'>Message</th>");
90 86
91 if (cgit_repo->enable_log_filecount) { 87 if (cgit_repo->enable_log_filecount) {
92 html("<th class='left'>Files</th>"); 88 html("<th class='left'>Files</th>");
93 if (cgit_repo->enable_log_linecount) 89 if (cgit_repo->enable_log_linecount)
94 html("<th class='left'>Lines</th>"); 90 html("<th class='left'>Lines</th>");
95 } 91 }
96 html("<th class='left'>Author</th></tr>\n"); 92 html("<th class='left'>Author</th></tr>\n");
97 93
98 if (ofs<0) 94 if (ofs<0)
99 ofs = 0; 95 ofs = 0;
100 96
101 for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; i++) { 97 for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; i++) {
102 free(commit->buffer); 98 free(commit->buffer);
103 commit->buffer = NULL; 99 commit->buffer = NULL;
104 free_commit_list(commit->parents); 100 free_commit_list(commit->parents);
105 commit->parents = NULL; 101 commit->parents = NULL;
106 } 102 }
107 103
108 for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) { 104 for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) {
109 print_commit(commit); 105 print_commit(commit);
110 free(commit->buffer); 106 free(commit->buffer);
111 commit->buffer = NULL; 107 commit->buffer = NULL;
112 free_commit_list(commit->parents); 108 free_commit_list(commit->parents);
113 commit->parents = NULL; 109 commit->parents = NULL;
114 } 110 }
115 html("</table>\n"); 111 html("</table>\n");
116 112
117 html("<div class='pager'>"); 113 html("<div class='pager'>");
118 if (ofs > 0) { 114 if (ofs > 0) {
119 html("&nbsp;<a href='"); 115 html("&nbsp;<a href='");
120 html(cgit_pageurl(cgit_query_repo, cgit_query_page, 116 html(cgit_pageurl(cgit_query_repo, cgit_query_page,
121 fmt("h=%s&ofs=%d", tip, ofs-cnt))); 117 fmt("h=%s&ofs=%d", tip, ofs-cnt)));
122 html("'>[prev]</a>&nbsp;"); 118 html("'>[prev]</a>&nbsp;");
123 } 119 }
124 120
125 if ((commit = get_revision(&rev)) != NULL) { 121 if ((commit = get_revision(&rev)) != NULL) {
126 html("&nbsp;<a href='"); 122 html("&nbsp;<a href='");
127 html(cgit_pageurl(cgit_query_repo, "log", 123 html(cgit_pageurl(cgit_query_repo, "log",
128 fmt("h=%s&ofs=%d", tip, ofs+cnt))); 124 fmt("h=%s&ofs=%d", tip, ofs+cnt)));
129 html("'>[next]</a>&nbsp;"); 125 html("'>[next]</a>&nbsp;");
130 } 126 }
131 html("</div>"); 127 html("</div>");
132} 128}