| -rw-r--r-- | cgit.c | 4 | ||||
| -rw-r--r-- | cgit.h | 2 | ||||
| -rw-r--r-- | cgitrc.5.txt | 10 | ||||
| -rw-r--r-- | scan-tree.c | 2 | ||||
| -rw-r--r-- | shared.c | 9 | ||||
| -rw-r--r-- | ui-commit.c | 12 | ||||
| -rw-r--r-- | ui-plain.c | 68 |
7 files changed, 12 insertions, 95 deletions
@@ -62,8 +62,6 @@ void repo_config(struct cgit_repo *repo, const char *name, const char *value) repo->enable_log_linecount = ctx.cfg.enable_log_linecount * atoi(value); else if (!strcmp(name, "enable-remote-branches")) repo->enable_remote_branches = atoi(value); - else if (!strcmp(name, "enable-subject-links")) - repo->enable_subject_links = atoi(value); else if (!strcmp(name, "max-stats")) repo->max_stats = cgit_find_stats_period(value, NULL); else if (!strcmp(name, "module-link")) @@ -143,8 +141,6 @@ void config_cb(const char *name, const char *value) ctx.cfg.enable_log_linecount = atoi(value); else if (!strcmp(name, "enable-remote-branches")) ctx.cfg.enable_remote_branches = atoi(value); - else if (!strcmp(name, "enable-subject-links")) - ctx.cfg.enable_subject_links = atoi(value); else if (!strcmp(name, "enable-tree-linenumbers")) ctx.cfg.enable_tree_linenumbers = atoi(value); else if (!strcmp(name, "max-stats")) @@ -73,7 +73,6 @@ struct cgit_repo { int enable_log_filecount; int enable_log_linecount; int enable_remote_branches; - int enable_subject_links; int max_stats; time_t mtime; struct cgit_filter *about_filter; @@ -183,7 +182,6 @@ struct cgit_config { int enable_log_filecount; int enable_log_linecount; int enable_remote_branches; - int enable_subject_links; int enable_tree_linenumbers; int local_time; int max_atom_items; diff --git a/cgitrc.5.txt b/cgitrc.5.txt index 5c24381..6cdfd03 100644 --- a/cgitrc.5.txt +++ b/cgitrc.5.txt @@ -115,12 +115,6 @@ enable-remote-branches:: in the summary and refs views. Default value: "0". See also: "repo.enable-remote-branches". -enable-subject-links:: - Flag which, when set to "1", will make cgit use the subject of the - parent commit as link text when generating links to parent commits - in commit view. Default value: "0". See also: - "repo.enable-subject-links". - enable-tree-linenumbers:: Flag which, when set to "1", will make cgit generate linenumber links for plaintext blobs printed in the tree view. Default value: "1". @@ -331,10 +325,6 @@ repo.enable-remote-branches:: Flag which, when set to "1", will make cgit display remote branches in the summary and refs views. Default value: <enable-remote-branches>. -repo.enable-subject-links:: - A flag which can be used to override the global setting - `enable-subject-links'. Default value: none. - repo.max-stats:: Override the default maximum statistics period. Valid values are equal to the values specified for the global "max-stats" setting. Default diff --git a/scan-tree.c b/scan-tree.c index 1e18f3c..dbca797 100644 --- a/scan-tree.c +++ b/scan-tree.c @@ -56,8 +56,6 @@ static void add_repo(const char *base, const char *path, repo_config_fn fn) path, strerror(errno), errno); return; } - if (!stat(fmt("%s/noweb", path), &st)) - return; if ((pwd = getpwuid(st.st_uid)) == NULL) { fprintf(stderr, "Error reading owner-info for %s: %s (%d)\n", path, strerror(errno), errno); @@ -60,7 +60,6 @@ struct cgit_repo *cgit_add_repo(const char *url) 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; - ret->enable_subject_links = ctx.cfg.enable_subject_links; ret->max_stats = ctx.cfg.max_stats; ret->module_link = ctx.cfg.module_link; ret->readme = NULL; @@ -280,10 +279,6 @@ int cgit_diff_files(const unsigned char *old_sha1, if ((file1.ptr && buffer_is_binary(file1.ptr, file1.size)) || (file2.ptr && buffer_is_binary(file2.ptr, file2.size))) { *binary = 1; - if (file1.size) - free(file1.ptr); - if (file2.size) - free(file2.ptr); return 0; } @@ -296,10 +291,6 @@ int cgit_diff_files(const unsigned char *old_sha1, emit_cb.outf = filediff_cb; emit_cb.priv = fn; xdl_diff(&file1, &file2, &diff_params, &emit_params, &emit_cb); - if (file1.size) - free(file1.ptr); - if (file2.size) - free(file2.ptr); return 0; } diff --git a/ui-commit.c b/ui-commit.c index 41313b9..b5e3c01 100644 --- a/ui-commit.c +++ b/ui-commit.c @@ -15,10 +15,10 @@ void cgit_print_commit(char *hex) { struct commit *commit, *parent; - struct commitinfo *info, *parent_info; + struct commitinfo *info; struct commit_list *p; unsigned char sha1[20]; - char *tmp, *tmp2; + char *tmp; int parents = 0; if (!hex) @@ -82,12 +82,8 @@ void cgit_print_commit(char *hex) } html("<tr><th>parent</th>" "<td colspan='2' class='sha1'>"); - tmp = tmp2 = sha1_to_hex(p->item->object.sha1); - if (ctx.repo->enable_subject_links) { - parent_info = cgit_parse_commit(parent); - tmp2 = parent_info->subject; - } - cgit_commit_link(tmp2, NULL, NULL, ctx.qry.head, tmp, 0); + cgit_commit_link(sha1_to_hex(p->item->object.sha1), NULL, NULL, + ctx.qry.head, sha1_to_hex(p->item->object.sha1), 0); html(" ("); cgit_diff_link("diff", NULL, NULL, ctx.qry.head, hex, sha1_to_hex(p->item->object.sha1), NULL, 0); @@ -10,7 +10,8 @@ #include "html.h" #include "ui-shared.h" -int match_baselen; +char *curr_rev; +char *match_path; int match; static void print_object(const unsigned char *sha1, const char *path) @@ -52,63 +53,17 @@ static void print_object(const unsigned char *sha1, const char *path) match = 1; } -static void print_dir(const unsigned char *sha1, const char *path, - const char *base) -{ - char *fullpath; - if (path[0] || base[0]) - fullpath = fmt("/%s%s/", base, path); - else - fullpath = "/"; - ctx.page.etag = sha1_to_hex(sha1); - cgit_print_http_headers(&ctx); - htmlf("<html><head><title>%s</title></head>\n<body>\n" - " <h2>%s</h2>\n <ul>\n", fullpath, fullpath); - if (path[0] || base[0]) - html(" <li><a href=\"../\">../</a></li>\n"); - match = 2; -} - -static void print_dir_entry(const unsigned char *sha1, const char *path, - unsigned mode) -{ - const char *sep = ""; - if (S_ISDIR(mode)) - sep = "/"; - htmlf(" <li><a href=\"%s%s\">%s%s</a></li>\n", path, sep, path, sep); - match = 2; -} - -static void print_dir_tail(void) -{ - html(" </ul>\n</body></html>\n"); -} - static int walk_tree(const unsigned char *sha1, const char *base, int baselen, const char *pathname, unsigned mode, int stage, void *cbdata) { - if (baselen == match_baselen) { - if (S_ISREG(mode)) - print_object(sha1, pathname); - else if (S_ISDIR(mode)) { - print_dir(sha1, pathname, base); - return READ_TREE_RECURSIVE; - } - } - else if (baselen > match_baselen) - print_dir_entry(sha1, pathname, mode); - else if (S_ISDIR(mode)) + if (S_ISDIR(mode)) return READ_TREE_RECURSIVE; - return 0; -} + if (S_ISREG(mode) && !strncmp(base, match_path, baselen) && + !strcmp(pathname, match_path + baselen)) + print_object(sha1, pathname); -static int basedir_len(const char *path) -{ - char *p = strrchr(path, '/'); - if (p) - return p - path + 1; return 0; } @@ -122,6 +77,7 @@ void cgit_print_plain(struct cgit_context *ctx) if (!rev) rev = ctx->qry.head; + curr_rev = xstrdup(rev); if (get_sha1(rev, sha1)) { html_status(404, "Not found", 0); return; @@ -131,16 +87,8 @@ void cgit_print_plain(struct cgit_context *ctx) html_status(404, "Not found", 0); return; } - if (!paths[0]) { - paths[0] = ""; - match_baselen = -1; - print_dir(commit->tree->object.sha1, "", ""); - } - else - match_baselen = basedir_len(paths[0]); + match_path = ctx->qry.path; read_tree_recursive(commit->tree, "", 0, 0, paths, walk_tree, NULL); if (!match) html_status(404, "Not found", 0); - else if (match == 2) - print_dir_tail(); } |