| -rw-r--r-- | Makefile | 7 | ||||
| -rw-r--r-- | README | 9 | ||||
| -rw-r--r-- | cgit.c | 28 | ||||
| -rw-r--r-- | cgit.css | 42 | ||||
| -rw-r--r-- | cgit.h | 6 | ||||
| -rw-r--r-- | cgit.png | bin | 1488 -> 1840 bytes | |||
| -rw-r--r-- | cgitrc.5.txt | 40 | ||||
| -rw-r--r-- | cmd.c | 3 | ||||
| m--------- | git | 0 | ||||
| -rw-r--r-- | html.c | 6 | ||||
| -rw-r--r-- | parsing.c | 24 | ||||
| -rw-r--r-- | scan-tree.c | 21 | ||||
| -rw-r--r-- | shared.c | 1 | ||||
| -rw-r--r-- | ui-diff.c | 19 | ||||
| -rw-r--r-- | ui-diff.h | 6 | ||||
| -rw-r--r-- | ui-log.c | 287 | ||||
| -rw-r--r-- | ui-log.h | 3 | ||||
| -rw-r--r-- | ui-shared.c | 20 | ||||
| -rw-r--r-- | ui-ssdiff.c | 34 | ||||
| -rw-r--r-- | ui-summary.c | 2 | ||||
| -rw-r--r-- | ui-tree.c | 2 | ||||
| -rw-r--r-- | vector.c | 38 | ||||
| -rw-r--r-- | vector.h | 17 |
23 files changed, 130 insertions, 485 deletions
@@ -1,4 +1,4 @@ -CGIT_VERSION = v0.9 +CGIT_VERSION = v0.8.3.4 CGIT_SCRIPT_NAME = cgit.cgi CGIT_SCRIPT_PATH = /var/www/htdocs/cgit CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH) @@ -12,7 +12,7 @@ htmldir = $(docdir) pdfdir = $(docdir) mandir = $(prefix)/share/man SHA1_HEADER = <openssl/sha.h> -GIT_VER = 1.7.4 +GIT_VER = 1.7.3 GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 INSTALL = install MAN5_TXT = $(wildcard *.5.txt) @@ -115,7 +115,6 @@ OBJECTS += ui-stats.o OBJECTS += ui-summary.o OBJECTS += ui-tag.o OBJECTS += ui-tree.o -OBJECTS += vector.o ifdef NEEDS_LIBICONV EXTLIBS += -liconv @@ -241,4 +240,4 @@ clean-doc: rm -f cgitrc.5 cgitrc.5.html cgitrc.5.pdf cgitrc.5.xml cgitrc.5.fo get-git: - curl $(GIT_URL) | tar -xjf - && rm -rf git && mv git-$(GIT_VER) git + curl $(GIT_URL) | tar -xj && rm -rf git && mv git-$(GIT_VER) git @@ -36,7 +36,7 @@ file (see the Makefile for details). Dependencies: - -git 1.7.4 + -git 1.5.3 -zip lib -crypto lib -openssl lib @@ -86,6 +86,13 @@ The missing features repository. This should probably be extended to a generic map between submodule path and url. +* Branch- and tag-lists in the summary page can get very long, they should + probably only show something like the ten "latest modified" branches and + a similar number of "most recent" tags. + +* There should be a new page for browsing refs/heads and refs/tags, with links + from the summary page whenever the branch/tag lists overflow. + * The log-page should have more/better search options (author, committer, pickaxe, paths) and possibly support arbitrary revision specifiers. @@ -29,17 +29,15 @@ void add_mimetype(const char *name, const char *value) struct cgit_filter *new_filter(const char *cmd, int extra_args) { struct cgit_filter *f; - int args_size = 0; if (!cmd || !cmd[0]) return NULL; f = xmalloc(sizeof(struct cgit_filter)); f->cmd = xstrdup(cmd); - args_size = (2 + extra_args) * sizeof(char *); - f->argv = xmalloc(args_size); - memset(f->argv, 0, args_size); + f->argv = xmalloc((2 + extra_args) * sizeof(char *)); f->argv[0] = f->cmd; + f->argv[1] = NULL; return f; } @@ -59,8 +57,6 @@ void repo_config(struct cgit_repo *repo, const char *name, const char *value) repo->defbranch = xstrdup(value); else if (!strcmp(name, "snapshots")) repo->snapshots = ctx.cfg.snapshots & cgit_parse_snapshots_mask(value); - else if (!strcmp(name, "enable-commit-graph")) - repo->enable_commit_graph = ctx.cfg.enable_commit_graph * atoi(value); else if (!strcmp(name, "enable-log-filecount")) repo->enable_log_filecount = ctx.cfg.enable_log_filecount * atoi(value); else if (!strcmp(name, "enable-log-linecount")) @@ -75,13 +71,9 @@ void repo_config(struct cgit_repo *repo, const char *name, const char *value) repo->module_link= xstrdup(value); else if (!strcmp(name, "section")) repo->section = xstrdup(value); - else if (!strcmp(name, "readme") && value != NULL) + else if (!strcmp(name, "readme") && value != NULL) { repo->readme = xstrdup(value); - else if (!strcmp(name, "logo") && value != NULL) - repo->logo = xstrdup(value); - else if (!strcmp(name, "logo-link") && value != NULL) - repo->logo_link = xstrdup(value); - else if (ctx.cfg.enable_filter_overrides) { + } else if (ctx.cfg.enable_filter_overrides) { if (!strcmp(name, "about-filter")) repo->about_filter = new_filter(value, 0); else if (!strcmp(name, "commit-filter")) @@ -151,8 +143,6 @@ void config_cb(const char *name, const char *value) ctx.cfg.enable_http_clone = atoi(value); else if (!strcmp(name, "enable-index-links")) ctx.cfg.enable_index_links = atoi(value); - else if (!strcmp(name, "enable-commit-graph")) - ctx.cfg.enable_commit_graph = atoi(value); else if (!strcmp(name, "enable-log-filecount")) ctx.cfg.enable_log_filecount = atoi(value); else if (!strcmp(name, "enable-log-linecount")) @@ -207,8 +197,6 @@ void config_cb(const char *name, const char *value) ctx.cfg.project_list, repo_config); else scan_tree(expand_macros(value), repo_config); - else if (!strcmp(name, "scan-hidden-path")) - ctx.cfg.scan_hidden_path = atoi(value); else if (!strcmp(name, "section-from-path")) ctx.cfg.section_from_path = atoi(value); else if (!strcmp(name, "source-filter")) @@ -330,7 +318,6 @@ static void prepare_context(struct cgit_context *ctx) ctx->cfg.robots = "index, nofollow"; ctx->cfg.root_title = "Git repository browser"; ctx->cfg.root_desc = "a fast webinterface for the git dscm"; - ctx->cfg.scan_hidden_path = 0; ctx->cfg.script_name = CGIT_SCRIPT_NAME; ctx->cfg.section = ""; ctx->cfg.summary_branches = 10; @@ -563,8 +550,6 @@ void print_repo(FILE *f, struct cgit_repo *repo) fprintf(f, "repo.section=%s\n", repo->section); if (repo->clone_url) fprintf(f, "repo.clone-url=%s\n", repo->clone_url); - fprintf(f, "repo.enable-commit-graph=%d\n", - repo->enable_commit_graph); fprintf(f, "repo.enable-log-filecount=%d\n", repo->enable_log_filecount); fprintf(f, "repo.enable-log-linecount=%d\n", @@ -764,11 +749,10 @@ int main(int argc, const char **argv) http_parse_querystring(ctx.qry.raw, querystring_cb); /* If virtual-root isn't specified in cgitrc, lets pretend - * that virtual-root equals SCRIPT_NAME, minus any possibly - * trailing slashes. + * that virtual-root equals SCRIPT_NAME. */ if (!ctx.cfg.virtual_root) - ctx.cfg.virtual_root = trim_end(ctx.cfg.script_name, '/'); + ctx.cfg.virtual_root = ctx.cfg.script_name; /* If no url parameter is specified on the querystring, lets * use PATH_INFO as url. This allows cgit to work with virtual @@ -153,44 +153,26 @@ table.list td { padding: 0.1em 0.5em 0.1em 0.5em; } -table.list td.commitgraph { +table.list td.logsubject { font-family: monospace; - white-space: pre; -} - -table.list td.commitgraph .column1 { - color: #a00; -} - -table.list td.commitgraph .column2 { - color: #0a0; -} - -table.list td.commitgraph .column3 { - color: #aa0; -} - -table.list td.commitgraph .column4 { - color: #00a; -} - -table.list td.commitgraph .column5 { - color: #a0a; + font-weight: bold; } -table.list td.commitgraph .column6 { - color: #0aa; +table.list td.logmsg { + font-family: monospace; + white-space: pre; + padding: 1em 0.5em 2em 0.5em; } -table.list td.logsubject { - font-family: monospace; - font-weight: bold; +table.list td.lognotes-label { + text-align:right; + vertical-align:top; } -table.list td.logmsg { +table.list td.lognotes { font-family: monospace; white-space: pre; - padding: 0 0.5em; + padding: 0em 0.5em 2em 0.5em; } table.list td a { @@ -293,7 +275,7 @@ table.blob pre { padding: 0; margin: 0; } -table.blob a.no, table.ssdiff a.no { +table.blob a.no { color: gray; text-align: right; text-decoration: none; @@ -20,7 +20,6 @@ #include <xdiff/xdiff.h> #include <utf8.h> #include <notes.h> -#include <graph.h> /* @@ -71,10 +70,7 @@ struct cgit_repo { char *readme; char *section; char *clone_url; - char *logo; - char *logo_link; int snapshots; - int enable_commit_graph; int enable_log_filecount; int enable_log_linecount; int enable_remote_branches; @@ -193,7 +189,6 @@ struct cgit_config { int enable_gitweb_owner; int enable_http_clone; int enable_index_links; - int enable_commit_graph; int enable_log_filecount; int enable_log_linecount; int enable_remote_branches; @@ -213,7 +208,6 @@ struct cgit_config { int noheader; int renamelimit; int remove_suffix; - int scan_hidden_path; int section_from_path; int snapshots; int summary_branches; Binary files differdiff --git a/cgitrc.5.txt b/cgitrc.5.txt index 875d51f..b8c69b8 100644 --- a/cgitrc.5.txt +++ b/cgitrc.5.txt @@ -90,12 +90,7 @@ embedded:: Flag which, when set to "1", will make cgit generate a html fragment suitable for embedding in other html pages. Default value: none. See also: "noheader". - -enable-commit-graph:: - Flag which, when set to "1", will make cgit print an ASCII-art commit - history graph to the left of the commit messages in the repository - log page. Default value: "0". - + enable-filter-overrides:: Flag which, when set to "1", allows all filter settings to be overridden in repository-specific cgitrc files. Default value: none. @@ -279,22 +274,13 @@ root-title:: Text printed as heading on the repository index page. Default value: "Git Repository Browser". -scan-hidden-path:: - If set to "1" and scan-path is enabled, scan-path will recurse into - directories whose name starts with a period ('.'). Otherwise, - scan-path will stay away from such directories (considered as - "hidden"). Note that this does not apply to the ".git" directory in - non-bare repos. This must be defined prior to scan-path. - Default value: 0. See also: scan-path. - scan-path:: A path which will be scanned for repositories. If caching is enabled, the result will be cached as a cgitrc include-file in the cache directory. If project-list has been defined prior to scan-path, scan-path loads only the directories listed in the file pointed to by - project-list. Be advised that only the global settings taken - before the scan-path directive will be applied to each repository. - Default value: none. See also: cache-scanrc-ttl, project-list. + project-list. Default value: none. See also: cache-scanrc-ttl, + project-list. section:: The name of the current repository section - all repositories defined @@ -314,8 +300,7 @@ side-by-side-diffs:: snapshots:: Text which specifies the default set of snapshot formats generated by cgit. The value is a space-separated list of zero or more of the - values "tar", "tar.gz", "tar.bz2", "tar.xz" and "zip". Default value: - none. + values "tar", "tar.gz", "tar.bz2" and "zip". Default value: none. source-filter:: Specifies a command which will be invoked to format plaintext blobs @@ -374,10 +359,6 @@ repo.defbranch:: repo.desc:: The value to show as repository description. Default value: none. -repo.enable-commit-graph:: - A flag which can be used to disable the global setting - `enable-commit-graph'. Default value: none. - repo.enable-log-filecount:: A flag which can be used to disable the global setting `enable-log-filecount'. Default value: none. @@ -394,15 +375,6 @@ repo.enable-subject-links:: A flag which can be used to override the global setting `enable-subject-links'. Default value: none. -repo.logo:: - Url which specifies the source of an image which will be used as a logo - on this repo's pages. Default value: global logo. - -repo.logo-link:: - Url loaded when clicking on the cgit logo image. If unspecified the - calculated url of the repository index page will be used. Default - value: global logo-link. - repo.max-stats:: Override the default maximum statistics period. Valid values are equal to the values specified for the global "max-stats" setting. Default @@ -474,10 +446,6 @@ css=/css/cgit.css enable-index-links=1 -# Enable ASCII art commit history graph on the log pages -enable-commit-graph=1 - - # Show number of affected files per commit on the log pages enable-log-filecount=1 @@ -67,8 +67,7 @@ static void info_fn(struct cgit_context *ctx) static void log_fn(struct cgit_context *ctx) { cgit_print_log(ctx->qry.sha1, ctx->qry.ofs, ctx->cfg.max_commit_count, - ctx->qry.grep, ctx->qry.search, ctx->qry.path, 1, - ctx->repo->enable_commit_graph); + ctx->qry.grep, ctx->qry.search, ctx->qry.path, 1); } static void ls_cache_fn(struct cgit_context *ctx) diff --git a/git b/git -Subproject 7ed863a85a6ce2c4ac4476848310b8f917ab41f +Subproject 87b50542a08ac6caa083ddc376e674424e37940 @@ -18,7 +18,7 @@ static const char* url_escape_table[256] = { "%00", "%01", "%02", "%03", "%04", "%05", "%06", "%07", "%08", "%09", "%0a", "%0b", "%0c", "%0d", "%0e", "%0f", "%10", "%11", "%12", "%13", "%14", "%15", "%16", "%17", "%18", "%19", "%1a", "%1b", "%1c", "%1d", - "%1e", "%1f", "+", 0, "%22", "%23", 0, "%25", "%26", "%27", 0, 0, 0, + "%1e", "%1f", "%20", 0, "%22", "%23", 0, "%25", "%26", "%27", 0, 0, 0, "%2b", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "%3c", "%3d", "%3e", "%3f", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "%5c", 0, "%5e", 0, "%60", 0, 0, 0, 0, 0, @@ -181,7 +181,7 @@ void html_url_arg(const char *txt) const char *e = url_escape_table[c]; if (e) { html_raw(txt, t - txt); - html_raw(e, strlen(e)); + html_raw(e, 3); txt = t+1; } t++; @@ -277,7 +277,7 @@ char *convert_query_hexchar(char *txt) d1 = hextoint(*(txt+1)); d2 = hextoint(*(txt+2)); if (d1<0 || d2<0) { - memmove(txt, txt+3, n-2); + memmove(txt, txt+3, n-3); return txt-1; } else { *txt = d1 * 16 + d2; @@ -106,11 +106,7 @@ const char *reencode(char **txt, const char *src_enc, const char *dst_enc) if (!txt || !*txt || !src_enc || !dst_enc) return *txt; - /* no encoding needed if src_enc equals dst_enc */ - if(!strcasecmp(src_enc, dst_enc)) - return *txt; - - tmp = reencode_string(*txt, dst_enc, src_enc); + tmp = reencode_string(*txt, src_enc, dst_enc); if (tmp) { free(*txt); *txt = tmp; @@ -164,10 +160,6 @@ struct commitinfo *cgit_parse_commit(struct commit *commit) } } - /* if no special encoding is found, assume UTF-8 */ - if(!ret->msg_encoding) - ret->msg_encoding = xstrdup("UTF-8"); - // skip unknown header fields while (p && *p && (*p != '\n')) { p = strchr(p, '\n'); @@ -197,12 +189,14 @@ struct commitinfo *cgit_parse_commit(struct commit *commit) } else ret->subject = xstrdup(p); - reencode(&ret->author, ret->msg_encoding, PAGE_ENCODING); - reencode(&ret->author_email, ret->msg_encoding, PAGE_ENCODING); - reencode(&ret->committer, ret->msg_encoding, PAGE_ENCODING); - reencode(&ret->committer_email, ret->msg_encoding, PAGE_ENCODING); - reencode(&ret->subject, ret->msg_encoding, PAGE_ENCODING); - reencode(&ret->msg, ret->msg_encoding, PAGE_ENCODING); + if (ret->msg_encoding) { + reencode(&ret->author, PAGE_ENCODING, ret->msg_encoding); + reencode(&ret->author_email, PAGE_ENCODING, ret->msg_encoding); + reencode(&ret->committer, PAGE_ENCODING, ret->msg_encoding); + reencode(&ret->committer_email, PAGE_ENCODING, ret->msg_encoding); + reencode(&ret->subject, PAGE_ENCODING, ret->msg_encoding); + reencode(&ret->msg, PAGE_ENCODING, ret->msg_encoding); + } return ret; } diff --git a/scan-tree.c b/scan-tree.c index e5a4baf..a0e09ce 100644 --- a/scan-tree.c +++ b/scan-tree.c @@ -159,23 +159,24 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn) static void scan_path(const char *base, const char *path, repo_config_fn fn) { - DIR *dir = opendir(path); + DIR *dir; struct dirent *ent; char *buf; struct stat st; - if (!dir) { - fprintf(stderr, "Error opening directory %s: %s (%d)\n", - path, strerror(errno), errno); - return; - } if (is_git_dir(path)) { add_repo(base, path, fn); - goto end; + return; } if (is_git_dir(fmt("%s/.git", path))) { add_repo(base, fmt("%s/.git", path), fn); - goto end; + return; + } + dir = opendir(path); + if (!dir) { + fprintf(stderr, "Error opening directory %s: %s (%d)\n", + path, strerror(errno), errno); + return; } while((ent = readdir(dir)) != NULL) { if (ent->d_name[0] == '.') { @@ -183,8 +184,6 @@ static void scan_path(const char *base, const char *path, repo_config_fn fn) continue; if (ent->d_name[1] == '.' && ent->d_name[2] == '\0') continue; - if (!ctx.cfg.scan_hidden_path) - continue; } buf = malloc(strlen(path) + strlen(ent->d_name) + 2); if (!buf) { @@ -203,7 +202,6 @@ static void scan_path(const char *base, const char *path, repo_config_fn fn) scan_path(base, buf, fn); free(buf); } -end: closedir(dir); } @@ -219,7 +217,6 @@ void scan_projects(const char *path, const char *projectsfile, repo_config_fn fn if (!projects) { fprintf(stderr, "Error opening projectsfile %s: %s (%d)\n", projectsfile, strerror(errno), errno); - return; } while (fgets(line, sizeof(line), projects) != NULL) { for (z = &lastc(line); @@ -56,7 +56,6 @@ struct cgit_repo *cgit_add_repo(const char *url) ret->section = ctx.cfg.section; ret->defbranch = "master"; ret->snapshots = ctx.cfg.snapshots; - ret->enable_commit_graph = ctx.cfg.enable_commit_graph; ret->enable_log_filecount = ctx.cfg.enable_log_filecount; ret->enable_log_linecount = ctx.cfg.enable_log_linecount; ret->enable_remote_branches = ctx.cfg.enable_remote_branches; @@ -34,17 +34,6 @@ static struct fileinfo { } *items; static int use_ssdiff = 0; -static struct diff_filepair *current_filepair; - -struct diff_filespec *cgit_get_current_old_file(void) -{ - return current_filepair->one; -} - -struct diff_filespec *cgit_get_current_new_file(void) -{ - return current_filepair->two; -} static void print_fileinfo(struct fileinfo *info) { @@ -172,11 +161,8 @@ void cgit_print_diffstat(const unsigned char *old_sha1, html("<div class='diffstat-header'>"); cgit_diff_link("Diffstat", NULL, NULL, ctx.qry.head, ctx.qry.sha1, ctx.qry.sha2, NULL, 0); - if (prefix) { - html(" (limited to '"); - html_txt(prefix); - html("')"); - } + if (prefix) + htmlf(" (limited to '%s')", prefix); html(" ("); ctx.qry.context = (save_context > 0 ? save_context : 3) << 1; cgit_self_link("more", NULL, NULL, &ctx); @@ -298,7 +284,6 @@ static void filepair_cb(struct diff_filepair *pair) int binary = 0; linediff_fn print_line_fn = print_line; - current_filepair = pair; if (use_ssdiff) { cgit_ssdiff_header_begin(); print_line_fn = cgit_ssdiff_line_cb; @@ -7,10 +7,4 @@ extern void cgit_print_diffstat(const unsigned char *old_sha1, extern void cgit_print_diff(const char *new_hex, const char *old_hex, const char *prefix); -extern struct diff_filespec *cgit_get_current_old_file(void); -extern struct diff_filespec *cgit_get_current_new_file(void); - -extern unsigned char old_rev_sha1[20]; -extern unsigned char new_rev_sha1[20]; - #endif /* UI_DIFF_H */ @@ -9,25 +9,9 @@ #include "cgit.h" #include "html.h" #include "ui-shared.h" -#include "vector.h" int files, add_lines, rem_lines; -/* - * The list of available column colors in the commit graph. - */ -static const char *column_colors_html[] = { - "<span class='column1'>", - "<span class='column2'>", - "<span class='column3'>", - "<span class='column4'>", - "<span class='column5'>", - "<span class='column6'>", - "</span>", -}; - -#define COLUMN_COLORS_HTML_MAX (ARRAY_SIZE(column_colors_html) - 1) - void count_lines(char *line, int size) { if (size <= 0) @@ -92,160 +76,63 @@ void show_commit_decorations(struct commit *commit) } } -void print_commit(struct commit *commit, struct rev_info *revs) +void print_commit(struct commit *commit) { struct commitinfo *info; char *tmp; - int cols = revs->graph ? 3 : 2; - struct strbuf graphbuf = STRBUF_INIT; - struct strbuf msgbuf = STRBUF_INIT; - - if (ctx.repo->enable_log_filecount) - cols++; - if (ctx.repo->enable_log_linecount) - cols++; - - if (revs->graph) { - /* Advance graph until current commit */ - while (!graph_next_line(revs->graph, &graphbuf)) { - /* Print graph segment in otherwise empty table row */ - html("<tr class='nohover'><td class='commitgraph'>"); - html(graphbuf.buf); - htmlf("</td><td colspan='%d' /></tr>\n", cols); - strbuf_setlen(&graphbuf, 0); - } - /* Current commit's graph segment is now ready in graphbuf */ - } + int cols = 2; info = cgit_parse_commit(commit); - htmlf("<tr%s>", ctx.qry.showmsg ? " class='logheader'" : ""); - - if (revs->graph) { - /* Print graph segment for current commit */ - html("<td class='commitgraph'>"); - html(graphbuf.buf); - html("</td>"); - strbuf_setlen(&graphbuf, 0); - } - else { - html("<td>"); - tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1)); - tmp = cgit_fileurl(ctx.repo->url, "commit", ctx.qry.vpath, tmp); - html_link_open(tmp, NULL, NULL); - cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); - html_link_close(); - html("</td>"); - } - - htmlf("<td%s>", ctx.qry.showmsg ? " class='logsubject'" : ""); - if (ctx.qry.showmsg) { - /* line-wrap long commit subjects instead of truncating them */ - size_t subject_len = strlen(info->subject); - - if (subject_len > ctx.cfg.max_msg_len && - ctx.cfg.max_msg_len >= 15) { - /* symbol for signaling line-wrap (in PAGE_ENCODING) */ - const char wrap_symbol[] = { ' ', 0xE2, 0x86, 0xB5, 0 }; - int i = ctx.cfg.max_msg_len - strlen(wrap_symbol); - - /* Rewind i to preceding space character */ - while (i > 0 && !isspace(info->subject[i])) - --i; - if (!i) /* Oops, zero spaces. Reset i */ - i = ctx.cfg.max_msg_len - strlen(wrap_symbol); - - /* add remainder starting at i to msgbuf */ - strbuf_add(&msgbuf, info->subject + i, subject_len - i); - strbuf_trim(&msgbuf); - strbuf_add(&msgbuf, "\n\n", 2); - - /* Place wrap_symbol at position i in info->subject */ - strcpy(info->subject + i, wrap_symbol); - } - } + htmlf("<tr%s><td>", + ctx.qry.showmsg ? " class='logheader'" : ""); + tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1)); + tmp = cgit_fileurl(ctx.repo->url, "commit", ctx.qry.vpath, tmp); + html_link_open(tmp, NULL, NULL); + cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); + html_link_close(); + htmlf("</td><td%s>", + ctx.qry.showmsg ? " class='logsubject'" : ""); cgit_commit_link(info->subject, NULL, NULL, ctx.qry.head, sha1_to_hex(commit->object.sha1), ctx.qry.vpath, 0); show_commit_decorations(commit); html("</td><td>"); html_txt(info->author); - - if (revs->graph) { - html("</td><td>"); - tmp = fmt("id=%s", sha1_to_hex(commit->object.sha1)); - tmp = cgit_fileurl(ctx.repo->url, "commit", ctx.qry.vpath, tmp); - html_link_open(tmp, NULL, NULL); - cgit_print_age(commit->date, TM_WEEK * 2, FMT_SHORTDATE); - html_link_close(); - } - - if (ctx.repo->enable_log_filecount || ctx.repo->enable_log_linecount) { + if (ctx.repo->enable_log_filecount) { files = 0; add_lines = 0; rem_lines = 0; cgit_diff_commit(commit, inspect_files, ctx.qry.vpath); + html("</td><td>"); + htmlf("%d", files); + if (ctx.repo->enable_log_linecount) { + html("</td><td>"); + htmlf("-%d/+%d", rem_lines, add_lines); + } } - - if (ctx.repo->enable_log_filecount) - htmlf("</td><td>%d", files); - if (ctx.repo->enable_log_linecount) - htmlf("</td><td>-%d/+%d", rem_lines, add_lines); - html("</td></tr>\n"); + if (ctx.qry.showmsg) { + struct strbuf notes = STRBUF_INIT; + format_note(NULL, commit->object.sha1, ¬es, PAGE_ENCODING, 0); - if (revs->graph || ctx.qry.showmsg) { /* Print a second table row */ - html("<tr class='nohover'>"); - - if (ctx.qry.showmsg) { - /* Concatenate commit message + notes in msgbuf */ - if (info->msg && *(info->msg)) { - strbuf_addstr(&msgbuf, info->msg); - strbuf_addch(&msgbuf, '\n'); - } - format_note(NULL, commit->object.sha1, &msgbuf, - PAGE_ENCODING, - NOTES_SHOW_HEADER | NOTES_INDENT); - strbuf_addch(&msgbuf, '\n'); - strbuf_ltrim(&msgbuf); - } - - if (revs->graph) { - int lines = 0; - - /* Calculate graph padding */ - if (ctx.qry.showmsg) { - /* Count #lines in commit message + notes */ - const char *p = msgbuf.buf; - lines = 1; - while ((p = strchr(p, '\n'))) { - p++; - lines++; - } - } - - /* Print graph padding */ - html("<td class='commitgraph'>"); - while (lines > 0 || !graph_is_commit_finished(revs->graph)) { - if (graphbuf.len) - html("\n"); - strbuf_setlen(&graphbuf, 0); - graph_next_line(revs->graph, &graphbuf); - html(graphbuf.buf); - lines--; - } - html("</td>\n"); + if (ctx.repo->enable_log_filecount) { + cols++; + if (ctx.repo->enable_log_linecount) + cols++; } - else - html("<td/>"); /* Empty 'Age' column */ - - /* Print msgbuf into remainder of table row */ - htmlf("<td colspan='%d'%s>\n", cols, - ctx.qry.showmsg ? " class='logmsg'" : ""); - html_txt(msgbuf.buf); + htmlf("<tr class='nohover'><td/><td colspan='%d' class='logmsg'>", + cols); + html_txt(info->msg); html("</td></tr>\n"); + if (notes.len != 0) { + html("<tr class='nohover'>"); + html("<td class='lognotes-label'>Notes:</td>"); + htmlf("<td colspan='%d' class='lognotes'>", + cols); + html_txt(notes.buf); + html("</td></tr>\n"); + } + strbuf_release(¬es); } - - strbuf_release(&msgbuf); - strbuf_release(&graphbuf); cgit_free_commitinfo(info); } @@ -261,94 +148,38 @@ static const char *disambiguate_ref(const char *ref) return ref; } -static char *next_token(char **src) -{ - char *result; - - if (!src || !*src) - return NULL; - while (isspace(**src)) - (*src)++; - if (!**src) - return NULL; - result = *src; - while (**src) { - if (isspace(**src)) { - **src = '\0'; - (*src)++; - break; - } - (*src)++; - } - return result; -} - void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern, - char *path, int pager, int commit_graph) + char *path, int pager) { struct rev_info rev; struct commit *commit; - struct vector vec = VECTOR_INIT(char *); + const char *argv[] = {NULL, NULL, NULL, NULL, NULL}; + int argc = 2; int i, columns = 3; - char *arg; - - /* First argv is NULL */ - vector_push(&vec, NULL, 0); if (!tip) tip = ctx.qry.head; - tip = disambiguate_ref(tip); - vector_push(&vec, &tip, 0); + + argv[1] = disambiguate_ref(tip); if (grep && pattern && *pattern) { - pattern = xstrdup(pattern); if (!strcmp(grep, "grep") || !strcmp(grep, "author") || - !strcmp(grep, "committer")) { - arg = fmt("--%s=%s", grep, pattern); - vector_push(&vec, &arg, 0); - } - if (!strcmp(grep, "range")) { - /* Split the pattern at whitespace and add each token - * as a revision expression. Do not accept other - * rev-list options. Also, replace the previously - * pushed tip (it's no longer relevant). - */ - vec.count--; - while ((arg = next_token(&pattern))) { - if (*arg == '-') { - fprintf(stderr, "Bad range expr: %s\n", - arg); - break; - } - vector_push(&vec, &arg, 0); - } - } - } - if (commit_graph) { - static const char *graph_arg = "--graph"; - static const char *color_arg = "--color"; - vector_push(&vec, &graph_arg, 0); - vector_push(&vec, &color_arg, 0); - graph_set_column_colors(column_colors_html, - COLUMN_COLORS_HTML_MAX); + !strcmp(grep, "committer")) + argv[argc++] = fmt("--%s=%s", grep, pattern); + if (!strcmp(grep, "range")) + argv[1] = pattern; } if (path) { - arg = "--"; - vector_push(&vec, &arg, 0); - vector_push(&vec, &path, 0); + argv[argc++] = "--"; + argv[argc++] = path; } - - /* Make sure the vector is NULL-terminated */ - vector_push(&vec, NULL, 0); - vec.count--; - init_revisions(&rev, NULL); rev.abbrev = DEFAULT_ABBREV; rev.commit_format = CMIT_FMT_DEFAULT; rev.verbose_header = 1; rev.show_root_diff = 0; - setup_revisions(vec.count, vec.data, &rev, NULL); + setup_revisions(argc, argv, &rev, NULL); load_ref_decorations(DECORATE_FULL_REFS); rev.show_decorations = 1; rev.grep_filter.regflags |= REG_ICASE; @@ -358,12 +189,8 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern if (pager) html("<table class='list nowrap'>"); - html("<tr class='nohover'>"); - if (commit_graph) - html("<th></th>"); - else - html("<th class='left'>Age</th>"); - html("<th class='left'>Commit message"); + html("<tr class='nohover'><th class='left'>Age</th>" + "<th class='left'>Commit message"); if (pager) { html(" ("); cgit_log_link(ctx.qry.showmsg ? "Collapse" : "Expand", NULL, @@ -373,15 +200,13 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern html(")"); } html("</th><th class='left'>Author</th>"); - if (commit_graph) - html("<th class='left'>Age</th>"); if (ctx.repo->enable_log_filecount) { html("<th class='left'>Files</th>"); columns++; - } - if (ctx.repo->enable_log_linecount) { - html("<th class='left'>Lines</th>"); - columns++; + if (ctx.repo->enable_log_linecount) { + html("<th class='left'>Lines</th>"); + columns++; + } } html("</tr>\n"); @@ -396,7 +221,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern } for (i = 0; i < cnt && (commit = get_revision(&rev)) != NULL; i++) { - print_commit(commit, &rev); + print_commit(commit); free(commit->buffer); commit->buffer = NULL; free_commit_list(commit->parents); @@ -2,8 +2,7 @@ #define UI_LOG_H extern void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, - char *pattern, char *path, int pager, - int commit_graph); + char *pattern, char *path, int pager); extern void show_commit_decorations(struct commit *commit); #endif /* UI_LOG_H */ diff --git a/ui-shared.c b/ui-shared.c index 5aa9119..ae29615 100644 --- a/ui-shared.c +++ b/ui-shared.c @@ -574,7 +574,7 @@ void cgit_print_http_headers(struct cgit_context *ctx) else if (ctx->page.mimetype) htmlf("Content-Type: %s\n", ctx->page.mimetype); if (ctx->page.size) - htmlf("Content-Length: %zd\n", ctx->page.size); + htmlf("Content-Length: %ld\n", ctx->page.size); if (ctx->page.filename) htmlf("Content-Disposition: inline; filename=\"%s\"\n", ctx->page.filename); @@ -756,27 +756,17 @@ static void cgit_print_path_crumbs(struct cgit_context *ctx, char *path) static void print_header(struct cgit_context *ctx) { - char *logo = NULL, *logo_link = NULL; - html("<table id='header'>\n"); html("<tr>\n"); - if (ctx->repo && ctx->repo->logo && *ctx->repo->logo) - logo = ctx->repo->logo; - else - logo = ctx->cfg.logo; - if (ctx->repo && ctx->repo->logo_link && *ctx->repo->logo_link) - logo_link = ctx->repo->logo_link; - else - logo_link = ctx->cfg.logo_link; - if (logo && *logo) { + if (ctx->cfg.logo && ctx->cfg.logo[0] != 0) { html("<td class='logo' rowspan='2'><a href='"); - if (logo_link && *logo_link) - html_attr(logo_link); + if (ctx->cfg.logo_link) + html_attr(ctx->cfg.logo_link); else html_attr(cgit_rooturl()); html("'><img src='"); - html_attr(logo); + html_attr(ctx->cfg.logo); html("' alt='cgit logo'/></a></td>\n"); } diff --git a/ui-ssdiff.c b/ui-ssdiff.c index 2481585..408e620 100644 --- a/ui-ssdiff.c +++ b/ui-ssdiff.c @@ -1,7 +1,6 @@ #include "cgit.h" #include "html.h" #include "ui-shared.h" -#include "ui-diff.h" extern int use_ssdiff; @@ -192,24 +191,17 @@ static void print_ssdiff_line(char *class, char *new_line, int individual_chars) { char *lcs = NULL; - if (old_line) old_line = replace_tabs(old_line + 1); if (new_line) new_line = replace_tabs(new_line + 1); if (individual_chars && old_line && new_line) lcs = longest_common_subsequence(old_line, new_line); - html("<tr>\n"); - if (old_line_no > 0) { - struct diff_filespec *old_file = cgit_get_current_old_file(); - char *lineno_str = fmt("n%d", old_line_no); - char *id_str = fmt("%s#%s", is_null_sha1(old_file->sha1)?"HEAD":sha1_to_hex(old_rev_sha1), lineno_str); - html("<td class='lineno'><a class='no' href='"); - html(cgit_fileurl(ctx.repo->url, "tree", old_file->path, id_str)); - htmlf("' id='%s' name='%s'>%s</a>", lineno_str, lineno_str, lineno_str + 1); - html("</td>"); - htmlf("<td class='%s'>", class); - } else if (old_line) + html("<tr>"); + if (old_line_no > 0) + htmlf("<td class='lineno'>%d</td><td class='%s'>", + old_line_no, class); + else if (old_line) htmlf("<td class='lineno'></td><td class='%s'>", class); else htmlf("<td class='lineno'></td><td class='%s_dark'>", class); @@ -220,17 +212,11 @@ static void print_ssdiff_line(char *class, html_txt(old_line); } - html("</td>\n"); - if (new_line_no > 0) { - struct diff_filespec *new_file = cgit_get_current_new_file(); - char *lineno_str = fmt("n%d", new_line_no); - char *id_str = fmt("%s#%s", is_null_sha1(new_file->sha1)?"HEAD":sha1_to_hex(new_rev_sha1), lineno_str); - html("<td class='lineno'><a class='no' href='"); - html(cgit_fileurl(ctx.repo->url, "tree", new_file->path, id_str)); - htmlf("' id='%s' name='%s'>%s</a>", lineno_str, lineno_str, lineno_str + 1); - html("</td>"); - htmlf("<td class='%s'>", class); - } else if (new_line) + html("</td>"); + if (new_line_no > 0) + htmlf("<td class='lineno'>%d</td><td class='%s'>", + new_line_no, class); + else if (new_line) htmlf("<td class='lineno'></td><td class='%s'>", class); else htmlf("<td class='lineno'></td><td class='%s_dark'>", class); diff --git a/ui-summary.c b/ui-summary.c index 5be2545..b203bcc 100644 --- a/ui-summary.c +++ b/ui-summary.c @@ -59,7 +59,7 @@ void cgit_print_summary() if (ctx.cfg.summary_log > 0) { html("<tr class='nohover'><td colspan='4'> </td></tr>"); cgit_print_log(ctx.qry.head, 0, ctx.cfg.summary_log, NULL, - NULL, NULL, 0, 0); + NULL, NULL, 0); } if (ctx.repo->clone_url) print_urls(ctx.repo->clone_url, NULL); @@ -48,8 +48,6 @@ static void print_text_buffer(const char *name, char *buf, unsigned long size) cgit_open_filter(ctx.repo->source_filter); html_raw(buf, size); cgit_close_filter(ctx.repo->source_filter); - free(ctx.repo->source_filter->argv[1]); - ctx.repo->source_filter->argv[1] = NULL; html("</code></pre></td></tr></table>\n"); return; } diff --git a/vector.c b/vector.c deleted file mode 100644 index 0863908..0000000 --- a/vector.c +++ /dev/null @@ -1,38 +0,0 @@ -#include <stdio.h> -#include <string.h> -#include <errno.h> -#include "vector.h" - -static int grow(struct vector *vec, int gently) -{ - size_t new_alloc; - void *new_data; - - new_alloc = vec->alloc * 3 / 2; - if (!new_alloc) - new_alloc = 8; - new_data = realloc(vec->data, new_alloc * vec->size); - if (!new_data) { - if (gently) - return ENOMEM; - perror("vector.c:grow()"); - exit(1); - } - vec->data = new_data; - vec->alloc = new_alloc; - return 0; -} - -int vector_push(struct vector *vec, const void *data, int gently) -{ - int rc; - - if (vec->count == vec->alloc && (rc = grow(vec, gently))) - return rc; - if (data) - memmove(vec->data + vec->count * vec->size, data, vec->size); - else - memset(vec->data + vec->count * vec->size, 0, vec->size); - vec->count++; - return 0; -} diff --git a/vector.h b/vector.h deleted file mode 100644 index c64eb1f..0000000 --- a/vector.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef CGIT_VECTOR_H -#define CGIT_VECTOR_H - -#include <stdlib.h> - -struct vector { - size_t size; - size_t count; - size_t alloc; - void *data; -}; - -#define VECTOR_INIT(type) {sizeof(type), 0, 0, NULL} - -int vector_push(struct vector *vec, const void *data, int gently); - -#endif /* CGIT_VECTOR_H */ |
