From e at 80x24.org  Sat Feb  8 19:44:48 2020
From: e at 80x24.org (Eric Wong)
Date: Sat, 8 Feb 2020 18:44:48 +0000
Subject: [PATCH 0/4] improve rendering w/o CSS reliance
In-Reply-To: <20190101114453.4876-1-e@80x24.org>
References: <20190101114453.4876-1-e@80x24.org>
Message-ID: <20200208184448.GA1817@starla>

Eric Wong <e at 80x24.org> wrote:
> Here are a few changes to improve rendering for people with
> low-end machines using text-based browsers (w3m, lynx) or
> lightweight GUI browsers such as dillo, which has incomplete CSS
> support.

Ping.  Any feedback on this series?  Thanks.

From list at eworm.de  Mon Feb 17 09:09:03 2020
From: list at eworm.de (Christian Hesse)
Date: Mon, 17 Feb 2020 09:09:03 +0100
Subject: [PATCH 1/1] git: update to v2.25.1
Message-ID: <20200217080903.73642-1-list@eworm.de>

From: Christian Hesse <mail at eworm.de>

Update to git version v2.25.1.

No changes required.

Signed-off-by: Christian Hesse <mail at eworm.de>
---
 Makefile | 2 +-
 git      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index b51de6f..23f79cf 100644
--- a/Makefile
+++ b/Makefile
@@ -14,7 +14,7 @@ htmldir = $(docdir)
 pdfdir = $(docdir)
 mandir = $(prefix)/share/man
 SHA1_HEADER = <openssl/sha.h>
-GIT_VER = 2.25.0
+GIT_VER = 2.25.1
 GIT_URL = https://www.kernel.org/pub/software/scm/git/git-$(GIT_VER).tar.xz
 INSTALL = install
 COPYTREE = cp -r
diff --git a/git b/git
index d0654dc..c522f06 160000
--- a/git
+++ b/git
@@ -1 +1 @@
-Subproject commit d0654dc308b0ba76dd8ed7bbb33c8d8f7aacd783
+Subproject commit c522f061d551c9bb8684a7c3859b2ece4499b56b

From Jason at zx2c4.com  Mon Feb 17 13:08:42 2020
From: Jason at zx2c4.com (Jason A. Donenfeld)
Date: Mon, 17 Feb 2020 13:08:42 +0100
Subject: [PATCH 1/1] git: update to v2.25.1
In-Reply-To: <20200217080903.73642-1-list@eworm.de>
References: <20200217080903.73642-1-list@eworm.de>
Message-ID: <CAHmME9q+RzHveiwZLwkfQVsYz3VHZYX4-+p_fC8=JqbGeURj-g@mail.gmail.com>

Merged, thanks.

From june at causal.agency  Sat Feb 22 00:45:18 2020
From: june at causal.agency (C. McEnroe)
Date: Fri, 21 Feb 2020 18:45:18 -0500
Subject: [PATCH] ui-commit: show subject in page title
Message-ID: <20200221234518.86715-1-june@causal.agency>

---
Unclear whether this project actually accepts patches, but I figure I'd
share it with the other list subscribers :)

 ui-commit.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ui-commit.c b/ui-commit.c
index 9a47b54..ac3ca01 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -43,6 +43,7 @@ void cgit_print_commit(char *hex, const char *prefix)
 
 	load_ref_decorations(NULL, DECORATE_FULL_REFS);
 
+	ctx.page.title = fmtalloc("%s - %s", info->subject, ctx.page.title);
 	cgit_print_layout_start();
 	cgit_print_diff_ctrls();
 	html("<table summary='commit info' class='commit-info'>\n");
-- 
2.25.0


From Jason at zx2c4.com  Sun Feb 23 14:00:30 2020
From: Jason at zx2c4.com (Jason A. Donenfeld)
Date: Sun, 23 Feb 2020 14:00:30 +0100
Subject: [PATCH] ui-commit: show subject in page title
In-Reply-To: <20200221234518.86715-1-june@causal.agency>
References: <20200221234518.86715-1-june@causal.agency>
Message-ID: <CAHmME9pCq8JhExDS7028jfjoz-9RyLS+wrX_b7M6Hjria8OmuA@mail.gmail.com>

Thanks. Can you resubmit this with your Signed-off-by: line?

From june at causal.agency  Sun Feb 23 19:52:27 2020
From: june at causal.agency (C. McEnroe)
Date: Sun, 23 Feb 2020 13:52:27 -0500
Subject: [PATCH v2] ui-commit: show subject in page title
Message-ID: <20200223185227.89151-1-june@causal.agency>

Signed-off-by: C. McEnroe <june at causal.agency>
---

