summary refs log tree commit diff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--bin/Makefile2
-rw-r--r--bin/html.sh19
2 files changed, 14 insertions, 7 deletions
diff --git a/bin/Makefile b/bin/Makefile
index 9b2c06d4..6220ec06 100644
--- a/bin/Makefile
+++ b/bin/Makefile
@@ -137,7 +137,7 @@ WEBROOT = /usr/local/www/causal.agency
 html: ${HTMLS}
 	@true
 
-${HTMLS}: html.sh scheme ttpre htagml htmltags
+${HTMLS}: html.sh scheme hilex htagml htmltags
 
 htmltags: *.[chly]
 	rm -f $@
diff --git a/bin/html.sh b/bin/html.sh
index c86ce87a..c2ad7fa2 100644
--- a/bin/html.sh
+++ b/bin/html.sh
@@ -13,7 +13,7 @@ cat <<EOF
 <!DOCTYPE html>
 <title>${title}</title>
 <style>
-$(./scheme -s)
+$(./scheme -st)
 
 table.head, table.foot { width: 100%; }
 td.head-rtitle, td.foot-os { text-align: right; }
@@ -33,8 +33,8 @@ table.foot { margin-top: 1em; }
 html {
 	line-height: 1.25em;
 	font-family: monospace;
-	background-color: var(--ansi0);
-	color: var(--ansi7);
+	background-color: var(--ansi16);
+	color: var(--ansi17);
 	-moz-tab-size: 4;
 	tab-size: 4;
 }
