|
diff --git a/ui-log.c b/ui-log.c index 0947604..4441d1d 100644 --- a/ ui-log.c+++ b/ ui-log.c |
|
@@ -101,100 +101,103 @@ void print_commit(struct commit *commit) |
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}; |
141 | int argc = 2; |
141 | int argc = 2; |
142 | int i, columns = 3; |
142 | int i, columns = 3; |
143 | |
143 | |
144 | if (!tip) |
144 | if (!tip) |
145 | tip = ctx.qry.head; |
145 | tip = ctx.qry.head; |
146 | |
146 | |
147 | argv[1] = disambiguate_ref(tip); |
147 | argv[1] = disambiguate_ref(tip); |
148 | |
148 | |
149 | if (grep && pattern && (!strcmp(grep, "grep") || |
149 | if (grep && pattern) { |
150 | !strcmp(grep, "author") || |
150 | if (!strcmp(grep, "grep") || !strcmp(grep, "author") || |
151 | !strcmp(grep, "committer"))) |
151 | !strcmp(grep, "committer")) |
152 | argv[argc++] = fmt("--%s=%s", grep, pattern); |
152 | argv[argc++] = fmt("--%s=%s", grep, pattern); |
| |
153 | if (!strcmp(grep, "range")) |
| |
154 | argv[1] = pattern; |
| |
155 | } |
153 | |
156 | |
154 | if (path) { |
157 | if (path) { |
155 | argv[argc++] = "--"; |
158 | argv[argc++] = "--"; |
156 | argv[argc++] = path; |
159 | argv[argc++] = path; |
157 | } |
160 | } |
158 | init_revisions(&rev, NULL); |
161 | init_revisions(&rev, NULL); |
159 | rev.abbrev = DEFAULT_ABBREV; |
162 | rev.abbrev = DEFAULT_ABBREV; |
160 | rev.commit_format = CMIT_FMT_DEFAULT; |
163 | rev.commit_format = CMIT_FMT_DEFAULT; |
161 | rev.verbose_header = 1; |
164 | rev.verbose_header = 1; |
162 | rev.show_root_diff = 0; |
165 | rev.show_root_diff = 0; |
163 | setup_revisions(argc, argv, &rev, NULL); |
166 | setup_revisions(argc, argv, &rev, NULL); |
164 | load_ref_decorations(DECORATE_FULL_REFS); |
167 | load_ref_decorations(DECORATE_FULL_REFS); |
165 | rev.show_decorations = 1; |
168 | rev.show_decorations = 1; |
166 | rev.grep_filter.regflags |= REG_ICASE; |
169 | rev.grep_filter.regflags |= REG_ICASE; |
167 | compile_grep_patterns(&rev.grep_filter); |
170 | compile_grep_patterns(&rev.grep_filter); |
168 | prepare_revision_walk(&rev); |
171 | prepare_revision_walk(&rev); |
169 | |
172 | |
170 | if (pager) |
173 | if (pager) |
171 | html("<table class='list nowrap'>"); |
174 | html("<table class='list nowrap'>"); |
172 | |
175 | |
173 | html("<tr class='nohover'><th class='left'>Age</th>" |
176 | html("<tr class='nohover'><th class='left'>Age</th>" |
174 | "<th class='left'>Commit message"); |
177 | "<th class='left'>Commit message"); |
175 | if (pager) { |
178 | if (pager) { |
176 | html(" ("); |
179 | html(" ("); |
177 | cgit_log_link(ctx.qry.showmsg ? "Collapse" : "Expand", NULL, |
180 | cgit_log_link(ctx.qry.showmsg ? "Collapse" : "Expand", NULL, |
178 | NULL, ctx.qry.head, ctx.qry.sha1, |
181 | NULL, ctx.qry.head, ctx.qry.sha1, |
179 | ctx.qry.path, ctx.qry.ofs, ctx.qry.grep, |
182 | ctx.qry.path, ctx.qry.ofs, ctx.qry.grep, |
180 | ctx.qry.search, ctx.qry.showmsg ? 0 : 1); |
183 | ctx.qry.search, ctx.qry.showmsg ? 0 : 1); |
181 | html(")"); |
184 | html(")"); |
182 | } |
185 | } |
183 | html("</th><th class='left'>Author</th>"); |
186 | html("</th><th class='left'>Author</th>"); |
184 | if (ctx.repo->enable_log_filecount) { |
187 | if (ctx.repo->enable_log_filecount) { |
185 | html("<th class='left'>Files</th>"); |
188 | html("<th class='left'>Files</th>"); |
186 | columns++; |
189 | columns++; |
187 | if (ctx.repo->enable_log_linecount) { |
190 | if (ctx.repo->enable_log_linecount) { |
188 | html("<th class='left'>Lines</th>"); |
191 | html("<th class='left'>Lines</th>"); |
189 | columns++; |
192 | columns++; |
190 | } |
193 | } |
191 | } |
194 | } |
192 | html("</tr>\n"); |
195 | html("</tr>\n"); |
193 | |
196 | |
194 | if (ofs<0) |
197 | if (ofs<0) |
195 | ofs = 0; |
198 | ofs = 0; |
196 | |
199 | |
197 | for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; i++) { |
200 | for (i = 0; i < ofs && (commit = get_revision(&rev)) != NULL; i++) { |
198 | free(commit->buffer); |
201 | free(commit->buffer); |
199 | commit->buffer = NULL; |
202 | commit->buffer = NULL; |
200 | free_commit_list(commit->parents); |
203 | free_commit_list(commit->parents); |
|