With Signed-off-by.

 ui-commit.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ui-commit.c b/ui-commit.c
index 9a47b54..ac3ca01 100644
--- a/ui-commit.c
+++ b/ui-commit.c
@@ -43,6 +43,7 @@ void cgit_print_commit(char *hex, const char *prefix)
 
 	load_ref_decorations(NULL, DECORATE_FULL_REFS);
 
+	ctx.page.title = fmtalloc("%s - %s", info->subject, ctx.page.title);
 	cgit_print_layout_start();
 	cgit_print_diff_ctrls();
 	html("<table summary='commit info' class='commit-info'>\n");
-- 
2.25.0


From Jason at zx2c4.com  Wed Feb 26 02:58:38 2020
From: Jason at zx2c4.com (Jason A. Donenfeld)
Date: Wed, 26 Feb 2020 09:58:38 +0800
Subject: [PATCH] ui-snapshot: add support for lzip compression
In-Reply-To: <20190816214019.13895-1-dev@open-music-kontrollers.ch>
References: <20190816214019.13895-1-dev@open-music-kontrollers.ch>
Message-ID: <CAHmME9qR7-uZ0n+iArVdkDcAYBPG-NYDsRL=rpLKW6uQRt7ZPA@mail.gmail.com>

Applied, thanks.

From list at eworm.de  Wed Feb 26 09:21:47 2020
From: list at eworm.de (Christian Hesse)
Date: Wed, 26 Feb 2020 09:21:47 +0100
Subject: [PATCH 1/2] ui-snapshot: add support for zstd compression
Message-ID: <20200226082148.42470-1-list@eworm.de>

From: Christian Hesse <mail at eworm.de>

This patch adds support for zstd [0] compressed snapshots (*.tar.zst).

[0] https://www.zstd.net/

Signed-off-by: Christian Hesse <mail at eworm.de>
---
 cgitrc.5.txt            |  5 +++--
 tests/setup.sh          |  2 +-
 tests/t0107-snapshot.sh | 42 +++++++++++++++++++++++++++++++++++++++++
 ui-snapshot.c           |  7 +++++++
 4 files changed, 53 insertions(+), 3 deletions(-)

diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index 4ad3e64..b0ec698 100644
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -407,8 +407,9 @@ side-by-side-diffs::
 snapshots::
 	Text which specifies the default set of snapshot formats that cgit
 	generates links for. The value is a space-separated list of zero or
-	more of the values "tar", "tar.gz", "tar.bz2", "tar.xz", "tar.lz" and
-	"zip". The special value "all" enables all snapshot formats.
+	more of the values "tar", "tar.gz", "tar.bz2", "tar.lz", "tar.xz",
+	"tar.zst" and "zip". The special value "all" enables all snapshot
+	formats.
 	Default value: none.
 
 source-filter::
diff --git a/tests/setup.sh b/tests/setup.sh
index 69e47e6..e09f7c5 100755
--- a/tests/setup.sh
+++ b/tests/setup.sh
@@ -104,7 +104,7 @@ virtual-root=/
 cache-root=$PWD/cache
 
 cache-size=1021
-snapshots=tar.gz tar.bz tar.lz zip
+snapshots=tar.gz tar.bz tar.lz tar.zst zip
 enable-log-filecount=1
 enable-log-linecount=1
 summary-log=5
diff --git a/tests/t0107-snapshot.sh b/tests/t0107-snapshot.sh
index a845ad9..95ad624 100755
--- a/tests/t0107-snapshot.sh
+++ b/tests/t0107-snapshot.sh
@@ -80,6 +80,48 @@ test_expect_success LZIP 'verify untarred file-5' '
 	test_line_count = 1 master/file-5
 '
 
+if test -n "$(which zstd 2>/dev/null)"; then
+	test_set_prereq ZSTD
+else
+	say 'Skipping ZSTD validation tests: zstd not found'
+fi
+
+test_expect_success ZSTD 'get foo/snapshot/master.tar.zst' '
+	cgit_url "foo/snapshot/master.tar.zst" >tmp
+'
+
+test_expect_success ZSTD 'check html headers' '
+	head -n 1 tmp |
+	grep "Content-Type: application/x-zstd" &&
+
+	head -n 2 tmp |
+	grep "Content-Disposition: inline; filename=.master.tar.zst."
+'
+
+test_expect_success ZSTD 'strip off the header lines' '
+	strip_headers <tmp >master.tar.zst
+'
+
+test_expect_success ZSTD 'verify zstd format' '
+	zstd --test master.tar.zst &&
+	cp master.tar.zst /tmp/.
+'
+
+test_expect_success ZSTD 'untar' '
+	rm -rf master &&
+	tar --zstd -xf master.tar.zst
+'
+
+test_expect_success ZSTD 'count files' '
+	ls master/ >output &&
+	test_line_count = 5 output
+'
+
+test_expect_success ZSTD 'verify untarred file-5' '
+	grep "^5$" master/file-5 &&
+	test_line_count = 1 master/file-5
+'
+
 test_expect_success 'get foo/snapshot/master.zip' '
 	cgit_url "foo/snapshot/master.zip" >tmp
 '