@@ -51,16 +51,23 @@ ul.index li {
 a { color: var(--ansi4); }
 a:visited { color: var(--ansi5); }
 a.permalink, a.tag {
-	color: var(--ansi6);
+	color: var(--ansi3);
 	text-decoration: none;
 }
 a.permalink code:target,
 h1.Sh:target a.permalink,
 h2.Ss:target a.permalink,
 a.tag:target {
-	color: var(--ansi3);
+	color: var(--ansi11);
 	outline: none;
 }
+
+.hilex.Keyword { color: var(--ansi7); }
+.hilex.Macro { color: var(--ansi2); }
+.hilex.Comment { color: var(--ansi4); }
+.hilex.String { color: var(--ansi6); }
+.hilex.StringFormat { color: var(--ansi14); }
+.hilex.Interpolation { color: var(--ansi1); }
 </style>
 EOF
 
@@ -76,5 +83,5 @@ while [ $# -gt 0 ]; do
 	<a href="${GitURL}/${src}">${src} in git</a>
 	EOF
 	./htagml -x -f htmltags "${src}"
-	./htagml -p -f htmltags "${src}"
+	./hilex -t -f html "${src}" | ./htagml -ip -f htmltags "${src}"
 done
generated by cgit-pink 1.4.1 (git 2.36.1) at 2024-11-23 14:14:30 +0000
is before letting people set it as the default. Suggested-by: Konstantin Ryabitsev <mricon@kernel.org> Signed-off-by: John Keeping <john@keeping.me.uk> 2014-12-13Change "ss" diff flag to an enumJohn Keeping This will allow us to introduce a new "stat only" diff mode without needing an explosion of mutually incompatible flags. The old "ss" query parameter is still accepted in order to avoid breaking saved links, but we no longer generate any URIs using it; instead the new "dt" (diff type) parameter is used. Signed-off-by: John Keeping <john@keeping.me.uk> 2014-12-13ui-shared: remove toggle_ssdiff arg to cgit_diff_link()John Keeping This argument is never used with a value other than zero, so remove it and simplify the code. Signed-off-by: John Keeping <john@keeping.me.uk> 2014-12-13ui-shared: remove toggle_ssdiff arg to cgit_commit_link()John Keeping This argument is never used with a value other than zero, so remove it and simplify the code. Signed-off-by: John Keeping <john@keeping.me.uk> 2014-08-07git: update to v2.0.4John Keeping No CGit changes required. Signed-off-by: John Keeping <john@keeping.me.uk> 2014-08-07Always check if README exists in choose_readme()Lukas Fleischer Specifying a nonexistent README file via the readme option is sometimes useful, e.g. when using scan-path and setting a global default. Currently, we check whether there is only one option in the readme option and, if so, we choose that file without checking whether it exists. As a consequence, all repositories are equipped with an about link in the aforementioned scenario, even if there is no about file. Remove the early check for the number of keys and always check whether the file exists instead. Signed-off-by: Lukas Fleischer <cgit@cryptocrack.de> 2014-08-01cgitrc.5: we mean a cgi response, not requestJason A. Donenfeld 2014-07-28ui-stats.c: set parent pointer to NULL after freeing itJohn Keeping We do this everywhere else, so we should be doing it here as well. Signed-off-by: John Keeping <john@keeping.me.uk> 2014-07-28git: update to v2.0.3John Keeping This is slightly more involved than just bumping the version number because it pulls in a change to convert the commit buffer to a slab, removing the "buffer" field from "struct commit". All sites that access "commit->buffer" have been changed to use the new functions provided for this purpose. Signed-off-by: John Keeping <john@keeping.me.uk> 2014-07-28parsing.c: make commit buffer constJohn Keeping This will be required in order to incorporate the changes to commit buffer handling in Git 2.0.2. Signed-off-by: John Keeping <john@keeping.me.uk> 2014-06-30Bump version.Jason A. Donenfeld 2014-06-29remove debug fprinf() calls that sneaked in with commit 79c985Christian Hesse 2014-06-28git: update to 2.0.1Christian Hesse Everything works just bumping the version in Makefile and commit hash in submodule. No code changes required. 2014-06-28ui-patch: Flush stdout after outputting dataJohn Keeping It looks like cached patches are truncated to the nearest 1024-byte boundary in the patch body. E.g.: > mricon@nikko:[/tmp]$ wget -O no-cache > "http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/patch/?id=6e1b4fdad5157bb9e88777d525704aba24389bee" ... > 2014-06-11 15:34:51 (80.4 MB/s) - ‘no-cache’ saved [4767] Patch is complete, without truncation. Next hit, with cache in place: > mricon@nikko:[/tmp]$ wget -O yes-cache > "http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/patch/?id=6e1b4 > fdad5157bb9e88777d525704aba24389bee" ... > 2014-06-11 15:35:01 (17.0 MB/s) - ‘yes-cache’ saved [4096/4096] Length truncated to 4096. The cache on disk looks truncated as well, so the bug must me during the process of saving cache. The same is true for larger patches: > mricon@nikko:[/tmp]$ wget -O no-cache > "http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/patch/?id=2840c566e95599cd60c7143762ca8b49d9395050" ... > 2014-06-11 15:41:33 (1.07 MB/s) - ‘no-cache’ saved [979644] 979644 bytes with a cache-miss > mricon@nikko:[/tmp]$ wget -O yes-cache > "http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/patch/?id=2840c > 566e95599cd60c7143762ca8b49d9395050" ... > 2014-06-11 15:41:46 (1.05 MB/s) - ‘yes-cache’ saved [978944] 978944 (956KB exactly) with a cache-hit Since the "html" functions use raw write(2) to STDIO_FILENO, we don't notice problems with most pages, but raw patches write using printf(3). This is fine if we're outputting straight to stdout since the buffers are flushed on exit, but we close the cache output before this, so the cached output ends up being truncated. Make sure the buffers are flushed when we finish outputting a patch so that we avoid this. No other UIs use printf(3) so we do not need to worry about them. Actually, it's slightly more interesting than this... since we don't set GIT_FLUSH, Git decides whether or not it will flush stdout after writing each commit based on whether or not stdout points to a regular file (in maybe_flush_or_die()). Which means that when writing directly to the webserver, Git flushes stdout for us, but when we redirect stdout to the cache it points to a regular file so Git no longer flushes the output for us. The patch is still correct, but perhaps the full explanation is interesting! Reported-by: Konstantin Ryabitsev <mricon@kernel.org> 2014-06-28ui-log: ignore unhandled argumentsJohn Keeping If you search for a bogus range string here: http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/log/ Using something like "range" and "qwerty123456", it returns an "Internal Server Error" and the following in the logs: > [Tue Jun 10 17:45:32 2014] [error] [client 172.21.1.6] fatal: > ambiguous argument 'qwerty123456': unknown revision or path not in the > working tree., referer: > http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/ > [Tue Jun 10 17:45:32 2014] [error] [client 172.21.1.6] Use '--' to > separate paths from revisions, like this:, referer: > http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/ > [Tue Jun 10 17:45:32 2014] [error] [client 172.21.1.6] 'git <command> > [<revision>...] -- [<file>...]', referer: > http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/ > [Tue Jun 10 17:45:32 2014] [error] [client 172.21.1.6] Premature end > of script headers: cgit, referer: > http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/ The cache will kick in, so if you search for the same string again, it'll show an empty range, so you have to change the bogus strings each time. This is because we just pass the arguments straight to Git's revision parsing machinery which die()s if it cannot parse an argument, printing the above to stderr and exiting. The patch below makes it a bit friendlier by just ignoring unhandled arguments, but I can't see an easy way to report errors when we can't parse revision arguments without losing the flexibility of supporting all of the revision specifiers supported by Git. Reported-by: Konstantin Ryabitsev <mricon@kernel.org> 2014-06-28git: update for git 2.0Christian Hesse prefixcmp() and suffixcmp() have been remove, functionality is now provided by starts_with() and ends_with(). Retrurn values have been changed, so instead of just renaming we have to fix logic. Everything else looks just fine. 2014-04-17remove trailing whitespaces from source filesChristian Hesse 2014-04-12git: update to 1.9.2Christian Hesse Everything works just bumping the version in Makefile and commit hash in submodule. No code changes required. 2014-04-05Fix cgit_parse_url when a repo url is contained in another repo urlJulian Maurice For example, if I have two repos (remove-suffix is enabled): /foo /foo/bar http://cgit/foo/bar/ is interpreted as "repository 'foo', command 'bar'" instead of "repository 'foo/bar'" 2014-03-20Makefile: use more reliable git tarball mirrorJason A. Donenfeld 2014-03-20git: update to 1.9.1Christian Hesse