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