summaryrefslogtreecommitdiffabout
path: root/ui-log.c
Unidiff
Diffstat (limited to 'ui-log.c') (more/less context) (ignore whitespace changes)
-rw-r--r--ui-log.c21
1 files changed, 14 insertions, 7 deletions
diff --git a/ui-log.c b/ui-log.c
index 9f5fdf6..e5f3c57 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -1,117 +1,124 @@
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, add_lines, rem_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)
16 lines++; 16 return;
17
18 if (line[0] == '+')
19 add_lines++;
20
21 else if (line[0] == '-')
22 rem_lines++;
17} 23}
18 24
19void inspect_files(struct diff_filepair *pair) 25void inspect_files(struct diff_filepair *pair)
20{ 26{
21 files++; 27 files++;
22 if (cgit_repo->enable_log_linecount) 28 if (cgit_repo->enable_log_linecount)
23 cgit_diff_files(pair->one->sha1, pair->two->sha1, count_lines); 29 cgit_diff_files(pair->one->sha1, pair->two->sha1, count_lines);
24} 30}
25 31
26void print_commit(struct commit *commit) 32void print_commit(struct commit *commit)
27{ 33{
28 struct commitinfo *info; 34 struct commitinfo *info;
29 35
30 info = cgit_parse_commit(commit); 36 info = cgit_parse_commit(commit);
31 html("<tr><td>"); 37 html("<tr><td>");
32 cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); 38 cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE);
33 html("</td><td>"); 39 html("</td><td>");
34 cgit_commit_link(info->subject, NULL, NULL, cgit_query_head, 40 cgit_commit_link(info->subject, NULL, NULL, cgit_query_head,
35 sha1_to_hex(commit->object.sha1)); 41 sha1_to_hex(commit->object.sha1));
36 if (cgit_repo->enable_log_filecount) { 42 if (cgit_repo->enable_log_filecount) {
37 files = 0; 43 files = 0;
38 lines = 0; 44 add_lines = 0;
45 rem_lines = 0;
39 cgit_diff_commit(commit, inspect_files); 46 cgit_diff_commit(commit, inspect_files);
40 html("</td><td class='right'>"); 47 html("</td><td class='right'>");
41 htmlf("%d", files); 48 htmlf("%d", files);
42 if (cgit_repo->enable_log_linecount) { 49 if (cgit_repo->enable_log_linecount) {
43 html("</td><td class='right'>"); 50 html("</td><td class='right'>");
44 htmlf("%d", lines); 51 htmlf("-%d/+%d", rem_lines, add_lines);
45 } 52 }
46 } 53 }
47 html("</td><td>"); 54 html("</td><td>");
48 html_txt(info->author); 55 html_txt(info->author);
49 html("</td></tr>\n"); 56 html("</td></tr>\n");
50 cgit_free_commitinfo(info); 57 cgit_free_commitinfo(info);
51} 58}
52 59
53 60
54void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern, char *path, int pager) 61void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern, char *path, int pager)
55{ 62{
56 struct rev_info rev; 63 struct rev_info rev;
57 struct commit *commit; 64 struct commit *commit;
58 const char *argv[] = {NULL, tip, NULL, NULL, NULL}; 65 const char *argv[] = {NULL, tip, NULL, NULL, NULL};
59 int argc = 2; 66 int argc = 2;
60 int i; 67 int i;
61 68
62 if (!tip) 69 if (!tip)
63 argv[1] = cgit_query_head; 70 argv[1] = cgit_query_head;
64 71
65 if (grep && pattern && (!strcmp(grep, "grep") || 72 if (grep && pattern && (!strcmp(grep, "grep") ||
66 !strcmp(grep, "author") || 73 !strcmp(grep, "author") ||
67 !strcmp(grep, "committer"))) 74 !strcmp(grep, "committer")))
68 argv[argc++] = fmt("--%s=%s", grep, pattern); 75 argv[argc++] = fmt("--%s=%s", grep, pattern);
69 76
70 if (path) { 77 if (path) {
71 argv[argc++] = "--"; 78 argv[argc++] = "--";
72 argv[argc++] = path; 79 argv[argc++] = path;
73 } 80 }
74 init_revisions(&rev, NULL); 81 init_revisions(&rev, NULL);
75 rev.abbrev = DEFAULT_ABBREV; 82 rev.abbrev = DEFAULT_ABBREV;
76 rev.commit_format = CMIT_FMT_DEFAULT; 83 rev.commit_format = CMIT_FMT_DEFAULT;
77 rev.verbose_header = 1; 84 rev.verbose_header = 1;
78 rev.show_root_diff = 0; 85 rev.show_root_diff = 0;
79 setup_revisions(argc, argv, &rev, NULL); 86 setup_revisions(argc, argv, &rev, NULL);
80 if (rev.grep_filter) { 87 if (rev.grep_filter) {
81 rev.grep_filter->regflags |= REG_ICASE; 88 rev.grep_filter->regflags |= REG_ICASE;
82 compile_grep_patterns(rev.grep_filter); 89 compile_grep_patterns(rev.grep_filter);
83 } 90 }
84 prepare_revision_walk(&rev); 91 prepare_revision_walk(&rev);
85 92
86 html("<table class='list nowrap'>"); 93 html("<table class='list nowrap'>");
87 html("<tr class='nohover'><th class='left'>Age</th>" 94 html("<tr class='nohover'><th class='left'>Age</th>"
88 "<th class='left'>Message</th>"); 95 "<th class='left'>Message</th>");
89 96
90 if (cgit_repo->enable_log_filecount) { 97 if (cgit_repo->enable_log_filecount) {
91 html("<th class='left'>Files</th>"); 98 html("<th class='right'>Files</th>");
92 if (cgit_repo->enable_log_linecount) 99 if (cgit_repo->enable_log_linecount)
93 html("<th class='left'>Lines</th>"); 100 html("<th class='right'>Lines</th>");
94 } 101 }
95 html("<th class='left'>Author</th></tr>\n"); 102 html("<th class='left'>Author</th></tr>\n");
96 103
97 if (ofs<0) 104 if (ofs<0)
98 ofs = 0; 105 ofs = 0;
99 106
100 for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; i++) { 107 for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; i++) {
101 free(commit->buffer); 108 free(commit->buffer);
102 commit->buffer = NULL; 109 commit->buffer = NULL;
103 free_commit_list(commit->parents); 110 free_commit_list(commit->parents);
104 commit->parents = NULL; 111 commit->parents = NULL;
105 } 112 }
106 113
107 for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) { 114 for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) {
108 print_commit(commit); 115 print_commit(commit);
109 free(commit->buffer); 116 free(commit->buffer);
110 commit->buffer = NULL; 117 commit->buffer = NULL;
111 free_commit_list(commit->parents); 118 free_commit_list(commit->parents);
112 commit->parents = NULL; 119 commit->parents = NULL;
113 } 120 }
114 html("</table>\n"); 121 html("</table>\n");
115 122
116 if (pager) { 123 if (pager) {
117 html("<div class='pager'>"); 124 html("<div class='pager'>");