diff --git a/ui-snapshot.c b/ui-snapshot.c
index 92cde42..db9f51f 100644
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -91,6 +91,12 @@ static int write_tar_xz_archive(const char *hex, const char *prefix)
 	return write_compressed_tar_archive(hex, prefix, argv);
 }
 
+static int write_tar_zstd_archive(const char *hex, const char *prefix)
+{
+	char *argv[] = { "zstd", NULL };
+	return write_compressed_tar_archive(hex, prefix, argv);
+}
+
 const struct cgit_snapshot_format cgit_snapshot_formats[] = {
 	/* .tar must remain the 0 index */
 	{ ".tar",	"application/x-tar",	write_tar_archive	},
@@ -98,6 +104,7 @@ const struct cgit_snapshot_format cgit_snapshot_formats[] = {
 	{ ".tar.bz2",	"application/x-bzip2",	write_tar_bzip2_archive	},
 	{ ".tar.lz",	"application/x-lzip",	write_tar_lzip_archive	},
 	{ ".tar.xz",	"application/x-xz",	write_tar_xz_archive	},
+	{ ".tar.zst",	"application/x-zstd",	write_tar_zstd_archive	},
 	{ ".zip",	"application/x-zip",	write_zip_archive	},
 	{ NULL }
 };

From list at eworm.de  Wed Feb 26 09:21:48 2020
From: list at eworm.de (Christian Hesse)
Date: Wed, 26 Feb 2020 09:21:48 +0100
Subject: [PATCH 2/2] tests: add tests for xz compressed snapshots
In-Reply-To: <20200226082148.42470-1-list@eworm.de>
References: <20200226082148.42470-1-list@eworm.de>
Message-ID: <20200226082148.42470-2-list@eworm.de>

From: Christian Hesse <mail at eworm.de>

Signed-off-by: Christian Hesse <mail at eworm.de>
---
 tests/setup.sh          |  2 +-
 tests/t0107-snapshot.sh | 42 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/tests/setup.sh b/tests/setup.sh
index e09f7c5..5879348 100755
--- a/tests/setup.sh
+++ b/tests/setup.sh
@@ -104,7 +104,7 @@ virtual-root=/
 cache-root=$PWD/cache
 
 cache-size=1021
-snapshots=tar.gz tar.bz tar.lz tar.zst zip
+snapshots=tar.gz tar.bz tar.lz tar.xz tar.zst zip
 enable-log-filecount=1
 enable-log-linecount=1
 summary-log=5
diff --git a/tests/t0107-snapshot.sh b/tests/t0107-snapshot.sh
index 95ad624..7e343d9 100755
--- a/tests/t0107-snapshot.sh
+++ b/tests/t0107-snapshot.sh
@@ -122,6 +122,48 @@ test_expect_success ZSTD 'verify untarred file-5' '
 	test_line_count = 1 master/file-5
 '
 
+if test -n "$(which xz 2>/dev/null)"; then
+	test_set_prereq XZ
+else
+	say 'Skipping XZ validation tests: xz not found'
+fi
+
+test_expect_success XZ 'get foo/snapshot/master.tar.xz' '
+	cgit_url "foo/snapshot/master.tar.xz" >tmp
+'
+
+test_expect_success XZ 'check html headers' '
+	head -n 1 tmp |
+	grep "Content-Type: application/x-xz" &&
+
+	head -n 2 tmp |
+	grep "Content-Disposition: inline; filename=.master.tar.xz."
+'
+
+test_expect_success XZ 'strip off the header lines' '
+	strip_headers <tmp >master.tar.xz
+'
+
+test_expect_success XZ 'verify xz format' '
+	xz --test master.tar.xz &&
+	cp master.tar.xz /tmp/.
+'
+
+test_expect_success XZ 'untar' '
+	rm -rf master &&
+	tar --xz -xf master.tar.xz
+'
+
+test_expect_success XZ 'count files' '
+	ls master/ >output &&
+	test_line_count = 5 output
+'
+
+test_expect_success XZ 'verify untarred file-5' '
+	grep "^5$" master/file-5 &&
+	test_line_count = 1 master/file-5
+'
+
 test_expect_success 'get foo/snapshot/master.zip' '
 	cgit_url "foo/snapshot/master.zip" >tmp
 '

From Jason at zx2c4.com  Wed Feb 26 10:16:59 2020
From: Jason at zx2c4.com (Jason A. Donenfeld)
Date: Wed, 26 Feb 2020 17:16:59 +0800
Subject: [PATCH 1/2] ui-snapshot: add support for zstd compression
In-Reply-To: <20200226082148.42470-1-list@eworm.de>
References: <20200226082148.42470-1-list@eworm.de>
Message-ID: <CAHmME9oSN9-85xMV0e2=oBY8cqe+eARYXLGfaMN+XbBYt3kmeg@mail.gmail.com>

Wow, thanks for doing this. I had just been discussing this with
Unit193, who submitted a similar but not as complete patch a few days
ago to me on IRC.

We had been discussing which compression level to pass to zstd or to
leave it as default. I think Unit193 had some thoughts on that, so
CC'ing him in case he wants to jump in.

Barring any change as a result of that, happy to merge this.

Thanks.

From Jason at zx2c4.com  Wed Feb 26 10:19:52 2020
From: Jason at zx2c4.com (Jason A. Donenfeld)
Date: Wed, 26 Feb 2020 17:19:52 +0800
Subject: [PATCH 2/2] tests: add tests for xz compressed snapshots
In-Reply-To: <20200226082148.42470-2-list@eworm.de>
References: <20200226082148.42470-1-list@eworm.de>
 <20200226082148.42470-2-list@eworm.de>
Message-ID: <CAHmME9ov04NN6fWgD7PWyyObhFd1VFxWeG9Evv5GE802_DkRYA@mail.gmail.com>

Looks good, queue it up, thanks.

From list at eworm.de  Wed Feb 26 11:18:47 2020
From: list at eworm.de (Christian Hesse)
Date: Wed, 26 Feb 2020 11:18:47 +0100
Subject: [PATCH 1/2] ui-snapshot: add support for zstd compression
In-Reply-To: <CAHmME9oSN9-85xMV0e2=oBY8cqe+eARYXLGfaMN+XbBYt3kmeg@mail.gmail.com>
References: <20200226082148.42470-1-list@eworm.de>
 <CAHmME9oSN9-85xMV0e2=oBY8cqe+eARYXLGfaMN+XbBYt3kmeg@mail.gmail.com>
Message-ID: <20200226111847.2fab512c@leda>

"Jason A. Donenfeld" <Jason at zx2c4.com> on Wed, 2020/02/26 17:16:
> We had been discussing which compression level to pass to zstd or to
> leave it as default. I think Unit193 had some thoughts on that, so
> CC'ing him in case he wants to jump in.

Thought about that myself after I sent the mail...

This is a trade-off... Do we prefer faster speed or better compression? We
can not have both, just either of both or a mix.
And do we want to go with multi-threaded compression?

The default compression level is 3. For our Arch packages we decided to go
with level 20... Well, the packages are compressed once and decompressed on a
magnitude of machines - so it makes sense there.

I would propose to take something in between... I think compression level 10
gives reasonable results. Any thoughts?

Some numbers:

% for I in $(seq 3 19); do zstd -$I < git-2.25.1.tar > git-2.25.1-$I.tar.zst;
done
level 3: 0,30s user 0,03s system 105% cpu 0,306 total
level 4: 0,30s user 0,03s system 107% cpu 0,307 total
level 5: 0,57s user 0,03s system 103% cpu 0,574 total
level 6: 0,72s user 0,04s system 103% cpu 0,739 total
level 7: 0,90s user 0,04s system 102% cpu 0,912 total
level 8: 1,13s user 0,03s system 102% cpu 1,134 total
level 9: 1,59s user 0,02s system 100% cpu 1,598 total
level 10: 1,98s user 0,04s system 100% cpu 2,002 total
level 11: 2,28s user 0,05s system 100% cpu 2,318 total
level 12: 3,50s user 0,05s system 100% cpu 3,536 total
level 13: 4,70s user 0,05s system 100% cpu 4,749 total
level 14: 6,52s user 0,06s system 99% cpu 6,603 total
level 15: 7,06s user 0,09s system 100% cpu 7,146 total
level 16: 9,35s user 0,10s system 99% cpu 9,456 total
level 17: 12,00s user 0,08s system 99% cpu 12,118 total
level 18: 14,26s user 0,08s system 99% cpu 14,390 total
level 19: 19,66s user 0,10s system 99% cpu 19,835 total
% for I in $(seq 3 19); do zstd -T0 -$I < git-2.25.1.tar >
git-2.25.1-$I-T0.tar.zst; done
level 3: 0,41s user 0,05s system 182% cpu 0,251 total
level 4: 0,52s user 0,05s system 200% cpu 0,285 total
level 5: 0,81s user 0,04s system 195% cpu 0,434 total 
level 6: 1,59s user 0,06s system 188% cpu 0,877 total
level 7: 1,25s user 0,04s system 189% cpu 0,681 total
level 8: 1,63s user 0,04s system 187% cpu 0,888 total
level 9: 2,12s user 0,05s system 187% cpu 1,156 total
level 10: 2,58s user 0,07s system 178% cpu 1,482 total
level 11: 2,85s user 0,07s system 176% cpu 1,650 total
level 12: 4,33s user 0,12s system 173% cpu 2,560 total
level 13: 5,50s user 0,07s system 188% cpu 2,948 total
level 14: 6,42s user 0,09s system 192% cpu 3,389 total
level 15: 8,21s user 0,13s system 185% cpu 4,492 total
level 16: 10,28s user 0,07s system 179% cpu 5,778 total
level 17: 12,08s user 0,10s system 117% cpu 10,411 total
level 18: 16,24s user 0,11s system 114% cpu 14,271 total
level 19: 24,78s user 0,21s system 125% cpu 19,843 total

% xz < git-2.25.1.tar > git-2.25.1.tar.xz
17,07s user 0,26s system 139% cpu 12,453 total
% time gzip < git-2.25.1.tar > git-2.25.1.tar.gz
2,16s user 0,04s system 361% cpu 0,607 total

 37M git-2.25.1.tar
8,7M git-2.25.1.tar.gz
5,9M git-2.25.1.tar.xz
8,2M git-2.25.1-3.tar.zst
8,1M git-2.25.1-4.tar.zst
7,9M git-2.25.1-5.tar.zst
7,6M git-2.25.1-6.tar.zst
7,3M git-2.25.1-7.tar.zst
7,1M git-2.25.1-8.tar.zst
7,0M git-2.25.1-9.tar.zst
6,8M git-2.25.1-10.tar.zst
6,8M git-2.25.1-11.tar.zst
6,7M git-2.25.1-12.tar.zst
6,5M git-2.25.1-13.tar.zst
6,4M git-2.25.1-14.tar.zst
6,4M git-2.25.1-15.tar.zst
6,1M git-2.25.1-16.tar.zst
6,0M git-2.25.1-17.tar.zst
5,9M git-2.25.1-18.tar.zst
5,9M git-2.25.1-19.tar.zst
-- 
main(a){char*c=/*    Schoene Gruesse                         */"B?IJj;MEH"
"CX:;",b;for(a/*    Best regards             my address:    */=0;b=c[a++];)
putchar(b-1/(/*    Chris            cc -ox -xc - && ./x    */b/42*2-3)*42);}
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.zx2c4.com/pipermail/cgit/attachments/20200226/3ad5fb8b/attachment.asc>

From list at eworm.de  Wed Feb 26 11:28:54 2020
From: list at eworm.de (Christian Hesse)
Date: Wed, 26 Feb 2020 11:28:54 +0100
Subject: [PATCH 1/2] ui-snapshot: add support for zstd compression
In-Reply-To: <20200226111847.2fab512c@leda>
References: <20200226082148.42470-1-list@eworm.de>
 <CAHmME9oSN9-85xMV0e2=oBY8cqe+eARYXLGfaMN+XbBYt3kmeg@mail.gmail.com>
 <20200226111847.2fab512c@leda>
Message-ID: <20200226112854.109e18d7@leda>

Christian Hesse <list at eworm.de> on Wed, 2020/02/26 11:18:
> % time gzip < git-2.25.1.tar > git-2.25.1.tar.gz
> 2,16s user 0,04s system 361% cpu 0,607 total

This was multi-threaded pigz... Plain gzip looks like this:

% /usr/bin/gzip < git-2.25.1.tar > git-2.25.1.tar.gz
1,39s user 0,01s system 98% cpu 1,425 total

-- 
main(a){char*c=/*    Schoene Gruesse                         */"B?IJj;MEH"
"CX:;",b;for(a/*    Best regards             my address:    */=0;b=c[a++];)
putchar(b-1/(/*    Chris            cc -ox -xc - && ./x    */b/42*2-3)*42);}
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.zx2c4.com/pipermail/cgit/attachments/20200226/b4467d49/attachment-0001.asc>

From actionmystique at gmail.com  Wed Feb 26 13:21:09 2020
From: actionmystique at gmail.com (jean-christophe manciot)
Date: Wed, 26 Feb 2020 13:21:09 +0100
Subject: [PATCH v2] ui-commit: show subject in page title
In-Reply-To: <20200223185227.89151-1-june@causal.agency>
References: <20200223185227.89151-1-june@causal.agency>
Message-ID: <CAKcFC3aJ1m5uYUTy6k3APd-JBgk3JsRqECNpNDB8XknDEWWRzQ@mail.gmail.com>

I have implemented this patch on my website (https://git.sdxlive.com/)
over the latest commit of master branch (1.2.2-2-gfde897b) & restarted
uwsgi.
I use git 1:2.25.1-1~ppa0~ubuntu20.04.1 although I don't think this
could interfere.

In /etc/cgitrc, the following relevant variables are set:
- root-title=...
- root-desc=...
In each repo cgitrc, the following relevant variable is set:
- name=... (<repository name>)

However, unless I'm missing something, I don't see any difference in
any page title: they all keep the format "index :<repository name>".

Is there a special variable which needs to be set?
-- 
Jean-Christophe

From list at eworm.de  Wed Feb 26 22:24:00 2020
From: list at eworm.de (Christian Hesse)
Date: Wed, 26 Feb 2020 22:24:00 +0100
Subject: [PATCH v2 1/2] ui-snapshot: add support for zstd compression
In-Reply-To: <20200226082148.42470-1-list@eworm.de>
References: <20200226082148.42470-1-list@eworm.de>
Message-ID: <20200226212400.25017-1-list@eworm.de>

From: Christian Hesse <mail at eworm.de>

This patch adds support for zstd [0] compressed snapshots (*.tar.zst).
We enable multiple working threads (-T0) and compression level 10 (-10)
for a trade-off between speed and file size.

[0] https://www.zstd.net/

Signed-off-by: Christian Hesse <mail at eworm.de>
---
 cgitrc.5.txt            |  5 +++--
 tests/setup.sh          |  2 +-
 tests/t0107-snapshot.sh | 42 +++++++++++++++++++++++++++++++++++++++++
 ui-snapshot.c           |  7 +++++++
 4 files changed, 53 insertions(+), 3 deletions(-)

diff --git a/cgitrc.5.txt b/cgitrc.5.txt
index 4ad3e64..b0ec698 100644
--- a/cgitrc.5.txt
+++ b/cgitrc.5.txt
@@ -407,8 +407,9 @@ side-by-side-diffs::
 snapshots::
 	Text which specifies the default set of snapshot formats that cgit
 	generates links for. The value is a space-separated list of zero or
-	more of the values "tar", "tar.gz", "tar.bz2", "tar.xz", "tar.lz" and
-	"zip". The special value "all" enables all snapshot formats.
+	more of the values "tar", "tar.gz", "tar.bz2", "tar.lz", "tar.xz",
+	"tar.zst" and "zip". The special value "all" enables all snapshot
+	formats.
 	Default value: none.
 
 source-filter::
diff --git a/tests/setup.sh b/tests/setup.sh
index 69e47e6..e09f7c5 100755
--- a/tests/setup.sh
+++ b/tests/setup.sh
@@ -104,7 +104,7 @@ virtual-root=/
 cache-root=$PWD/cache
 
 cache-size=1021
-snapshots=tar.gz tar.bz tar.lz zip
+snapshots=tar.gz tar.bz tar.lz tar.zst zip
 enable-log-filecount=1
 enable-log-linecount=1
 summary-log=5
diff --git a/tests/t0107-snapshot.sh b/tests/t0107-snapshot.sh
index a845ad9..95ad624 100755
--- a/tests/t0107-snapshot.sh
+++ b/tests/t0107-snapshot.sh
@@ -80,6 +80,48 @@ test_expect_success LZIP 'verify untarred file-5' '
 	test_line_count = 1 master/file-5
 '
 
+if test -n "$(which zstd 2>/dev/null)"; then
+	test_set_prereq ZSTD
+else
+	say 'Skipping ZSTD validation tests: zstd not found'
+fi
+
+test_expect_success ZSTD 'get foo/snapshot/master.tar.zst' '
+	cgit_url "foo/snapshot/master.tar.zst" >tmp
+'
+
+test_expect_success ZSTD 'check html headers' '
+	head -n 1 tmp |
+	grep "Content-Type: application/x-zstd" &&
+
+	head -n 2 tmp |
+	grep "Content-Disposition: inline; filename=.master.tar.zst."
+'
+
+test_expect_success ZSTD 'strip off the header lines' '
+	strip_headers <tmp >master.tar.zst
+'
+
+test_expect_success ZSTD 'verify zstd format' '
+	zstd --test master.tar.zst &&
+	cp master.tar.zst /tmp/.
+'
+
+test_expect_success ZSTD 'untar' '
+	rm -rf master &&
+	tar --zstd -xf master.tar.zst
+'
+
+test_expect_success ZSTD 'count files' '
+	ls master/ >output &&
+	test_line_count = 5 output
+'
+
+test_expect_success ZSTD 'verify untarred file-5' '
+	grep "^5$" master/file-5 &&
+	test_line_count = 1 master/file-5
+'
+
 test_expect_success 'get foo/snapshot/master.zip' '
 	cgit_url "foo/snapshot/master.zip" >tmp
 '
diff --git a/ui-snapshot.c b/ui-snapshot.c
index 92cde42..fddf989 100644
--- a/ui-snapshot.c
+++ b/ui-snapshot.c
@@ -91,6 +91,12 @@ static int write_tar_xz_archive(const char *hex, const char *prefix)
 	return write_compressed_tar_archive(hex, prefix, argv);
 }
 
+static int write_tar_zstd_archive(const char *hex, const char *prefix)
+{
+	char *argv[] = { "zstd", "-T0", "-10", NULL };
+	return write_compressed_tar_archive(hex, prefix, argv);
+}
+
 const struct cgit_snapshot_format cgit_snapshot_formats[] = {
 	/* .tar must remain the 0 index */
 	{ ".tar",	"application/x-tar",	write_tar_archive	},
@@ -98,6 +104,7 @@ const struct cgit_snapshot_format cgit_snapshot_formats[] = {
 	{ ".tar.bz2",	"application/x-bzip2",	write_tar_bzip2_archive	},
 	{ ".tar.lz",	"application/x-lzip",	write_tar_lzip_archive	},
 	{ ".tar.xz",	"application/x-xz",	write_tar_xz_archive	},
+	{ ".tar.zst",	"application/x-zstd",	write_tar_zstd_archive	},
 	{ ".zip",	"application/x-zip",	write_zip_archive	},
 	{ NULL }
 };

From me at fccagou.fr  Wed Feb 26 23:39:43 2020
From: me at fccagou.fr (Francois)
Date: Wed, 26 Feb 2020 23:39:43 +0100
Subject: cgit and push method
Message-ID: <20200226223943.GB272214@l1nux>

Hi everybody

First of all, congratulation for this software that gives an easy way to
access repos. I'm using around 5 hours ago and I have quickly found all
the customs options I was espected     ... \o/ ....


Cgit is configured to allow cloning repos. I did not find information
for "push" management so I've tried a push but ... got a DAV lock error.

I am surprised at this behavior because it works if I use git-http-backend.

Looking the network traffic with tcpdump shows me that git does a PROPFIND
resquest when calling to cgit and only GET end POST when calling to
git-http-backend.

In the case of cgit and PROPFIND, cgit returns the html code of the
repo main page instead of the expected xml.


So I have some questions:

- does cgit allow push ?
- Is there a "best practice" to manage repos "backstage": create,
  delete, give read/write acess


Thanks a lot in advance.

-- Fran?ois

From list at eworm.de  Wed Feb 26 23:38:11 2020
From: list at eworm.de (Christian Hesse)
Date: Wed, 26 Feb 2020 23:38:11 +0100
Subject: [PATCH 1/2] ui-snapshot: add support for zstd compression
In-Reply-To: <alpine.DEB.2.22.394.2002261715550.3793@Zeta>
References: <20200226082148.42470-1-list@eworm.de>
 <CAHmME9oSN9-85xMV0e2=oBY8cqe+eARYXLGfaMN+XbBYt3kmeg@mail.gmail.com>
 <alpine.DEB.2.22.394.2002261715550.3793@Zeta>
Message-ID: <20200226233811.0ea5d161@leda>

Unit 193 <unit193 at ubuntu.com> on Wed, 2020/02/26 17:21:
> > Wow, thanks for doing this. I had just been discussing this with
> > Unit193, who submitted a similar but not as complete patch a few days
> > ago to me on IRC.  
> 
> Indeed!  Thanks for looking into this!

I just implemented this after the lzip patch was merged... Did not even know
you discussed this. :-p

> > We had been discussing which compression level to pass to zstd or to
> > leave it as default. I think Unit193 had some thoughts on that, so
> > CC'ing him in case he wants to jump in.  
> 
> Yes.  My initial version did bump the compression level as well, but in the
> end I decided against that in order to give the user the option to control
> that via ZSTD_CLEVEL.

Good idea... So we could go with `xz -T0` to enable multi-threading (as this
can not be controlled via environment variable).
Then we document in man page how to influence compression level via
environment variable.

We have to set the environment variable from web server, no?

Do we also want to document GZIP, XZ_DEFAULTS & friends?
-- 
main(a){char*c=/*    Schoene Gruesse                         */"B?IJj;MEH"
"CX:;",b;for(a/*    Best regards             my address:    */=0;b=c[a++];)
putchar(b-1/(/*    Chris            cc -ox -xc - && ./x    */b/42*2-3)*42);}
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.zx2c4.com/pipermail/cgit/attachments/20200226/dbd549dd/attachment.asc>

From june at causal.agency  Thu Feb 27 01:50:37 2020
From: june at causal.agency (June Bug)
Date: Wed, 26 Feb 2020 19:50:37 -0500
Subject: [PATCH v2] ui-commit: show subject in page title
In-Reply-To: <CAKcFC3aJ1m5uYUTy6k3APd-JBgk3JsRqECNpNDB8XknDEWWRzQ@mail.gmail.com>
References: <20200223185227.89151-1-june@causal.agency>
 <CAKcFC3aJ1m5uYUTy6k3APd-JBgk3JsRqECNpNDB8XknDEWWRzQ@mail.gmail.com>
Message-ID: <84FCE289-A4FB-43A1-8D96-31BF09262C20@causal.agency>


> On Feb 26, 2020, at 07:21, jean-christophe manciot <actionmystique at gmail.com> wrote:
> 
> I have implemented this patch on my website (https://git.sdxlive.com/)
> over the latest commit of master branch (1.2.2-2-gfde897b) & restarted
> uwsgi.

> However, unless I'm missing something, I don't see any difference in
> any page title: they all keep the format "index :<repository name>?.

The title of this page, for example:
<https://git.sdxlive.com/DR/commit/?id=7775e84b3c0debcd68ab40ed4add13db2bbdfee3>
begins with the subject line of the commit,
"Debian/logs/packages.Debian.log".

From actionmystique at gmail.com  Thu Feb 27 11:07:34 2020
From: actionmystique at gmail.com (jean-christophe manciot)
Date: Thu, 27 Feb 2020 11:07:34 +0100
Subject: [PATCH v2] ui-commit: show subject in page title
In-Reply-To: <84FCE289-A4FB-43A1-8D96-31BF09262C20@causal.agency>
References: <20200223185227.89151-1-june@causal.agency>
 <CAKcFC3aJ1m5uYUTy6k3APd-JBgk3JsRqECNpNDB8XknDEWWRzQ@mail.gmail.com>
 <84FCE289-A4FB-43A1-8D96-31BF09262C20@causal.agency>
Message-ID: <CAKcFC3au8J45tTg44OX3Ect8Fno7wVNd=_p661rJxaH6HQZnfw@mail.gmail.com>

I can see "Debian/logs/packages.Debian.log" in the middle of the page
(as without the patch), but "index : Debian Bullseye Repository" on
the right side of the icon.
Either we have a different definition of "page title", or something is
different in your environment that must explain why you can see a
different page title.
Maybe a different browser, browser version, OS, ...

I have attached a screenshot of the page browsed with chrome
80.0.3987.122 (Official Build) (64-bit) on Ubuntu. focal
-- 
Jean-Christophe
-------------- next part --------------
A non-text attachment was scrubbed...
Name: show subject in page title.png
Type: image/png
Size: 281246 bytes
Desc: not available
URL: <http://lists.zx2c4.com/pipermail/cgit/attachments/20200227/1b92ff51/attachment-0001.png>

From june at causal.agency  Thu Feb 27 11:13:16 2020
From: june at causal.agency (June Bug)
Date: Thu, 27 Feb 2020 05:13:16 -0500
Subject: [PATCH v2] ui-commit: show subject in page title
In-Reply-To: <CAKcFC3au8J45tTg44OX3Ect8Fno7wVNd=_p661rJxaH6HQZnfw@mail.gmail.com>
References: <20200223185227.89151-1-june@causal.agency>
 <CAKcFC3aJ1m5uYUTy6k3APd-JBgk3JsRqECNpNDB8XknDEWWRzQ@mail.gmail.com>
 <84FCE289-A4FB-43A1-8D96-31BF09262C20@causal.agency>
 <CAKcFC3au8J45tTg44OX3Ect8Fno7wVNd=_p661rJxaH6HQZnfw@mail.gmail.com>
Message-ID: <7AE2AB6F-5DFB-4387-84B3-55CA4D36E1CF@causal.agency>


> On Feb 27, 2020, at 05:07, jean-christophe manciot <actionmystique at gmail.com> wrote:
> 
> I can see "Debian/logs/packages.Debian.log" in the middle of the page
> (as without the patch), but "index : Debian Bullseye Repository" on
> the right side of the icon.
> Either we have a different definition of "page title", or something is
> different in your environment that must explain why you can see a
> different page title.

Yes, I mean the HTML <title> element displayed in the browser tab
or window title.