aboutsummaryrefslogtreecommitdiff
diff refs
from: back
to: back
| flip
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile2
-rw-r--r--README.md10
-rw-r--r--cgitrc.5.txt2
-rw-r--r--solarized.css140
-rwxr-xr-xtests/t0106-diff.sh56
-rw-r--r--ui-diff.c66
6 files changed, 3 insertions, 273 deletions
diff --git a/Makefile b/Makefile
index b87116a..c75f67b 100644
--- a/Makefile
+++ b/Makefile
@@ -87,7 +87,6 @@ install: all
$(INSTALL) -m 0755 cgit $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
$(INSTALL) -m 0755 -d $(DESTDIR)$(CGIT_DATA_PATH)
$(INSTALL) -m 0644 cgit.css $(DESTDIR)$(CGIT_DATA_PATH)/cgit.css
- $(INSTALL) -m 0644 solarized.css $(DESTDIR)$(CGIT_DATA_PATH)/solarized.css
$(INSTALL) -m 0644 cgit.js $(DESTDIR)$(CGIT_DATA_PATH)/cgit.js
$(INSTALL) -m 0644 cgit.png $(DESTDIR)$(CGIT_DATA_PATH)/cgit.png
$(INSTALL) -m 0644 cgit.svg $(DESTDIR)$(CGIT_DATA_PATH)/cgit.svg
@@ -119,7 +118,6 @@ endef
uninstall:
rm -f $(DESTDIR)$(CGIT_SCRIPT_PATH)/$(CGIT_SCRIPT_NAME)
rm -f $(DESTDIR)$(CGIT_DATA_PATH)/cgit.css
- rm -f $(DESTDIR)$(CGIT_DATA_PATH)/solarized.css
rm -f $(DESTDIR)$(CGIT_DATA_PATH)/cgit.js
rm -f $(DESTDIR)$(CGIT_DATA_PATH)/cgit.png
rm -f $(DESTDIR)$(CGIT_DATA_PATH)/cgit.svg
diff --git a/README.md b/README.md
index 1e13a37..2f7727e 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-## cgitext – CGI for Git extension by Saya Andy
+## cgitext - CGI for Git extension by Saya Andy
This is a custom expansion to cgit. Its most prominent changes by now are:
@@ -8,15 +8,9 @@ This is a custom expansion to cgit. Its most prominent changes by now are:
* Allow to use multiple favicons and of MIME type different from x-icon (f.ex. svg/png/webp).
-* Use vector-based format for favicon and cgit logo and make it default.
-
-* Include optional solarized.css addon theme.
-
-* Allow user to pick variable refs for diff in web ui.
-
The original cgit project is hosted at [git.zx2c4.com](https://git.zx2c4.com/cgit/about/)
-## cgit – CGI for Git
+## cgit - CGI for Git
This is an attempt to create a fast web interface for the Git SCM, using a built-in cache to decrease server I/O pressure.
diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index 527233d..6ddb977 100644
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -921,10 +921,8 @@ cache-size=1000
# Specify some default clone urls using macro expansion
clone-url=git://foo.org/$CGIT_REPO_URL git@foo.org:$CGIT_REPO_URL
-
# Specify the css url
css=/css/cgit.css
-css=/css/solarized.css
# Add a "ci" tab pointing at a Jenkins multibranch pipeline
diff --git a/solarized.css b/solarized.css
deleted file mode 100644
index 2e6e3d4..0000000
--- a/solarized.css
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
- * Solarized theme (Ethan Schoonover) with automatic light/dark selection
- * based on the prefers-color-scheme media query.
- *
- * Must be listed after cgit.css, e.g.
- *
- * css=/cgit.css
- * css=/solarized.css
- */
-
-:root {
- --sol-base03: #002b36;
- --sol-base02: #073642;
- --sol-base01: #586e75;
- --sol-base00: #657b83;
- --sol-base0: #839496;
- --sol-base1: #93a1a1;
- --sol-base2: #eee8d5;
- --sol-base3: #fdf6e3;
-
- --sol-yellow: #b58900;
- --sol-orange: #cb4b16;
- --sol-red: #dc322f;
- --sol-magenta: #d33682;
- --sol-violet: #6c71c4;
- --sol-blue: #268bd2;
- --sol-cyan: #2aa198;
- --sol-green: #859900;
-
- --sol-canvas: var(--sol-base3);
- --sol-panel: var(--sol-base2);
- --sol-body: var(--sol-base00);
- --sol-emph: var(--sol-base01);
- --sol-muted: var(--sol-base0);
- --sol-secondary: var(--sol-base1);
- --sol-shade: var(--sol-base03);
- --sol-page: var(--sol-panel);
-
- --sol-tint-soft: 18%;
- --sol-tint: 25%;
- --sol-tint-strong: 45%;
-
- color-scheme: light dark;
-}
-
-@media (prefers-color-scheme: dark) {
- :root {
- --sol-canvas: var(--sol-base03);
- --sol-panel: var(--sol-base02);
- --sol-body: var(--sol-base0);
- --sol-emph: var(--sol-base1);
- --sol-muted: var(--sol-base00);
- --sol-secondary: var(--sol-base01);
- --sol-shade: var(--sol-base3);
-
- --sol-tint-soft: 30%;
- --sol-tint: 35%;
- --sol-tint-strong: 55%;
- }
-}
-
-body:has(> div#cgit) {
- margin: 0;
- background-color: var(--sol-page);
-}
-
-div#cgit {
- --bg: var(--sol-canvas);
- --bg-zebra: color-mix(in srgb, var(--sol-panel) 40%, var(--sol-canvas));
- --bg-hl: var(--sol-panel);
- --bg-hl2: color-mix(in srgb, var(--sol-panel) 85%, var(--sol-shade));
- --fg: var(--sol-body);
- --fg-strong: var(--sol-emph);
- --fg-mid: var(--sol-body);
- --fg-mute: var(--sol-muted);
- --fg-dim: var(--sol-secondary);
- --fg-faint: color-mix(in srgb, var(--sol-secondary) 65%, var(--sol-canvas));
- --fg-faintest: color-mix(in srgb, var(--sol-secondary) 45%, var(--sol-canvas));
- --fg-on-tint: var(--sol-emph);
- --fg-linenum: var(--sol-secondary);
- --border: var(--sol-panel);
- --border-mid: var(--sol-secondary);
- --border-dark: var(--sol-muted);
- --border-strong: var(--sol-emph);
-
- --red: var(--sol-red);
- --red-mid: color-mix(in srgb, var(--sol-red) 75%, var(--sol-shade));
- --red-dark: color-mix(in srgb, var(--sol-red) 55%, var(--sol-shade));
- --green: var(--sol-green);
- --green-mid: color-mix(in srgb, var(--sol-green) 70%, var(--sol-shade));
- --green-dark: color-mix(in srgb, var(--sol-green) 50%, var(--sol-shade));
- --blue: var(--sol-blue);
- --blue-dark: color-mix(in srgb, var(--sol-blue) 70%, var(--sol-shade));
-
- --graph-col1: var(--sol-red);
- --graph-col2: var(--sol-green);
- --graph-col3: var(--sol-yellow);
- --graph-col4: var(--sol-blue);
- --graph-col5: var(--sol-magenta);
- --graph-col6: var(--sol-cyan);
-
- --graph-add-bg: var(--sol-green);
- --graph-rem-bg: var(--sol-red);
-
- --notes-bg: color-mix(in srgb, var(--sol-yellow) var(--sol-tint-soft), var(--sol-canvas));
- --notes-border: var(--sol-yellow);
- --add-bg: color-mix(in srgb, var(--sol-green) var(--sol-tint), var(--sol-canvas));
- --add-bg-dark: color-mix(in srgb, var(--sol-green) var(--sol-tint-strong), var(--sol-canvas));
- --del-bg: color-mix(in srgb, var(--sol-red) var(--sol-tint), var(--sol-canvas));
- --del-bg-dark: color-mix(in srgb, var(--sol-red) var(--sol-tint-strong), var(--sol-canvas));
- --changed-bg: color-mix(in srgb, var(--sol-yellow) var(--sol-tint), var(--sol-canvas));
- --changed-bg-dark: color-mix(in srgb, var(--sol-yellow) var(--sol-tint-strong), var(--sol-canvas));
- --hunk-bg: color-mix(in srgb, var(--sol-blue) var(--sol-tint), var(--sol-canvas));
-
- --deco-branch-bg: color-mix(in srgb, var(--sol-green) var(--sol-tint-soft), var(--sol-canvas));
- --deco-branch-border: var(--sol-green);
- --deco-tag-bg: color-mix(in srgb, var(--sol-yellow) var(--sol-tint-soft), var(--sol-canvas));
- --deco-tag-border: var(--sol-yellow);
- --deco-tag-annotated-bg: color-mix(in srgb, var(--sol-orange) var(--sol-tint-soft), var(--sol-canvas));
- --deco-tag-annotated-border: var(--sol-yellow);
- --deco-remote-bg: color-mix(in srgb, var(--sol-violet) var(--sol-tint-soft), var(--sol-canvas));
- --deco-remote-border: var(--sol-violet);
- --deco-other-bg: color-mix(in srgb, var(--sol-red) var(--sol-tint-soft), var(--sol-canvas));
- --deco-other-border: var(--sol-red);
-
- --syn-keyword: var(--sol-emph);
- --syn-keyword-alt: var(--sol-blue);
- --syn-type: var(--blue-dark);
- --syn-string: var(--sol-red);
- --syn-string-alt: var(--sol-green);
- --syn-escape: var(--sol-magenta);
- --syn-comment: var(--sol-secondary);
- --syn-number: var(--sol-yellow);
- --syn-preproc: var(--green-mid);
- --syn-operator: var(--sol-emph);
- --syn-interpolation: var(--sol-blue);
- --syn-linenum: var(--sol-secondary);
- --syn-error: var(--sol-red);
- --syn-mark-bg: color-mix(in srgb, var(--sol-yellow) var(--sol-tint), var(--sol-canvas));
-}
diff --git a/tests/t0106-diff.sh b/tests/t0106-diff.sh
index 0c167d4..82b645e 100755
--- a/tests/t0106-diff.sh
+++ b/tests/t0106-diff.sh
@@ -16,60 +16,4 @@ test_expect_success 'find added line' '
grep "<div class=.add.>+5</div>" tmp
'
-test_expect_success 'ref picker: from: select present' '
- grep "<select name=.id2." tmp
-'
-
-test_expect_success 'ref picker: to: select present' '
- grep "<select name=.id." tmp
-'
-
-test_expect_success 'ref picker: from: label present' '
- grep "from:" tmp
-'
-
-test_expect_success 'ref picker: to: label present' '
- grep "to:" tmp
-'
-
-test_expect_success 'ref picker: master branch listed' '
- grep "master" tmp
-'
-
-test_expect_success 'ref picker: auto-submit on change' '
- grep "onchange=.this.form.submit()." tmp
-'
-
-test_expect_success 'compare two refs: foo/diff?id=master&id2=HEAD' '
- cgit_query "url=foo/diff&id=master&id2=HEAD" >tmp
-'
-
-test_expect_success 'diff with explicit refs shows diffstat' '
- grep "diffstat" tmp
-'
-
-test_expect_success 'diff with oid2 parameter uses it for old ref' '
- cgit_query "url=foo/diff&id=master&id2=HEAD" >tmp &&
- grep "from:" tmp
-'
-
-test_expect_success 'ref picker: to: shows master when id=master' '
- cgit_query "url=foo/diff&id=master" >tmp &&
- grep "master" tmp
-'
-
-test_expect_success 'ref picker: from: empty when no id2' '
- cgit_query "url=foo/diff" >tmp &&
- grep "<select name=.id2." tmp
-'
-
-test_expect_success 'compare initial commit with HEAD' '
- root=$(git --git-dir="$PWD/repos/foo/.git" rev-list --max-parents=0 HEAD) &&
- cgit_query "url=foo/diff&id=HEAD&id2=$root" >tmp
-'
-
-test_expect_success 'diff with HEAD and root shows content' '
- grep "diffstat" tmp
-'
-
test_done
diff --git a/ui-diff.c b/ui-diff.c
index ae4c9de..6cfa697 100644
--- a/ui-diff.c
+++ b/ui-diff.c
@@ -1,10 +1,6 @@
/* ui-diff.c: show diff between two blobs
*
* Copyright (C) 2006-2014 cgit Development Team <cgit@lists.zx2c4.com>
- * Copyright (C) 2026 Saya Andy <saya.andy@posteo.com>
- *
- * Modified 2026 by Saya Andy:
- * Select variable refs from web ui for diff
*
* Licensed under GNU General Public License v2
* (see COPYING for full license text)
@@ -340,32 +336,6 @@ static void filepair_cb(struct diff_filepair *pair)
cgit_ssdiff_footer();
}
-static int print_ref_option(const struct reference *ref, void *cb_data)
-{
- const char **sel = (const char **)cb_data;
-
- html_option(ref->name, ref->name, sel[0]);
- return 0;
-}
-
-static void cgit_print_ref_select(const char *name, const char *selected)
-{
- /*
- * Offer every branch and tag so that any two refs can be compared.
- */
- html("<select name='");
- html_attr(name);
- html("' onchange='this.form.submit();'>");
- refs_for_each_branch_ref(get_main_ref_store(the_repository),
- print_ref_option, (void *)&selected);
- if (ctx.repo->enable_remote_branches)
- refs_for_each_remote_ref(get_main_ref_store(the_repository),
- print_ref_option, (void *)&selected);
- refs_for_each_tag_ref(get_main_ref_store(the_repository),
- print_ref_option, (void *)&selected);
- html("</select>");
-}
-
void cgit_print_diff_ctrls(void)
{
int i, curr;
@@ -373,43 +343,9 @@ void cgit_print_diff_ctrls(void)
html("<div class='cgit-panel'>");
html("<b>diff options</b>");
html("<form method='get'>");
- /*
- * Emit the same hidden fields as cgit_add_hidden_formfields(), except
- * id/id2, which are carried by the ref-picker selects below.
- */
- if (!ctx.cfg.virtual_root) {
- struct strbuf url = STRBUF_INIT;
- strbuf_addf(&url, "%s/%s", ctx.qry.repo, ctx.qry.page);
- if (ctx.qry.vpath)
- strbuf_addf(&url, "/%s", ctx.qry.vpath);
- html_hidden("url", url.buf);
- strbuf_release(&url);
- }
- if (ctx.qry.head && ctx.repo->defbranch &&
- strcmp(ctx.qry.head, ctx.repo->defbranch))
- html_hidden("h", ctx.qry.head);
- if (ctx.qry.showmsg)
- html_hidden("showmsg", "1");
-
+ cgit_add_hidden_formfields(1, 0, ctx.qry.page);
html("<table>");
html("<tr><td colspan='2'/></tr>");
-
- /* ref pickers: compare any two refs (branches/tags) */
- {
- const char *new_ref = ctx.qry.oid ? ctx.qry.oid : ctx.qry.head;
- const char *old_ref = ctx.qry.oid2;
-
- html("<tr>");
- html("<td class='label'>from:</td>");
- html("<td class='ctrl'>");
- cgit_print_ref_select("id2", old_ref);
- html("</td></tr><tr>");
- html("<td class='label'>to:</td>");
- html("<td class='ctrl'>");
- cgit_print_ref_select("id", new_ref);
- html("</td></tr>");
- }
-
html("<tr>");
html("<td class='label'>context:</td>");
html("<td class='ctrl'>");
generated by cgitext v1.3.1+17 (git 2.54.0) at 2026-09-17 15:30:41 +0000