aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Johan Herland <johan@herland.net>2010-11-16 02:39:50 (JST)
committerGravatar Lars Hjemli <hjemli@gmail.com>2010-11-16 16:18:36 (JST)
commit9a8d39c668b98464bac97d4e5442966de63f97b2 (patch)
treeee1a7766d6d9365ae45f694939c20cab811abd84
parent5a36c2a291a00b59b8ec2f112453e117797c2fe5 (diff)
downloadcgit-9a8d39c668b98464bac97d4e5442966de63f97b2.zip
cgit-9a8d39c668b98464bac97d4e5442966de63f97b2.tar.gz
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.c6
-rw-r--r--cgit.css7
-rw-r--r--cgit.h3
-rw-r--r--cgitrc.5.txt15
-rw-r--r--shared.c1
-rw-r--r--ui-log.c103
6 files changed, 112 insertions, 23 deletions
diff --git a/cgit.c b/cgit.c
index 412fbf0..53ab68d 100644
--- a/cgit.c
+++ b/cgit.c
@@ -57,6 +57,8 @@ void repo_config(struct cgit_repo *repo, const char *name, const char *value)
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"))
@@ -141,6 +143,8 @@ void config_cb(const char *name, const char *value)
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"))
@@ -540,6 +544,8 @@ void print_repo(FILE *f, struct cgit_repo *repo)
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",
diff --git a/cgit.css b/cgit.css
index 7a5f423..7600e84 100644
--- a/cgit.css
+++ b/cgit.css
@@ -153,6 +153,11 @@ table.list td {
153 padding: 0.1em 0.5em 0.1em 0.5em; 153 padding: 0.1em 0.5em 0.1em 0.5em;
154} 154}
155 155
156table.list td.commitgraph {
157 font-family: monospace;
158 white-space: pre;
159}
160
156table.list td.logsubject { 161table.list td.logsubject {
157 font-family: monospace; 162 font-family: monospace;
158 font-weight: bold; 163 font-weight: bold;
@@ -731,4 +736,4 @@ table.ssdiff td.space {
731 736
732table.ssdiff td.space div { 737table.ssdiff td.space div {
733 min-height: 3em; 738 min-height: 3em;
734} \ No newline at end of file 739}
diff --git a/cgit.h b/cgit.h
index f5f68ac..bed770b 100644
--- a/cgit.h
+++ b/cgit.h
@@ -20,6 +20,7 @@
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/*
@@ -71,6 +72,7 @@ struct cgit_repo {
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;
@@ -188,6 +190,7 @@ struct cgit_config {
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;
diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index 75b6584..b45c46b 100644
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -90,7 +90,12 @@ 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
94enable-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
94enable-filter-overrides:: 99enable-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.
@@ -354,6 +359,10 @@ repo.defbranch::
354repo.desc:: 359repo.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
362repo.enable-commit-graph::
363 A flag which can be used to disable the global setting
364 `enable-commit-graph'. Default value: none.
365
357repo.enable-log-filecount:: 366repo.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.
@@ -441,6 +450,10 @@ css=/css/cgit.css
441enable-index-links=1 450enable-index-links=1
442 451
443 452
453# Enable ASCII art commit history graph on the log pages
454enable-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
445enable-log-filecount=1 458enable-log-filecount=1
446 459
diff --git a/shared.c b/shared.c
index 765cd27..7ec2e19 100644
--- a/shared.c
+++ b/shared.c
@@ -56,6 +56,7 @@ struct cgit_repo *cgit_add_repo(const char *url)
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;
diff --git a/ui-log.c b/ui-log.c
index 6d7fcae..0d86fd5 100644
--- a/ui-log.c
+++ b/ui-log.c
@@ -77,11 +77,30 @@ void show_commit_decorations(struct commit *commit)
77 } 77 }
78} 78}
79 79
80void print_commit(struct commit *commit) 80void 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>",
@@ -91,8 +110,17 @@ void print_commit(struct commit *commit)
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);
@@ -112,32 +140,59 @@ void print_commit(struct commit *commit)
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
@@ -216,6 +271,10 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
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 = "--";
@@ -242,8 +301,10 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
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,
@@ -274,7 +335,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern
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);