|
diff --git a/ui-log.c b/ui-log.c index ba2ab03..0b37785 100644 --- a/ ui-log.c+++ b/ ui-log.c |
|
@@ -1,119 +1,123 @@ |
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 | #include "html.h" |
10 | #include "html.h" |
11 | #include "ui-shared.h" |
11 | #include "ui-shared.h" |
12 | |
12 | |
13 | int files, add_lines, rem_lines; |
13 | int files, add_lines, rem_lines; |
14 | |
14 | |
15 | void count_lines(char *line, int size) |
15 | void 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 | |
27 | void inspect_files(struct diff_filepair *pair) |
27 | void inspect_files(struct diff_filepair *pair) |
28 | { |
28 | { |
29 | unsigned long old_size = 0; |
29 | unsigned long old_size = 0; |
30 | unsigned long new_size = 0; |
30 | unsigned long new_size = 0; |
31 | int binary = 0; |
31 | int binary = 0; |
32 | |
32 | |
33 | files++; |
33 | files++; |
34 | if (ctx.repo->enable_log_linecount) |
34 | if (ctx.repo->enable_log_linecount) |
35 | cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, |
35 | cgit_diff_files(pair->one->sha1, pair->two->sha1, &old_size, |
36 | &new_size, &binary, count_lines); |
36 | &new_size, &binary, count_lines); |
37 | } |
37 | } |
38 | |
38 | |
39 | void show_commit_decorations(struct commit *commit) |
39 | void show_commit_decorations(struct commit *commit) |
40 | { |
40 | { |
41 | struct name_decoration *deco; |
41 | struct name_decoration *deco; |
42 | static char buf[1024]; |
42 | static char buf[1024]; |
43 | |
43 | |
44 | buf[sizeof(buf) - 1] = 0; |
44 | buf[sizeof(buf) - 1] = 0; |
45 | deco = lookup_decoration(&name_decoration, &commit->object); |
45 | deco = lookup_decoration(&name_decoration, &commit->object); |
46 | while (deco) { |
46 | while (deco) { |
47 | if (!prefixcmp(deco->name, "refs/heads/")) { |
47 | if (!prefixcmp(deco->name, "refs/heads/")) { |
48 | strncpy(buf, deco->name + 11, sizeof(buf) - 1); |
48 | strncpy(buf, deco->name + 11, sizeof(buf) - 1); |
49 | cgit_log_link(buf, NULL, "branch-deco", buf, NULL, NULL, |
49 | cgit_log_link(buf, NULL, "branch-deco", buf, NULL, NULL, |
50 | 0, NULL, NULL, ctx.qry.showmsg); |
50 | 0, NULL, NULL, ctx.qry.showmsg); |
51 | } |
51 | } |
52 | else if (!prefixcmp(deco->name, "tag: refs/tags/")) { |
52 | else if (!prefixcmp(deco->name, "tag: refs/tags/")) { |
53 | strncpy(buf, deco->name + 15, sizeof(buf) - 1); |
53 | strncpy(buf, deco->name + 15, sizeof(buf) - 1); |
54 | cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf); |
54 | cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf); |
55 | } |
55 | } |
| |
56 | else if (!prefixcmp(deco->name, "refs/tags/")) { |
| |
57 | strncpy(buf, deco->name + 10, sizeof(buf) - 1); |
| |
58 | cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf); |
| |
59 | } |
56 | else if (!prefixcmp(deco->name, "refs/remotes/")) { |
60 | else if (!prefixcmp(deco->name, "refs/remotes/")) { |
57 | strncpy(buf, deco->name + 13, sizeof(buf) - 1); |
61 | strncpy(buf, deco->name + 13, sizeof(buf) - 1); |
58 | cgit_log_link(buf, NULL, "remote-deco", NULL, |
62 | cgit_log_link(buf, NULL, "remote-deco", NULL, |
59 | sha1_to_hex(commit->object.sha1), NULL, |
63 | sha1_to_hex(commit->object.sha1), NULL, |
60 | 0, NULL, NULL, ctx.qry.showmsg); |
64 | 0, NULL, NULL, ctx.qry.showmsg); |
61 | } |
65 | } |
62 | else { |
66 | else { |
63 | strncpy(buf, deco->name, sizeof(buf) - 1); |
67 | strncpy(buf, deco->name, sizeof(buf) - 1); |
64 | cgit_commit_link(buf, NULL, "deco", ctx.qry.head, |
68 | cgit_commit_link(buf, NULL, "deco", ctx.qry.head, |
65 | sha1_to_hex(commit->object.sha1)); |
69 | sha1_to_hex(commit->object.sha1)); |
66 | } |
70 | } |
67 | deco = deco->next; |
71 | deco = deco->next; |
68 | } |
72 | } |
69 | } |
73 | } |
70 | |
74 | |
71 | void print_commit(struct commit *commit) |
75 | void print_commit(struct commit *commit) |
72 | { |
76 | { |
73 | struct commitinfo *info; |
77 | struct commitinfo *info; |
74 | char *tmp; |
78 | char *tmp; |
75 | int cols = 2; |
79 | int cols = 2; |
76 | |
80 | |
77 | info = cgit_parse_commit(commit); |
81 | info = cgit_parse_commit(commit); |
78 | htmlf("<tr%s><td>", |
82 | htmlf("<tr%s><td>", |
79 | ctx.qry.showmsg ? " class='logheader'" : ""); |
83 | ctx.qry.showmsg ? " class='logheader'" : ""); |
80 | tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1)); |
84 | tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1)); |
81 | tmp = cgit_pageurl(ctx.repo->url, "commit", tmp); |
85 | tmp = cgit_pageurl(ctx.repo->url, "commit", tmp); |
82 | html_link_open(tmp, NULL, NULL); |
86 | html_link_open(tmp, NULL, NULL); |
83 | cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); |
87 | cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); |
84 | html_link_close(); |
88 | html_link_close(); |
85 | htmlf("</td><td%s>", |
89 | htmlf("</td><td%s>", |
86 | ctx.qry.showmsg ? " class='logsubject'" : ""); |
90 | ctx.qry.showmsg ? " class='logsubject'" : ""); |
87 | cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head, |
91 | cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head, |
88 | sha1_to_hex(commit->object.sha1)); |
92 | sha1_to_hex(commit->object.sha1)); |
89 | show_commit_decorations(commit); |
93 | show_commit_decorations(commit); |
90 | html("</td><td>"); |
94 | html("</td><td>"); |
91 | html_txt(info->author); |
95 | html_txt(info->author); |
92 | if (ctx.repo->enable_log_filecount) { |
96 | if (ctx.repo->enable_log_filecount) { |
93 | files = 0; |
97 | files = 0; |
94 | add_lines = 0; |
98 | add_lines = 0; |
95 | rem_lines = 0; |
99 | rem_lines = 0; |
96 | cgit_diff_commit(commit, inspect_files); |
100 | cgit_diff_commit(commit, inspect_files); |
97 | html("</td><td>"); |
101 | html("</td><td>"); |
98 | htmlf("%d", files); |
102 | htmlf("%d", files); |
99 | if (ctx.repo->enable_log_linecount) { |
103 | if (ctx.repo->enable_log_linecount) { |
100 | html("</td><td>"); |
104 | html("</td><td>"); |
101 | htmlf("-%d/+%d", rem_lines, add_lines); |
105 | htmlf("-%d/+%d", rem_lines, add_lines); |
102 | } |
106 | } |
103 | } |
107 | } |
104 | html("</td></tr>\n"); |
108 | html("</td></tr>\n"); |
105 | if (ctx.qry.showmsg) { |
109 | if (ctx.qry.showmsg) { |
106 | if (ctx.repo->enable_log_filecount) { |
110 | if (ctx.repo->enable_log_filecount) { |
107 | cols++; |
111 | cols++; |
108 | if (ctx.repo->enable_log_linecount) |
112 | if (ctx.repo->enable_log_linecount) |
109 | cols++; |
113 | cols++; |
110 | } |
114 | } |
111 | htmlf("<tr class='nohover'><td/><td colspan='%d' class='logmsg'>", |
115 | htmlf("<tr class='nohover'><td/><td colspan='%d' class='logmsg'>", |
112 | cols); |
116 | cols); |
113 | html_txt(info->msg); |
117 | html_txt(info->msg); |
114 | html("</td></tr>\n"); |
118 | html("</td></tr>\n"); |
115 | } |
119 | } |
116 | cgit_free_commitinfo(info); |
120 | cgit_free_commitinfo(info); |
117 | } |
121 | } |
118 | |
122 | |
119 | static const char *disambiguate_ref(const char *ref) |
123 | static const char *disambiguate_ref(const char *ref) |
|