author | Johan Herland <johan@herland.net> | 2010-11-15 17:39:50 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2010-11-16 07:18:36 (UTC) |
commit | 9a8d39c668b98464bac97d4e5442966de63f97b2 (patch) (unidiff) | |
tree | ee1a7766d6d9365ae45f694939c20cab811abd84 | |
parent | 5a36c2a291a00b59b8ec2f112453e117797c2fe5 (diff) | |
download | cgit-9a8d39c668b98464bac97d4e5442966de63f97b2.zip cgit-9a8d39c668b98464bac97d4e5442966de63f97b2.tar.gz cgit-9a8d39c668b98464bac97d4e5442966de63f97b2.tar.bz2 |
ui-log: Implement support for commit graphs
Teach CGit to print an ASCII art commit graph to the left of the commit
message, similar to 'git log --graph'. The graph adds extra lines (table
rows) to the log when needed to add/remove/shuffle edges in the graph.
When 'showmsg' is enabled, the graph is automatically padded to account
for the extra lines added by the commit message/notes.
This feature is controlled by a new config variable: "enable-commit-graph"
(disabled by default), and individual repos can control it by setting
"repo.enable-commit-graph".
Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | cgit.c | 6 | ||||
-rw-r--r-- | cgit.css | 7 | ||||
-rw-r--r-- | cgit.h | 3 | ||||
-rw-r--r-- | cgitrc.5.txt | 15 | ||||
-rw-r--r-- | shared.c | 1 | ||||
-rw-r--r-- | ui-log.c | 103 |
6 files changed, 112 insertions, 23 deletions
@@ -54,12 +54,14 @@ void repo_config(struct cgit_repo *repo, const char *name, const char *value) | |||
54 | else if (!strcmp(name, "owner")) | 54 | else if (!strcmp(name, "owner")) |
55 | repo->owner = xstrdup(value); | 55 | repo->owner = xstrdup(value); |
56 | else if (!strcmp(name, "defbranch")) | 56 | else if (!strcmp(name, "defbranch")) |
57 | repo->defbranch = xstrdup(value); | 57 | repo->defbranch = xstrdup(value); |
58 | else if (!strcmp(name, "snapshots")) | 58 | else if (!strcmp(name, "snapshots")) |
59 | repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); | 59 | repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); |
60 | else if (!strcmp(name, "enable-commit-graph")) | ||
61 | repo->enable_commit_graph = ctx.cfg.enable_commit_graph * atoi(value); | ||
60 | else if (!strcmp(name, "enable-log-filecount")) | 62 | else if (!strcmp(name, "enable-log-filecount")) |
61 | repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); | 63 | repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); |
62 | else if (!strcmp(name, "enable-log-linecount")) | 64 | else if (!strcmp(name, "enable-log-linecount")) |
63 | repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); | 65 | repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); |
64 | else if (!strcmp(name, "enable-remote-branches")) | 66 | else if (!strcmp(name, "enable-remote-branches")) |
65 | repo->enable_remote_branches = atoi(value); | 67 | repo->enable_remote_branches = atoi(value); |
@@ -138,12 +140,14 @@ void config_cb(const char *name, const char *value) | |||
138 | else if (!strcmp(name, "enable-filter-overrides")) | 140 | else if (!strcmp(name, "enable-filter-overrides")) |
139 | ctx.cfg.enable_filter_overrides = atoi(value); | 141 | ctx.cfg.enable_filter_overrides = atoi(value); |
140 | else if (!strcmp(name, "enable-gitweb-owner")) | 142 | else if (!strcmp(name, "enable-gitweb-owner")) |
141 | ctx.cfg.enable_gitweb_owner = atoi(value); | 143 | ctx.cfg.enable_gitweb_owner = atoi(value); |
142 | else if (!strcmp(name, "enable-index-links")) | 144 | else if (!strcmp(name, "enable-index-links")) |
143 | ctx.cfg.enable_index_links = atoi(value); | 145 | ctx.cfg.enable_index_links = atoi(value); |
146 | else if (!strcmp(name, "enable-commit-graph")) | ||
147 | ctx.cfg.enable_commit_graph = atoi(value); | ||
144 | else if (!strcmp(name, "enable-log-filecount")) | 148 | else if (!strcmp(name, "enable-log-filecount")) |
145 | ctx.cfg.enable_log_filecount = atoi(value); | 149 | ctx.cfg.enable_log_filecount = atoi(value); |
146 | else if (!strcmp(name, "enable-log-linecount")) | 150 | else if (!strcmp(name, "enable-log-linecount")) |
147 | ctx.cfg.enable_log_linecount = atoi(value); | 151 | ctx.cfg.enable_log_linecount = atoi(value); |
148 | else if (!strcmp(name, "enable-remote-branches")) | 152 | else if (!strcmp(name, "enable-remote-branches")) |
149 | ctx.cfg.enable_remote_branches = atoi(value); | 153 | ctx.cfg.enable_remote_branches = atoi(value); |
@@ -537,12 +541,14 @@ void print_repo(FILE *f, struct cgit_repo *repo) | |||
537 | if (repo->module_link) | 541 | if (repo->module_link) |
538 | fprintf(f, "repo.module-link=%s\n", repo->module_link); | 542 | fprintf(f, "repo.module-link=%s\n", repo->module_link); |
539 | if (repo->section) | 543 | if (repo->section) |
540 | fprintf(f, "repo.section=%s\n", repo->section); | 544 | fprintf(f, "repo.section=%s\n", repo->section); |
541 | if (repo->clone_url) | 545 | if (repo->clone_url) |
542 | fprintf(f, "repo.clone-url=%s\n", repo->clone_url); | 546 | fprintf(f, "repo.clone-url=%s\n", repo->clone_url); |
547 | fprintf(f, "repo.enable-commit-graph=%d\n", | ||
548 | repo->enable_commit_graph); | ||
543 | fprintf(f, "repo.enable-log-filecount=%d\n", | 549 | fprintf(f, "repo.enable-log-filecount=%d\n", |
544 | repo->enable_log_filecount); | 550 | repo->enable_log_filecount); |
545 | fprintf(f, "repo.enable-log-linecount=%d\n", | 551 | fprintf(f, "repo.enable-log-linecount=%d\n", |
546 | repo->enable_log_linecount); | 552 | repo->enable_log_linecount); |
547 | if (repo->about_filter && repo->about_filter != ctx.cfg.about_filter) | 553 | if (repo->about_filter && repo->about_filter != ctx.cfg.about_filter) |
548 | fprintf(f, "repo.about-filter=%s\n", repo->about_filter->cmd); | 554 | fprintf(f, "repo.about-filter=%s\n", repo->about_filter->cmd); |
@@ -150,12 +150,17 @@ table.list th { | |||
150 | 150 | ||
151 | table.list td { | 151 | table.list td { |
152 | border: none; | 152 | border: none; |
153 | padding: 0.1em 0.5em 0.1em 0.5em; | 153 | padding: 0.1em 0.5em 0.1em 0.5em; |
154 | } | 154 | } |
155 | 155 | ||
156 | table.list td.commitgraph { | ||
157 | font-family: monospace; | ||
158 | white-space: pre; | ||
159 | } | ||
160 | |||
156 | table.list td.logsubject { | 161 | table.list td.logsubject { |
157 | font-family: monospace; | 162 | font-family: monospace; |
158 | font-weight: bold; | 163 | font-weight: bold; |
159 | } | 164 | } |
160 | 165 | ||
161 | table.list td.logmsg { | 166 | table.list td.logmsg { |
@@ -728,7 +733,7 @@ table.ssdiff td.foot { | |||
728 | table.ssdiff td.space { | 733 | table.ssdiff td.space { |
729 | border: none; | 734 | border: none; |
730 | } | 735 | } |
731 | 736 | ||
732 | table.ssdiff td.space div { | 737 | table.ssdiff td.space div { |
733 | min-height: 3em; | 738 | min-height: 3em; |
734 | } \ No newline at end of file | 739 | } |
@@ -17,12 +17,13 @@ | |||
17 | #include <archive.h> | 17 | #include <archive.h> |
18 | #include <string-list.h> | 18 | #include <string-list.h> |
19 | #include <xdiff-interface.h> | 19 | #include <xdiff-interface.h> |
20 | #include <xdiff/xdiff.h> | 20 | #include <xdiff/xdiff.h> |
21 | #include <utf8.h> | 21 | #include <utf8.h> |
22 | #include <notes.h> | 22 | #include <notes.h> |
23 | #include <graph.h> | ||
23 | 24 | ||
24 | 25 | ||
25 | /* | 26 | /* |
26 | * Dateformats used on misc. pages | 27 | * Dateformats used on misc. pages |
27 | */ | 28 | */ |
28 | #define FMT_LONGDATE "%Y-%m-%d %H:%M:%S (%Z)" | 29 | #define FMT_LONGDATE "%Y-%m-%d %H:%M:%S (%Z)" |
@@ -68,12 +69,13 @@ struct cgit_repo { | |||
68 | char *defbranch; | 69 | char *defbranch; |
69 | char *module_link; | 70 | char *module_link; |
70 | char *readme; | 71 | char *readme; |
71 | char *section; | 72 | char *section; |
72 | char *clone_url; | 73 | char *clone_url; |
73 | int snapshots; | 74 | int snapshots; |
75 | int enable_commit_graph; | ||
74 | int enable_log_filecount; | 76 | int enable_log_filecount; |
75 | int enable_log_linecount; | 77 | int enable_log_linecount; |
76 | int enable_remote_branches; | 78 | int enable_remote_branches; |
77 | int enable_subject_links; | 79 | int enable_subject_links; |
78 | int max_stats; | 80 | int max_stats; |
79 | time_t mtime; | 81 | time_t mtime; |
@@ -185,12 +187,13 @@ struct cgit_config { | |||
185 | int cache_scanrc_ttl; | 187 | int cache_scanrc_ttl; |
186 | int cache_static_ttl; | 188 | int cache_static_ttl; |
187 | int embedded; | 189 | int embedded; |
188 | int enable_filter_overrides; | 190 | int enable_filter_overrides; |
189 | int enable_gitweb_owner; | 191 | int enable_gitweb_owner; |
190 | int enable_index_links; | 192 | int enable_index_links; |
193 | int enable_commit_graph; | ||
191 | int enable_log_filecount; | 194 | int enable_log_filecount; |
192 | int enable_log_linecount; | 195 | int enable_log_linecount; |
193 | int enable_remote_branches; | 196 | int enable_remote_branches; |
194 | int enable_subject_links; | 197 | int enable_subject_links; |
195 | int enable_tree_linenumbers; | 198 | int enable_tree_linenumbers; |
196 | int local_time; | 199 | int local_time; |
diff --git a/cgitrc.5.txt b/cgitrc.5.txt index 75b6584..b45c46b 100644 --- a/cgitrc.5.txt +++ b/cgitrc.5.txt | |||
@@ -87,13 +87,18 @@ css:: | |||
87 | Default value: "/cgit.css". | 87 | Default value: "/cgit.css". |
88 | 88 | ||
89 | embedded:: | 89 | embedded:: |
90 | Flag which, when set to "1", will make cgit generate a html fragment | 90 | Flag which, when set to "1", will make cgit generate a html fragment |
91 | suitable for embedding in other html pages. Default value: none. See | 91 | suitable for embedding in other html pages. Default value: none. See |
92 | also: "noheader". | 92 | also: "noheader". |
93 | 93 | ||
94 | enable-commit-graph:: | ||
95 | Flag which, when set to "1", will make cgit print an ASCII-art commit | ||
96 | history graph to the left of the commit messages in the repository | ||
97 | log page. Default value: "0". | ||
98 | |||
94 | enable-filter-overrides:: | 99 | enable-filter-overrides:: |
95 | Flag which, when set to "1", allows all filter settings to be | 100 | Flag which, when set to "1", allows all filter settings to be |
96 | overridden in repository-specific cgitrc files. Default value: none. | 101 | overridden in repository-specific cgitrc files. Default value: none. |
97 | 102 | ||
98 | enable-gitweb-owner:: | 103 | enable-gitweb-owner:: |
99 | If set to "1" and scan-path is enabled, we first check each repository | 104 | If set to "1" and scan-path is enabled, we first check each repository |
@@ -351,12 +356,16 @@ repo.defbranch:: | |||
351 | exists in the repository, the first branch name (when sorted) is used | 356 | exists in the repository, the first branch name (when sorted) is used |
352 | as default instead. Default value: "master". | 357 | as default instead. Default value: "master". |
353 | 358 | ||
354 | repo.desc:: | 359 | repo.desc:: |
355 | The value to show as repository description. Default value: none. | 360 | The value to show as repository description. Default value: none. |
356 | 361 | ||
362 | repo.enable-commit-graph:: | ||
363 | A flag which can be used to disable the global setting | ||
364 | `enable-commit-graph'. Default value: none. | ||
365 | |||
357 | repo.enable-log-filecount:: | 366 | repo.enable-log-filecount:: |
358 | A flag which can be used to disable the global setting | 367 | A flag which can be used to disable the global setting |
359 | `enable-log-filecount'. Default value: none. | 368 | `enable-log-filecount'. Default value: none. |
360 | 369 | ||
361 | repo.enable-log-linecount:: | 370 | repo.enable-log-linecount:: |
362 | A flag which can be used to disable the global setting | 371 | A flag which can be used to disable the global setting |
@@ -438,12 +447,16 @@ css=/css/cgit.css | |||
438 | 447 | ||
439 | 448 | ||
440 | # Show extra links for each repository on the index page | 449 | # Show extra links for each repository on the index page |
441 | enable-index-links=1 | 450 | enable-index-links=1 |
442 | 451 | ||
443 | 452 | ||
453 | # Enable ASCII art commit history graph on the log pages | ||
454 | enable-commit-graph=1 | ||
455 | |||
456 | |||
444 | # Show number of affected files per commit on the log pages | 457 | # Show number of affected files per commit on the log pages |
445 | enable-log-filecount=1 | 458 | enable-log-filecount=1 |
446 | 459 | ||
447 | 460 | ||
448 | # Show number of added/removed lines per commit on the log pages | 461 | # Show number of added/removed lines per commit on the log pages |
449 | enable-log-linecount=1 | 462 | enable-log-linecount=1 |
@@ -53,12 +53,13 @@ struct cgit_repo *cgit_add_repo(const char *url) | |||
53 | ret->path = NULL; | 53 | ret->path = NULL; |
54 | ret->desc = "[no description]"; | 54 | ret->desc = "[no description]"; |
55 | ret->owner = NULL; | 55 | ret->owner = NULL; |
56 | ret->section = ctx.cfg.section; | 56 | ret->section = ctx.cfg.section; |
57 | ret->defbranch = "master"; | 57 | ret->defbranch = "master"; |
58 | ret->snapshots = ctx.cfg.snapshots; | 58 | ret->snapshots = ctx.cfg.snapshots; |
59 | ret->enable_commit_graph = ctx.cfg.enable_commit_graph; | ||
59 | ret->enable_log_filecount = ctx.cfg.enable_log_filecount; | 60 | ret->enable_log_filecount = ctx.cfg.enable_log_filecount; |
60 | ret->enable_log_linecount = ctx.cfg.enable_log_linecount; | 61 | ret->enable_log_linecount = ctx.cfg.enable_log_linecount; |
61 | ret->enable_remote_branches = ctx.cfg.enable_remote_branches; | 62 | ret->enable_remote_branches = ctx.cfg.enable_remote_branches; |
62 | ret->enable_subject_links = ctx.cfg.enable_subject_links; | 63 | ret->enable_subject_links = ctx.cfg.enable_subject_links; |
63 | ret->max_stats = ctx.cfg.max_stats; | 64 | ret->max_stats = ctx.cfg.max_stats; |
64 | ret->module_link = ctx.cfg.module_link; | 65 | ret->module_link = ctx.cfg.module_link; |
@@ -74,28 +74,56 @@ void show_commit_decorations(struct commit *commit) | |||
74 | ctx.qry.vpath, 0); | 74 | ctx.qry.vpath, 0); |
75 | } | 75 | } |
76 | deco = deco->next; | 76 | deco = deco->next; |
77 | } | 77 | } |
78 | } | 78 | } |
79 | 79 | ||
80 | void print_commit(struct commit *commit) | 80 | void print_commit(struct commit *commit, struct rev_info *revs) |
81 | { | 81 | { |
82 | struct commitinfo *info; | 82 | struct commitinfo *info; |
83 | char *tmp; | 83 | char *tmp; |
84 | int cols = 2; | 84 | int cols = 2; |
85 | struct strbuf graphbuf = STRBUF_INIT; | ||
86 | |||
87 | if (ctx.repo->enable_log_filecount) { | ||
88 | cols++; | ||
89 | if (ctx.repo->enable_log_linecount) | ||
90 | cols++; | ||
91 | } | ||
92 | |||
93 | if (revs->graph) { | ||
94 | /* Advance graph until current commit */ | ||
95 | while (!graph_next_line(revs->graph, &graphbuf)) { | ||
96 | /* Print graph segment in otherwise empty table row */ | ||
97 | html("<tr class='nohover'><td/><td class='commitgraph'>"); | ||
98 | html(graphbuf.buf); | ||
99 | htmlf("</td><td colspan='%d' /></tr>\n", cols); | ||
100 | strbuf_setlen(&graphbuf, 0); | ||
101 | } | ||
102 | /* Current commit's graph segment is now ready in graphbuf */ | ||
103 | } | ||
85 | 104 | ||
86 | info = cgit_parse_commit(commit); | 105 | info = cgit_parse_commit(commit); |
87 | htmlf("<tr%s><td>", | 106 | htmlf("<tr%s><td>", |
88 | ctx.qry.showmsg ? " class='logheader'" : ""); | 107 | ctx.qry.showmsg ? " class='logheader'" : ""); |
89 | tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1)); | 108 | tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1)); |
90 | tmp = cgit_fileurl(ctx.repo->url, "commit", ctx.qry.vpath, tmp); | 109 | tmp = cgit_fileurl(ctx.repo->url, "commit", ctx.qry.vpath, tmp); |
91 | html_link_open(tmp, NULL, NULL); | 110 | html_link_open(tmp, NULL, NULL); |
92 | cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); | 111 | cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); |
93 | html_link_close(); | 112 | html_link_close(); |
94 | htmlf("</td><td%s>", | 113 | html("</td>"); |
95 | ctx.qry.showmsg ? " class='logsubject'" : ""); | 114 | |
115 | if (revs->graph) { | ||
116 | /* Print graph segment for current commit */ | ||
117 | html("<td class='commitgraph'>"); | ||
118 | html(graphbuf.buf); | ||
119 | html("</td>"); | ||
120 | strbuf_setlen(&graphbuf, 0); | ||
121 | } | ||
122 | |||
123 | htmlf("<td%s>", ctx.qry.showmsg ? " class='logsubject'" : ""); | ||
96 | cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head, | 124 | cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head, |
97 | sha1_to_hex(commit->object.sha1), ctx.qry.vpath, 0); | 125 | sha1_to_hex(commit->object.sha1), ctx.qry.vpath, 0); |
98 | show_commit_decorations(commit); | 126 | show_commit_decorations(commit); |
99 | html("</td><td>"); | 127 | html("</td><td>"); |
100 | html_txt(info->author); | 128 | html_txt(info->author); |
101 | if (ctx.repo->enable_log_filecount) { | 129 | if (ctx.repo->enable_log_filecount) { |
@@ -109,38 +137,65 @@ void print_commit(struct commit *commit) | |||
109 | html("</td><td>"); | 137 | html("</td><td>"); |
110 | htmlf("-%d/+%d", rem_lines, add_lines); | 138 | htmlf("-%d/+%d", rem_lines, add_lines); |
111 | } | 139 | } |
112 | } | 140 | } |
113 | html("</td></tr>\n"); | 141 | html("</td></tr>\n"); |
114 | 142 | ||
115 | if (ctx.qry.showmsg) { /* Print message + notes in a second table row */ | 143 | if (revs->graph || ctx.qry.showmsg) { /* Print a second table row */ |
116 | /* Concatenate commit message and notes in msgbuf */ | ||
117 | struct strbuf msgbuf = STRBUF_INIT; | 144 | struct strbuf msgbuf = STRBUF_INIT; |
118 | if (info->msg && *(info->msg)) { | 145 | html("<tr class='nohover'><td/>"); /* Empty 'Age' column */ |
119 | strbuf_addstr(&msgbuf, info->msg); | 146 | |
147 | if (ctx.qry.showmsg) { | ||
148 | /* Concatenate commit message + notes in msgbuf */ | ||
149 | if (info->msg && *(info->msg)) { | ||
150 | strbuf_addstr(&msgbuf, info->msg); | ||
151 | strbuf_addch(&msgbuf, '\n'); | ||
152 | } | ||
153 | format_note(NULL, commit->object.sha1, &msgbuf, | ||
154 | PAGE_ENCODING, | ||
155 | NOTES_SHOW_HEADER | NOTES_INDENT); | ||
120 | strbuf_addch(&msgbuf, '\n'); | 156 | strbuf_addch(&msgbuf, '\n'); |
157 | strbuf_ltrim(&msgbuf); | ||
121 | } | 158 | } |
122 | format_note(NULL, commit->object.sha1, &msgbuf, PAGE_ENCODING, | ||
123 | NOTES_SHOW_HEADER | NOTES_INDENT); | ||
124 | strbuf_addch(&msgbuf, '\n'); | ||
125 | strbuf_ltrim(&msgbuf); | ||
126 | 159 | ||
127 | if (ctx.repo->enable_log_filecount) { | 160 | if (revs->graph) { |
128 | cols++; | 161 | int lines = 0; |
129 | if (ctx.repo->enable_log_linecount) | 162 | |
130 | cols++; | 163 | /* Calculate graph padding */ |
164 | if (ctx.qry.showmsg) { | ||
165 | /* Count #lines in commit message + notes */ | ||
166 | const char *p = msgbuf.buf; | ||
167 | lines = 1; | ||
168 | while ((p = strchr(p, '\n'))) { | ||
169 | p++; | ||
170 | lines++; | ||
171 | } | ||
172 | } | ||
173 | |||
174 | /* Print graph padding */ | ||
175 | html("<td class='commitgraph'>"); | ||
176 | while (lines > 0 || !graph_is_commit_finished(revs->graph)) { | ||
177 | if (graphbuf.len) | ||
178 | html("\n"); | ||
179 | strbuf_setlen(&graphbuf, 0); | ||
180 | graph_next_line(revs->graph, &graphbuf); | ||
181 | html(graphbuf.buf); | ||
182 | lines--; | ||
183 | } | ||
184 | html("</td>\n"); | ||
131 | } | 185 | } |
132 | 186 | ||
133 | /* Create second table row containing msgbuf */ | 187 | /* Print msgbuf into remainder of table row */ |
134 | htmlf("<tr class='nohover'><td/><td colspan='%d' class='logmsg'>", | 188 | htmlf("<td colspan='%d'%s>\n", cols, |
135 | cols); | 189 | ctx.qry.showmsg ? " class='logmsg'" : ""); |
136 | html_txt(msgbuf.buf); | 190 | html_txt(msgbuf.buf); |
137 | html("</td></tr>\n"); | 191 | html("</td></tr>\n"); |
138 | strbuf_release(&msgbuf); | 192 | strbuf_release(&msgbuf); |
139 | } | 193 | } |
140 | 194 | ||
195 | strbuf_release(&graphbuf); | ||
141 | cgit_free_commitinfo(info); | 196 | cgit_free_commitinfo(info); |
142 | } | 197 | } |
143 | 198 | ||
144 | static const char *disambiguate_ref(const char *ref) | 199 | static const char *disambiguate_ref(const char *ref) |
145 | { | 200 | { |
146 | unsigned char sha1[20]; | 201 | unsigned char sha1[20]; |
@@ -213,12 +268,16 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern | |||
213 | break; | 268 | break; |
214 | } | 269 | } |
215 | vector_push(&vec, &arg, 0); | 270 | vector_push(&vec, &arg, 0); |
216 | } | 271 | } |
217 | } | 272 | } |
218 | } | 273 | } |
274 | if (ctx.repo->enable_commit_graph) { | ||
275 | static const char *graph_arg = "--graph"; | ||
276 | vector_push(&vec, &graph_arg, 0); | ||
277 | } | ||
219 | 278 | ||
220 | if (path) { | 279 | if (path) { |
221 | arg = "--"; | 280 | arg = "--"; |
222 | vector_push(&vec, &arg, 0); | 281 | vector_push(&vec, &arg, 0); |
223 | vector_push(&vec, &path, 0); | 282 | vector_push(&vec, &path, 0); |
224 | } | 283 | } |
@@ -239,14 +298,16 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern | |||
239 | compile_grep_patterns(&rev.grep_filter); | 298 | compile_grep_patterns(&rev.grep_filter); |
240 | prepare_revision_walk(&rev); | 299 | prepare_revision_walk(&rev); |
241 | 300 | ||
242 | if (pager) | 301 | if (pager) |
243 | html("<table class='list nowrap'>"); | 302 | html("<table class='list nowrap'>"); |
244 | 303 | ||
245 | html("<tr class='nohover'><th class='left'>Age</th>" | 304 | html("<tr class='nohover'><th class='left'>Age</th>"); |
246 | "<th class='left'>Commit message"); | 305 | if (ctx.repo->enable_commit_graph) |
306 | html("<th></th>"); | ||
307 | html("<th class='left'>Commit message"); | ||
247 | if (pager) { | 308 | if (pager) { |
248 | html(" ("); | 309 | html(" ("); |
249 | cgit_log_link(ctx.qry.showmsg ? "Collapse" : "Expand", NULL, | 310 | cgit_log_link(ctx.qry.showmsg ? "Collapse" : "Expand", NULL, |
250 | NULL, ctx.qry.head, ctx.qry.sha1, | 311 | NULL, ctx.qry.head, ctx.qry.sha1, |
251 | ctx.qry.vpath, ctx.qry.ofs, ctx.qry.grep, | 312 | ctx.qry.vpath, ctx.qry.ofs, ctx.qry.grep, |
252 | ctx.qry.search, ctx.qry.showmsg ? 0 : 1); | 313 | ctx.qry.search, ctx.qry.showmsg ? 0 : 1); |
@@ -271,13 +332,13 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern | |||
271 | commit->buffer = NULL; | 332 | commit->buffer = NULL; |
272 | free_commit_list(commit->parents); | 333 | free_commit_list(commit->parents); |
273 | commit->parents = NULL; | 334 | commit->parents = NULL; |
274 | } | 335 | } |
275 | 336 | ||
276 | for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) { | 337 | for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) { |
277 | print_commit(commit); | 338 | print_commit(commit, &rev); |
278 | free(commit->buffer); | 339 | free(commit->buffer); |
279 | commit->buffer = NULL; | 340 | commit->buffer = NULL; |
280 | free_commit_list(commit->parents); | 341 | free_commit_list(commit->parents); |
281 | commit->parents = NULL; | 342 | commit->parents = NULL; |
282 | } | 343 | } |
283 | if (pager) { | 344 | if (pager) { |