-rw-r--r-- | cmd.c | 3 | ||||
-rw-r--r-- | ui-log.c | 35 | ||||
-rw-r--r-- | ui-log.h | 3 | ||||
-rw-r--r-- | ui-summary.c | 2 |
4 files changed, 35 insertions, 8 deletions
@@ -68,5 +68,6 @@ static void log_fn(struct cgit_context *ctx) | |||
68 | { | 68 | { |
69 | cgit_print_log(ctx->qry.sha1, ctx->qry.ofs, ctx->cfg.max_commit_count, | 69 | cgit_print_log(ctx->qry.sha1, ctx->qry.ofs, ctx->cfg.max_commit_count, |
70 | ctx->qry.grep, ctx->qry.search, ctx->qry.path, 1); | 70 | ctx->qry.grep, ctx->qry.search, ctx->qry.path, 1, |
71 | ctx->repo->enable_commit_graph); | ||
71 | } | 72 | } |
72 | 73 | ||
@@ -99,4 +99,5 @@ void print_commit(struct commit *commit, struct rev_info *revs) | |||
99 | int cols = 2; | 99 | int cols = 2; |
100 | struct strbuf graphbuf = STRBUF_INIT; | 100 | struct strbuf graphbuf = STRBUF_INIT; |
101 | struct strbuf msgbuf = STRBUF_INIT; | ||
101 | 102 | ||
102 | if (ctx.repo->enable_log_filecount) { | 103 | if (ctx.repo->enable_log_filecount) { |
@@ -137,4 +138,29 @@ void print_commit(struct commit *commit, struct rev_info *revs) | |||
137 | 138 | ||
138 | htmlf("<td%s>", ctx.qry.showmsg ? " class='logsubject'" : ""); | 139 | htmlf("<td%s>", ctx.qry.showmsg ? " class='logsubject'" : ""); |
140 | if (ctx.qry.showmsg) { | ||
141 | /* line-wrap long commit subjects instead of truncating them */ | ||
142 | size_t subject_len = strlen(info->subject); | ||
143 | |||
144 | if (subject_len > ctx.cfg.max_msg_len && | ||
145 | ctx.cfg.max_msg_len >= 15) { | ||
146 | /* symbol for signaling line-wrap (in PAGE_ENCODING) */ | ||
147 | const char wrap_symbol[] = { ' ', 0xE2, 0x86, 0xB5, 0 }; | ||
148 | int i = ctx.cfg.max_msg_len - strlen(wrap_symbol); | ||
149 | |||
150 | /* Rewind i to preceding space character */ | ||
151 | while (i > 0 && !isspace(info->subject[i])) | ||
152 | --i; | ||
153 | if (!i) /* Oops, zero spaces. Reset i */ | ||
154 | i = ctx.cfg.max_msg_len - strlen(wrap_symbol); | ||
155 | |||
156 | /* add remainder starting at i to msgbuf */ | ||
157 | strbuf_add(&msgbuf, info->subject + i, subject_len - i); | ||
158 | strbuf_trim(&msgbuf); | ||
159 | strbuf_add(&msgbuf, "\n\n", 2); | ||
160 | |||
161 | /* Place wrap_symbol at position i in info->subject */ | ||
162 | strcpy(info->subject + i, wrap_symbol); | ||
163 | } | ||
164 | } | ||
139 | cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head, | 165 | cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head, |
140 | sha1_to_hex(commit->object.sha1), ctx.qry.vpath, 0); | 166 | sha1_to_hex(commit->object.sha1), ctx.qry.vpath, 0); |
@@ -157,5 +183,4 @@ void print_commit(struct commit *commit, struct rev_info *revs) | |||
157 | 183 | ||
158 | if (revs->graph || ctx.qry.showmsg) { /* Print a second table row */ | 184 | if (revs->graph || ctx.qry.showmsg) { /* Print a second table row */ |
159 | struct strbuf msgbuf = STRBUF_INIT; | ||
160 | html("<tr class='nohover'><td/>"); /* Empty 'Age' column */ | 185 | html("<tr class='nohover'><td/>"); /* Empty 'Age' column */ |
161 | 186 | ||
@@ -205,7 +230,7 @@ void print_commit(struct commit *commit, struct rev_info *revs) | |||
205 | html_txt(msgbuf.buf); | 230 | html_txt(msgbuf.buf); |
206 | html("</td></tr>\n"); | 231 | html("</td></tr>\n"); |
207 | strbuf_release(&msgbuf); | ||
208 | } | 232 | } |
209 | 233 | ||
234 | strbuf_release(&msgbuf); | ||
210 | strbuf_release(&graphbuf); | 235 | strbuf_release(&graphbuf); |
211 | cgit_free_commitinfo(info); | 236 | cgit_free_commitinfo(info); |
@@ -247,5 +272,5 @@ static char *next_token(char **src) | |||
247 | 272 | ||
248 | void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern, | 273 | void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern, |
249 | char *path, int pager) | 274 | char *path, int pager, int commit_graph) |
250 | { | 275 | { |
251 | struct rev_info rev; | 276 | struct rev_info rev; |
@@ -287,5 +312,5 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern | |||
287 | } | 312 | } |
288 | } | 313 | } |
289 | if (ctx.repo->enable_commit_graph) { | 314 | if (commit_graph) { |
290 | static const char *graph_arg = "--graph"; | 315 | static const char *graph_arg = "--graph"; |
291 | static const char *color_arg = "--color"; | 316 | static const char *color_arg = "--color"; |
@@ -322,5 +347,5 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern | |||
322 | 347 | ||
323 | html("<tr class='nohover'><th class='left'>Age</th>"); | 348 | html("<tr class='nohover'><th class='left'>Age</th>"); |
324 | if (ctx.repo->enable_commit_graph) | 349 | if (commit_graph) |
325 | html("<th></th>"); | 350 | html("<th></th>"); |
326 | html("<th class='left'>Commit message"); | 351 | html("<th class='left'>Commit message"); |
@@ -3,5 +3,6 @@ | |||
3 | 3 | ||
4 | extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, | 4 | extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, |
5 | char *pattern, char *path, int pager); | 5 | char *pattern, char *path, int pager, |
6 | int commit_graph); | ||
6 | extern void show_commit_decorations(struct commit *commit); | 7 | extern void show_commit_decorations(struct commit *commit); |
7 | 8 | ||
diff --git a/ui-summary.c b/ui-summary.c index b203bcc..5be2545 100644 --- a/ui-summary.c +++ b/ui-summary.c | |||
@@ -60,5 +60,5 @@ void cgit_print_summary() | |||
60 | html("<tr class='nohover'><td colspan='4'> </td></tr>"); | 60 | html("<tr class='nohover'><td colspan='4'> </td></tr>"); |
61 | cgit_print_log(ctx.qry.head, 0, ctx.cfg.summary_log, NULL, | 61 | cgit_print_log(ctx.qry.head, 0, ctx.cfg.summary_log, NULL, |
62 | NULL, NULL, 0); | 62 | NULL, NULL, 0, 0); |
63 | } | 63 | } |
64 | if (ctx.repo->clone_url) | 64 | if (ctx.repo->clone_url) |