| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | cgit.c | 3 | ||||
| -rw-r--r-- | cgit.css | 6 | ||||
| -rw-r--r-- | cgit.h | 1 | ||||
| -rw-r--r-- | cgitrc.5.txt | 4 | ||||
| m--------- | git | 0 | ||||
| -rw-r--r-- | ui-commit.c | 2 | ||||
| -rw-r--r-- | ui-log.c | 2 | ||||
| -rw-r--r-- | ui-plain.c | 3 | ||||
| -rw-r--r-- | ui-tree.c | 35 |
10 files changed, 21 insertions, 37 deletions
@@ -5,7 +5,7 @@ CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH) CGIT_CONFIG = /etc/cgitrc CACHE_ROOT = /var/cache/cgit SHA1_HEADER = <openssl/sha.h> -GIT_VER = 1.6.4.3 +GIT_VER = 1.6.3.4 GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 INSTALL = install @@ -137,8 +137,6 @@ void config_cb(const char *name, const char *value) ctx.cfg.enable_log_filecount = atoi(value); else if (!strcmp(name, "enable-log-linecount")) ctx.cfg.enable_log_linecount = atoi(value); - else if (!strcmp(name, "enable-tree-linenumbers")) - ctx.cfg.enable_tree_linenumbers = atoi(value); else if (!strcmp(name, "max-stats")) ctx.cfg.max_stats = cgit_find_stats_period(value, NULL); else if (!strcmp(name, "cache-size")) @@ -262,7 +260,6 @@ static void prepare_context(struct cgit_context *ctx) ctx->cfg.css = "/cgit.css"; ctx->cfg.logo = "/cgit.png"; ctx->cfg.local_time = 0; - ctx->cfg.enable_tree_linenumbers = 1; ctx->cfg.max_repo_count = 50; ctx->cfg.max_commit_count = 50; ctx->cfg.max_lock_attempts = 5; @@ -237,16 +237,16 @@ table.blob { } table.blob td.lines { - margin: 0; padding: 0 0 0 0.5em; + margin: 0; padding: 0; vertical-align: top; color: black; } table.blob td.linenumbers { - margin: 0; padding: 0 0.5em 0 0.5em; + margin: 0; padding: 0; vertical-align: top; - text-align: right; border-right: 1px solid gray; + background-color: #eee; } table.blob pre { @@ -178,7 +178,6 @@ struct cgit_config { int enable_index_links; int enable_log_filecount; int enable_log_linecount; - int enable_tree_linenumbers; int local_time; int max_repo_count; int max_commit_count; diff --git a/cgitrc.5.txt b/cgitrc.5.txt index 4dc383d..617b7c3 100644 --- a/cgitrc.5.txt +++ b/cgitrc.5.txt @@ -107,10 +107,6 @@ enable-log-linecount:: and removed lines for each commit on the repository log page. Default value: "0". -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". - favicon:: Url used as link to a shortcut icon for cgit. If specified, it is suggested to use the value "/favicon.ico" since certain browsers will diff --git a/git b/git -Subproject 7fb6bcff2dece2ff9fbc5ebfe526d9b2a7e764c +Subproject e276f018f2c1f0fc962fbe44a36708d1cdebada diff --git a/ui-commit.c b/ui-commit.c index f5b0ae5..d6b73ee 100644 --- a/ui-commit.c +++ b/ui-commit.c @@ -35,7 +35,7 @@ void cgit_print_commit(char *hex) } info = cgit_parse_commit(commit); - load_ref_decorations(DECORATE_FULL_REFS); + load_ref_decorations(); html("<table summary='commit info' class='commit-info'>\n"); html("<tr><th>author</th><td>"); @@ -161,7 +161,7 @@ void cgit_print_log(const char *tip, int ofs, int cnt, char *grep, char *pattern rev.verbose_header = 1; rev.show_root_diff = 0; setup_revisions(argc, argv, &rev, NULL); - load_ref_decorations(DECORATE_FULL_REFS); + load_ref_decorations(); rev.show_decorations = 1; rev.grep_filter.regflags |= REG_ICASE; compile_grep_patterns(&rev.grep_filter); @@ -60,8 +60,7 @@ static int walk_tree(const unsigned char *sha1, const char *base, int baselen, if (S_ISDIR(mode)) return READ_TREE_RECURSIVE; - if (S_ISREG(mode) && !strncmp(base, match_path, baselen) && - !strcmp(pathname, match_path + baselen)) + if (S_ISREG(mode)) print_object(sha1, pathname); return 0; @@ -22,28 +22,8 @@ static void print_text_buffer(const char *name, char *buf, unsigned long size) "<a class='no' id='n%1$d' name='n%1$d' href='#n%1$d'>%1$d</a>\n"; html("<table summary='blob content' class='blob'>\n"); - - if (ctx.cfg.enable_tree_linenumbers) { - html("<tr><td class='linenumbers'><pre>"); - idx = 0; - lineno = 0; - - if (size) { - htmlf(numberfmt, ++lineno); - while(idx < size - 1) { // skip absolute last newline - if (buf[idx] == '\n') - htmlf(numberfmt, ++lineno); - idx++; - } - } - html("</pre></td>\n"); - } - else { - html("<tr>\n"); - } - if (ctx.repo->source_filter) { - html("<td class='lines'><pre><code>"); + html("<tr><td class='lines'><pre><code>"); ctx.repo->source_filter->argv[1] = xstrdup(name); cgit_open_filter(ctx.repo->source_filter); write(STDOUT_FILENO, buf, size); @@ -52,6 +32,19 @@ static void print_text_buffer(const char *name, char *buf, unsigned long size) return; } + html("<tr><td class='linenumbers'><pre>"); + idx = 0; + lineno = 0; + + if (size) { + htmlf(numberfmt, ++lineno); + while(idx < size - 1) { // skip absolute last newline + if (buf[idx] == '\n') + htmlf(numberfmt, ++lineno); + idx++; + } + } + html("</pre></td>\n"); html("<td class='lines'><pre><code>"); html_txt(buf); html("</code></pre></td></tr></table>\n"); |