diff options
| -rw-r--r-- | Makefile | 10 | ||||
| -rw-r--r-- | cgit.c | 10 | ||||
| -rw-r--r-- | cgit.css | 347 | ||||
| -rw-r--r-- | cgit.h | 2 | ||||
| -rw-r--r-- | cgitrc.5.txt | 10 | ||||
| -rwxr-xr-x | filters/commit-links.sh | 7 | ||||
| -rwxr-xr-x | filters/syntax-highlighting.sh | 28 | ||||
| -rw-r--r-- | html.c | 4 | ||||
| -rw-r--r-- | parsing.c | 2 | ||||
| -rw-r--r-- | shared.c | 4 | ||||
| -rwxr-xr-x | tests/setup.sh | 5 | ||||
| -rwxr-xr-x | tests/t0108-patch.sh | 2 | ||||
| -rw-r--r-- | ui-diff.c | 17 | ||||
| -rw-r--r-- | ui-log.c | 3 | ||||
| -rw-r--r-- | ui-plain.c | 9 | ||||
| -rw-r--r-- | ui-repolist.c | 6 | ||||
| -rw-r--r-- | ui-shared.c | 86 | ||||
| -rw-r--r-- | ui-shared.h | 5 | ||||
| -rw-r--r-- | ui-ssdiff.c | 29 | ||||
| -rw-r--r-- | ui-ssdiff.h | 12 | ||||
| -rw-r--r-- | ui-tree.c | 13 |
21 files changed, 383 insertions, 228 deletions
| @@ -1,4 +1,4 @@ | |||
| 1 | CGIT_VERSION = v0.9.0.1 | 1 | CGIT_VERSION = v0.9.0.3 |
| 2 | CGIT_SCRIPT_NAME = cgit.cgi | 2 | CGIT_SCRIPT_NAME = cgit.cgi |
| 3 | CGIT_SCRIPT_PATH = /var/www/htdocs/cgit | 3 | CGIT_SCRIPT_PATH = /var/www/htdocs/cgit |
| 4 | CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH) | 4 | CGIT_DATA_PATH = $(CGIT_SCRIPT_PATH) |
| @@ -13,7 +13,7 @@ pdfdir = $(docdir) | |||
| 13 | mandir = $(prefix)/share/man | 13 | mandir = $(prefix)/share/man |
| 14 | SHA1_HEADER = <openssl/sha.h> | 14 | SHA1_HEADER = <openssl/sha.h> |
| 15 | GIT_VER = 1.7.4 | 15 | GIT_VER = 1.7.4 |
| 16 | GIT_URL = http://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.bz2 | 16 | GIT_URL = http://hjemli.net/git/git/snapshot/git-$(GIT_VER).tar.bz2 |
| 17 | INSTALL = install | 17 | INSTALL = install |
| 18 | MAN5_TXT = $(wildcard *.5.txt) | 18 | MAN5_TXT = $(wildcard *.5.txt) |
| 19 | MAN_TXT = $(MAN5_TXT) | 19 | MAN_TXT = $(MAN5_TXT) |
| @@ -198,9 +198,9 @@ install-pdf: doc-pdf | |||
| 198 | $(INSTALL) -m 0644 $(DOC_PDF) $(DESTDIR)$(pdfdir) | 198 | $(INSTALL) -m 0644 $(DOC_PDF) $(DESTDIR)$(pdfdir) |
| 199 | 199 | ||
| 200 | uninstall: | 200 | uninstall: |
| 201 | rm -f $(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) | 201 | rm -f $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME) |
| 202 | rm -f $(CGIT_DATA_PATH)/cgit.css | 202 | rm -f $(DESTDIR)$(CGIT_DATA_PATH)/cgit.css |
| 203 | rm -f $(CGIT_DATA_PATH)/cgit.png | 203 | rm -f $(DESTDIR)$(CGIT_DATA_PATH)/cgit.png |
| 204 | 204 | ||
| 205 | uninstall-doc: uninstall-man uninstall-html uninstall-pdf | 205 | uninstall-doc: uninstall-man uninstall-html uninstall-pdf |
| 206 | 206 | ||
| @@ -60,6 +60,8 @@ static void process_cached_repolist(const char *path); | |||
| 60 | 60 | ||
| 61 | void repo_config(struct cgit_repo *repo, const char *name, const char *value) | 61 | void repo_config(struct cgit_repo *repo, const char *name, const char *value) |
| 62 | { | 62 | { |
| 63 | struct string_list_item *item; | ||
| 64 | |||
| 63 | if (!strcmp(name, "name")) | 65 | if (!strcmp(name, "name")) |
| 64 | repo->name = xstrdup(value); | 66 | repo->name = xstrdup(value); |
| 65 | else if (!strcmp(name, "clone-url")) | 67 | else if (!strcmp(name, "clone-url")) |
| @@ -86,7 +88,10 @@ void repo_config(struct cgit_repo *repo, const char *name, const char *value) | |||
| 86 | repo->max_stats = cgit_find_stats_period(value, NULL); | 88 | repo->max_stats = cgit_find_stats_period(value, NULL); |
| 87 | else if (!strcmp(name, "module-link")) | 89 | else if (!strcmp(name, "module-link")) |
| 88 | repo->module_link= xstrdup(value); | 90 | repo->module_link= xstrdup(value); |
| 89 | else if (!strcmp(name, "section")) | 91 | else if (!prefixcmp(name, "module-link.")) { |
| 92 | item = string_list_append(&repo->submodules, name + 12); | ||
| 93 | item->util = xstrdup(value); | ||
| 94 | } else if (!strcmp(name, "section")) | ||
| 90 | repo->section = xstrdup(value); | 95 | repo->section = xstrdup(value); |
| 91 | else if (!strcmp(name, "readme") && value != NULL) | 96 | else if (!strcmp(name, "readme") && value != NULL) |
| 92 | repo->readme = xstrdup(value); | 97 | repo->readme = xstrdup(value); |
| @@ -298,6 +303,7 @@ static void querystring_cb(const char *name, const char *value) | |||
| 298 | ctx.qry.period = xstrdup(value); | 303 | ctx.qry.period = xstrdup(value); |
| 299 | } else if (!strcmp(name, "ss")) { | 304 | } else if (!strcmp(name, "ss")) { |
| 300 | ctx.qry.ssdiff = atoi(value); | 305 | ctx.qry.ssdiff = atoi(value); |
| 306 | ctx.qry.has_ssdiff = 1; | ||
| 301 | } else if (!strcmp(name, "all")) { | 307 | } else if (!strcmp(name, "all")) { |
| 302 | ctx.qry.show_all = atoi(value); | 308 | ctx.qry.show_all = atoi(value); |
| 303 | } else if (!strcmp(name, "context")) { | 309 | } else if (!strcmp(name, "context")) { |
| @@ -338,7 +344,6 @@ static void prepare_context(struct cgit_context *ctx) | |||
| 338 | ctx->cfg.max_repodesc_len = 80; | 344 | ctx->cfg.max_repodesc_len = 80; |
| 339 | ctx->cfg.max_blob_size = 0; | 345 | ctx->cfg.max_blob_size = 0; |
| 340 | ctx->cfg.max_stats = 0; | 346 | ctx->cfg.max_stats = 0; |
| 341 | ctx->cfg.module_link = "./?repo=%s&page=commit&id=%s"; | ||
| 342 | ctx->cfg.project_list = NULL; | 347 | ctx->cfg.project_list = NULL; |
| 343 | ctx->cfg.renamelimit = -1; | 348 | ctx->cfg.renamelimit = -1; |
| 344 | ctx->cfg.remove_suffix = 0; | 349 | ctx->cfg.remove_suffix = 0; |
| @@ -482,6 +487,7 @@ static int prepare_repo_cmd(struct cgit_context *ctx) | |||
| 482 | cgit_print_docend(); | 487 | cgit_print_docend(); |
| 483 | return 1; | 488 | return 1; |
| 484 | } | 489 | } |
| 490 | sort_string_list(&ctx->repo->submodules); | ||
| 485 | cgit_prepare_repo_env(ctx->repo); | 491 | cgit_prepare_repo_env(ctx->repo); |
| 486 | return 0; | 492 | return 0; |
| 487 | } | 493 | } |
| @@ -1,4 +1,4 @@ | |||
| 1 | body, table, form { | 1 | body, div#cgit table, div#cgit form { |
| 2 | padding: 0em; | 2 | padding: 0em; |
| 3 | margin: 0em; | 3 | margin: 0em; |
| 4 | } | 4 | } |
| @@ -11,39 +11,40 @@ body { | |||
| 11 | padding: 4px; | 11 | padding: 4px; |
| 12 | } | 12 | } |
| 13 | 13 | ||
| 14 | a { | 14 | div#cgit a { |
| 15 | color: blue; | 15 | color: blue; |
| 16 | text-decoration: none; | 16 | text-decoration: none; |
| 17 | } | 17 | } |
| 18 | 18 | ||
| 19 | a:hover { | 19 | div#cgit a:hover { |
| 20 | text-decoration: underline; | 20 | text-decoration: underline; |
| 21 | } | 21 | } |
| 22 | 22 | ||
| 23 | table { | 23 | div#cgit table { |
| 24 | border-collapse: collapse; | 24 | border-collapse: collapse; |
| 25 | } | 25 | } |
| 26 | 26 | ||
| 27 | table#header { | 27 | div#cgit table#header { |
| 28 | width: 100%; | 28 | width: 100%; |
| 29 | margin-bottom: 1em; | 29 | margin-bottom: 1em; |
| 30 | } | 30 | } |
| 31 | 31 | ||
| 32 | table#header td.logo { | 32 | div#cgit table#header td.logo { |
| 33 | width: 96px; | 33 | width: 96px; |
| 34 | vertical-align: top; | ||
| 34 | } | 35 | } |
| 35 | 36 | ||
| 36 | table#header td.main { | 37 | div#cgit table#header td.main { |
| 37 | font-size: 250%; | 38 | font-size: 250%; |
| 38 | padding-left: 10px; | 39 | padding-left: 10px; |
| 39 | white-space: nowrap; | 40 | white-space: nowrap; |
| 40 | } | 41 | } |
| 41 | 42 | ||
| 42 | table#header td.main a { | 43 | div#cgit table#header td.main a { |
| 43 | color: #000; | 44 | color: #000; |
| 44 | } | 45 | } |
| 45 | 46 | ||
| 46 | table#header td.form { | 47 | div#cgit table#header td.form { |
| 47 | text-align: right; | 48 | text-align: right; |
| 48 | vertical-align: bottom; | 49 | vertical-align: bottom; |
| 49 | padding-right: 1em; | 50 | padding-right: 1em; |
| @@ -51,19 +52,19 @@ table#header td.form { | |||
| 51 | white-space: nowrap; | 52 | white-space: nowrap; |
| 52 | } | 53 | } |
| 53 | 54 | ||
| 54 | table#header td.form form, | 55 | div#cgit table#header td.form form, |
| 55 | table#header td.form input, | 56 | div#cgit table#header td.form input, |
| 56 | table#header td.form select { | 57 | div#cgit table#header td.form select { |
| 57 | font-size: 90%; | 58 | font-size: 90%; |
| 58 | } | 59 | } |
| 59 | 60 | ||
| 60 | table#header td.sub { | 61 | div#cgit table#header td.sub { |
| 61 | color: #777; | 62 | color: #777; |
| 62 | border-top: solid 1px #ccc; | 63 | border-top: solid 1px #ccc; |
| 63 | padding-left: 10px; | 64 | padding-left: 10px; |
| 64 | } | 65 | } |
| 65 | 66 | ||
| 66 | table.tabs { | 67 | div#cgit table.tabs { |
| 67 | border-bottom: solid 3px #ccc; | 68 | border-bottom: solid 3px #ccc; |
| 68 | border-collapse: collapse; | 69 | border-collapse: collapse; |
| 69 | margin-top: 2em; | 70 | margin-top: 2em; |
| @@ -71,74 +72,74 @@ table.tabs { | |||
| 71 | width: 100%; | 72 | width: 100%; |
| 72 | } | 73 | } |
| 73 | 74 | ||
| 74 | table.tabs td { | 75 | div#cgit table.tabs td { |
| 75 | padding: 0px 1em; | 76 | padding: 0px 1em; |
| 76 | vertical-align: bottom; | 77 | vertical-align: bottom; |
| 77 | } | 78 | } |
| 78 | 79 | ||
| 79 | table.tabs td a { | 80 | div#cgit table.tabs td a { |
| 80 | padding: 2px 0.75em; | 81 | padding: 2px 0.75em; |
| 81 | color: #777; | 82 | color: #777; |
| 82 | font-size: 110%; | 83 | font-size: 110%; |
| 83 | } | 84 | } |
| 84 | 85 | ||
| 85 | table.tabs td a.active { | 86 | div#cgit table.tabs td a.active { |
| 86 | color: #000; | 87 | color: #000; |
| 87 | background-color: #ccc; | 88 | background-color: #ccc; |
| 88 | } | 89 | } |
| 89 | 90 | ||
| 90 | table.tabs td.form { | 91 | div#cgit table.tabs td.form { |
| 91 | text-align: right; | 92 | text-align: right; |
| 92 | } | 93 | } |
| 93 | 94 | ||
| 94 | table.tabs td.form form { | 95 | div#cgit table.tabs td.form form { |
| 95 | padding-bottom: 2px; | 96 | padding-bottom: 2px; |
| 96 | font-size: 90%; | 97 | font-size: 90%; |
| 97 | white-space: nowrap; | 98 | white-space: nowrap; |
| 98 | } | 99 | } |
| 99 | 100 | ||
| 100 | table.tabs td.form input, | 101 | div#cgit table.tabs td.form input, |
| 101 | table.tabs td.form select { | 102 | div#cgit table.tabs td.form select { |
| 102 | font-size: 90%; | 103 | font-size: 90%; |
| 103 | } | 104 | } |
| 104 | 105 | ||
| 105 | div.path { | 106 | div#cgit div.path { |
| 106 | margin: 0px; | 107 | margin: 0px; |
| 107 | padding: 5px 2em 2px 2em; | 108 | padding: 5px 2em 2px 2em; |
| 108 | color: #000; | 109 | color: #000; |
| 109 | background-color: #eee; | 110 | background-color: #eee; |
| 110 | } | 111 | } |
| 111 | 112 | ||
| 112 | div.content { | 113 | div#cgit div.content { |
| 113 | margin: 0px; | 114 | margin: 0px; |
| 114 | padding: 2em; | 115 | padding: 2em; |
| 115 | border-bottom: solid 3px #ccc; | 116 | border-bottom: solid 3px #ccc; |
| 116 | } | 117 | } |
| 117 | 118 | ||
| 118 | 119 | ||
| 119 | table.list { | 120 | div#cgit table.list { |
| 120 | width: 100%; | 121 | width: 100%; |
| 121 | border: none; | 122 | border: none; |
| 122 | border-collapse: collapse; | 123 | border-collapse: collapse; |
| 123 | } | 124 | } |
| 124 | 125 | ||
| 125 | table.list tr { | 126 | div#cgit table.list tr { |
| 126 | background: white; | 127 | background: white; |
| 127 | } | 128 | } |
| 128 | 129 | ||
| 129 | table.list tr.logheader { | 130 | div#cgit table.list tr.logheader { |
| 130 | background: #eee; | 131 | background: #eee; |
| 131 | } | 132 | } |
| 132 | 133 | ||
| 133 | table.list tr:hover { | 134 | div#cgit table.list tr:hover { |
| 134 | background: #eee; | 135 | background: #eee; |
| 135 | } | 136 | } |
| 136 | 137 | ||
| 137 | table.list tr.nohover:hover { | 138 | div#cgit table.list tr.nohover:hover { |
| 138 | background: white; | 139 | background: white; |
| 139 | } | 140 | } |
| 140 | 141 | ||
| 141 | table.list th { | 142 | div#cgit table.list th { |
| 142 | font-weight: bold; | 143 | font-weight: bold; |
| 143 | /* color: #888; | 144 | /* color: #888; |
| 144 | border-top: dashed 1px #888; | 145 | border-top: dashed 1px #888; |
| @@ -148,93 +149,93 @@ table.list th { | |||
| 148 | vertical-align: baseline; | 149 | vertical-align: baseline; |
| 149 | } | 150 | } |
| 150 | 151 | ||
| 151 | table.list td { | 152 | div#cgit table.list td { |
| 152 | border: none; | 153 | border: none; |
| 153 | padding: 0.1em 0.5em 0.1em 0.5em; | 154 | padding: 0.1em 0.5em 0.1em 0.5em; |
| 154 | } | 155 | } |
| 155 | 156 | ||
| 156 | table.list td.commitgraph { | 157 | div#cgit table.list td.commitgraph { |
| 157 | font-family: monospace; | 158 | font-family: monospace; |
| 158 | white-space: pre; | 159 | white-space: pre; |
| 159 | } | 160 | } |
| 160 | 161 | ||
| 161 | table.list td.commitgraph .column1 { | 162 | div#cgit table.list td.commitgraph .column1 { |
| 162 | color: #a00; | 163 | color: #a00; |
| 163 | } | 164 | } |
| 164 | 165 | ||
| 165 | table.list td.commitgraph .column2 { | 166 | div#cgit table.list td.commitgraph .column2 { |
| 166 | color: #0a0; | 167 | color: #0a0; |
| 167 | } | 168 | } |
| 168 | 169 | ||
| 169 | table.list td.commitgraph .column3 { | 170 | div#cgit table.list td.commitgraph .column3 { |
| 170 | color: #aa0; | 171 | color: #aa0; |
| 171 | } | 172 | } |
| 172 | 173 | ||
| 173 | table.list td.commitgraph .column4 { | 174 | div#cgit table.list td.commitgraph .column4 { |
| 174 | color: #00a; | 175 | color: #00a; |
| 175 | } | 176 | } |
| 176 | 177 | ||
| 177 | table.list td.commitgraph .column5 { | 178 | div#cgit table.list td.commitgraph .column5 { |
| 178 | color: #a0a; | 179 | color: #a0a; |
| 179 | } | 180 | } |
| 180 | 181 | ||
| 181 | table.list td.commitgraph .column6 { | 182 | div#cgit table.list td.commitgraph .column6 { |
| 182 | color: #0aa; | 183 | color: #0aa; |
| 183 | } | 184 | } |
| 184 | 185 | ||
| 185 | table.list td.logsubject { | 186 | div#cgit table.list td.logsubject { |
| 186 | font-family: monospace; | 187 | font-family: monospace; |
| 187 | font-weight: bold; | 188 | font-weight: bold; |
| 188 | } | 189 | } |
| 189 | 190 | ||
| 190 | table.list td.logmsg { | 191 | div#cgit table.list td.logmsg { |
| 191 | font-family: monospace; | 192 | font-family: monospace; |
| 192 | white-space: pre; | 193 | white-space: pre; |
| 193 | padding: 0 0.5em; | 194 | padding: 0 0.5em; |
| 194 | } | 195 | } |
| 195 | 196 | ||
| 196 | table.list td a { | 197 | div#cgit table.list td a { |
| 197 | color: black; | 198 | color: black; |
| 198 | } | 199 | } |
| 199 | 200 | ||
| 200 | table.list td a.ls-dir { | 201 | div#cgit table.list td a.ls-dir { |
| 201 | font-weight: bold; | 202 | font-weight: bold; |
| 202 | color: #00f; | 203 | color: #00f; |
| 203 | } | 204 | } |
| 204 | 205 | ||
| 205 | table.list td a:hover { | 206 | div#cgit table.list td a:hover { |
| 206 | color: #00f; | 207 | color: #00f; |
| 207 | } | 208 | } |
| 208 | 209 | ||
| 209 | img { | 210 | div#cgit img { |
| 210 | border: none; | 211 | border: none; |
| 211 | } | 212 | } |
| 212 | 213 | ||
| 213 | input#switch-btn { | 214 | div#cgit input#switch-btn { |
| 214 | margin: 2px 0px 0px 0px; | 215 | margin: 2px 0px 0px 0px; |
| 215 | } | 216 | } |
| 216 | 217 | ||
| 217 | td#sidebar input.txt { | 218 | div#cgit td#sidebar input.txt { |
| 218 | width: 100%; | 219 | width: 100%; |
| 219 | margin: 2px 0px 0px 0px; | 220 | margin: 2px 0px 0px 0px; |
| 220 | } | 221 | } |
| 221 | 222 | ||
| 222 | table#grid { | 223 | div#cgit table#grid { |
| 223 | margin: 0px; | 224 | margin: 0px; |
| 224 | } | 225 | } |
| 225 | 226 | ||
| 226 | td#content { | 227 | div#cgit td#content { |
| 227 | vertical-align: top; | 228 | vertical-align: top; |
| 228 | padding: 1em 2em 1em 1em; | 229 | padding: 1em 2em 1em 1em; |
| 229 | border: none; | 230 | border: none; |
