|
diff --git a/ui-log.c b/ui-log.c index f3132c9..0947604 100644 --- a/ ui-log.c+++ b/ ui-log.c |
|
@@ -21,120 +21,120 @@ void count_lines(char *line, int size) |
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/")) { |
56 | else if (!prefixcmp(deco->name, "refs/tags/")) { |
57 | strncpy(buf, deco->name + 10, sizeof(buf) - 1); |
57 | strncpy(buf, deco->name + 10, sizeof(buf) - 1); |
58 | cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf); |
58 | cgit_tag_link(buf, NULL, "tag-deco", ctx.qry.head, buf); |
59 | } |
59 | } |
60 | else if (!prefixcmp(deco->name, "refs/remotes/")) { |
60 | else if (!prefixcmp(deco->name, "refs/remotes/")) { |
61 | strncpy(buf, deco->name + 13, sizeof(buf) - 1); |
61 | strncpy(buf, deco->name + 13, sizeof(buf) - 1); |
62 | cgit_log_link(buf, NULL, "remote-deco", NULL, |
62 | cgit_log_link(buf, NULL, "remote-deco", NULL, |
63 | sha1_to_hex(commit->object.sha1), NULL, |
63 | sha1_to_hex(commit->object.sha1), NULL, |
64 | 0, NULL, NULL, ctx.qry.showmsg); |
64 | 0, NULL, NULL, ctx.qry.showmsg); |
65 | } |
65 | } |
66 | else { |
66 | else { |
67 | strncpy(buf, deco->name, sizeof(buf) - 1); |
67 | strncpy(buf, deco->name, sizeof(buf) - 1); |
68 | cgit_commit_link(buf, NULL, "deco", ctx.qry.head, |
68 | cgit_commit_link(buf, NULL, "deco", ctx.qry.head, |
69 | sha1_to_hex(commit->object.sha1)); |
69 | sha1_to_hex(commit->object.sha1), 0); |
70 | } |
70 | } |
71 | deco = deco->next; |
71 | deco = deco->next; |
72 | } |
72 | } |
73 | } |
73 | } |
74 | |
74 | |
75 | void print_commit(struct commit *commit) |
75 | void print_commit(struct commit *commit) |
76 | { |
76 | { |
77 | struct commitinfo *info; |
77 | struct commitinfo *info; |
78 | char *tmp; |
78 | char *tmp; |
79 | int cols = 2; |
79 | int cols = 2; |
80 | |
80 | |
81 | info = cgit_parse_commit(commit); |
81 | info = cgit_parse_commit(commit); |
82 | htmlf("<tr%s><td>", |
82 | htmlf("<tr%s><td>", |
83 | ctx.qry.showmsg ? " class='logheader'" : ""); |
83 | ctx.qry.showmsg ? " class='logheader'" : ""); |
84 | tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1)); |
84 | tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1)); |
85 | tmp = cgit_pageurl(ctx.repo->url, "commit", tmp); |
85 | tmp = cgit_pageurl(ctx.repo->url, "commit", tmp); |
86 | html_link_open(tmp, NULL, NULL); |
86 | html_link_open(tmp, NULL, NULL); |
87 | cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); |
87 | cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); |
88 | html_link_close(); |
88 | html_link_close(); |
89 | htmlf("</td><td%s>", |
89 | htmlf("</td><td%s>", |
90 | ctx.qry.showmsg ? " class='logsubject'" : ""); |
90 | ctx.qry.showmsg ? " class='logsubject'" : ""); |
91 | cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head, |
91 | cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head, |
92 | sha1_to_hex(commit->object.sha1)); |
92 | sha1_to_hex(commit->object.sha1), 0); |
93 | show_commit_decorations(commit); |
93 | show_commit_decorations(commit); |
94 | html("</td><td>"); |
94 | html("</td><td>"); |
95 | html_txt(info->author); |
95 | html_txt(info->author); |
96 | if (ctx.repo->enable_log_filecount) { |
96 | if (ctx.repo->enable_log_filecount) { |
97 | files = 0; |
97 | files = 0; |
98 | add_lines = 0; |
98 | add_lines = 0; |
99 | rem_lines = 0; |
99 | rem_lines = 0; |
100 | cgit_diff_commit(commit, inspect_files); |
100 | cgit_diff_commit(commit, inspect_files); |
101 | html("</td><td>"); |
101 | html("</td><td>"); |
102 | htmlf("%d", files); |
102 | htmlf("%d", files); |
103 | if (ctx.repo->enable_log_linecount) { |
103 | if (ctx.repo->enable_log_linecount) { |
104 | html("</td><td>"); |
104 | html("</td><td>"); |
105 | htmlf("-%d/+%d", rem_lines, add_lines); |
105 | htmlf("-%d/+%d", rem_lines, add_lines); |
106 | } |
106 | } |
107 | } |
107 | } |
108 | html("</td></tr>\n"); |
108 | html("</td></tr>\n"); |
109 | if (ctx.qry.showmsg) { |
109 | if (ctx.qry.showmsg) { |
110 | if (ctx.repo->enable_log_filecount) { |
110 | if (ctx.repo->enable_log_filecount) { |
111 | cols++; |
111 | cols++; |
112 | if (ctx.repo->enable_log_linecount) |
112 | if (ctx.repo->enable_log_linecount) |
113 | cols++; |
113 | cols++; |
114 | } |
114 | } |
115 | htmlf("<tr class='nohover'><td/><td colspan='%d' class='logmsg'>", |
115 | htmlf("<tr class='nohover'><td/><td colspan='%d' class='logmsg'>", |
116 | cols); |
116 | cols); |
117 | html_txt(info->msg); |
117 | html_txt(info->msg); |
118 | html("</td></tr>\n"); |
118 | html("</td></tr>\n"); |
119 | } |
119 | } |
120 | cgit_free_commitinfo(info); |
120 | cgit_free_commitinfo(info); |
121 | } |
121 | } |
122 | |
122 | |
123 | static const char *disambiguate_ref(const char *ref) |
123 | static const char *disambiguate_ref(const char *ref) |
124 | { |
124 | { |
125 | unsigned char sha1[20]; |
125 | unsigned char sha1[20]; |
126 | const char *longref; |
126 | const char *longref; |
127 | |
127 | |
128 | longref = fmt("refs/heads/%s", ref); |
128 | longref = fmt("refs/heads/%s", ref); |
129 | if (get_sha1(longref, sha1) == 0) |
129 | if (get_sha1(longref, sha1) == 0) |
130 | return longref; |
130 | return longref; |
131 | |
131 | |
132 | return ref; |
132 | return ref; |
133 | } |
133 | } |
134 | |
134 | |
135 | void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern, |
135 | void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern, |
136 | char *path, int pager) |
136 | char *path, int pager) |
137 | { |
137 | { |
138 | struct rev_info rev; |
138 | struct rev_info rev; |
139 | struct commit *commit; |
139 | struct commit *commit; |
140 | const char *argv[] = {NULL, NULL, NULL, NULL, NULL}; |
140 | const char *argv[] = {NULL, NULL, NULL, NULL, NULL}; |
|