user/dev discussion of public-inbox itself
 help / color / Atom feed
From: Eric Wong <e@80x24.org>
To: Konstantin Ryabitsev <konstantin@linuxfoundation.org>
Cc: meta@public-inbox.org
Subject: [PATCH] manifest: v2 epoch descriptions based on inbox->description
Date: Sun, 23 Jun 2019 17:42:05 +0000
Message-ID: <20190623174205.vpwuofotloajz7ua@dcvr> (raw)
In-Reply-To: <20190620190017.GA27175@chatter.i7.local>

The default $GIT_DIR/description (provided by git.git templates)
isn't very useful for v2 epochs, so use the inbox description
and suffix it with the epoch number if it's otherwise unnamed.

Requested-by: Konstantin Ryabitsev <konstantin@linuxfoundation.org>
  https://public-inbox.org/meta/20190620190017.GA27175@chatter.i7.local/
---
 lib/PublicInbox/WwwListing.pm | 14 +++++++++++---
 t/www_listing.t               |  7 ++++++-
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/lib/PublicInbox/WwwListing.pm b/lib/PublicInbox/WwwListing.pm
index e052bbff..1d4029f0 100644
--- a/lib/PublicInbox/WwwListing.pm
+++ b/lib/PublicInbox/WwwListing.pm
@@ -138,8 +138,8 @@ sub fingerprint ($) {
 	$dig->hexdigest;
 }
 
-sub manifest_add ($$;$) {
-	my ($manifest, $ibx, $epoch) = @_;
+sub manifest_add ($$;$$) {
+	my ($manifest, $ibx, $epoch, $default_desc) = @_;
 	my $url_path = "/$ibx->{name}";
 	my $git_dir = $ibx->{mainrepo};
 	if (defined $epoch) {
@@ -155,6 +155,13 @@ sub manifest_add ($$;$) {
 	$owner = undef if $owner eq '';
 	$desc = 'Unnamed repository' if $desc eq '';
 
+	# templates/hooks--update.sample and git-multimail in git.git
+	# only match "Unnamed repository", not the full contents of
+	# templates/this--description in git.git
+	if ($desc =~ /\AUnnamed repository/) {
+		$desc = "$default_desc [epoch $epoch]" if defined($epoch);
+	}
+
 	my $reference;
 	chomp(my $alt = try_cat("$git_dir/objects/info/alternates"));
 	if ($alt) {
@@ -191,8 +198,9 @@ sub js ($$) {
 	my $manifest = { -abs2urlpath => {}, -mtime => 0 };
 	for my $ibx (@$list) {
 		if (defined(my $max = $ibx->max_git_epoch)) {
+			my $desc = $ibx->description;
 			for my $epoch (0..$max) {
-				manifest_add($manifest, $ibx, $epoch);
+				manifest_add($manifest, $ibx, $epoch, $desc);
 			}
 		} else {
 			manifest_add($manifest, $ibx);
diff --git a/t/www_listing.t b/t/www_listing.t
index d82a4a4a..e5b797db 100644
--- a/t/www_listing.t
+++ b/t/www_listing.t
@@ -55,7 +55,12 @@ sub tiny_test {
 		$res->{headers}->{'last-modified'},
 		'modified field and Last-Modified header match');
 
-	ok($manifest->{'/v2/git/0.git'}, 'v2 epoch appeared');
+	ok(my $v2epoch0 = $manifest->{'/v2/git/0.git'}, 'v2 epoch 0 appeared');
+	like($v2epoch0->{description}, qr/ \[epoch 0\]\z/,
+		'epoch 0 in description');
+	ok(my $v2epoch1 = $manifest->{'/v2/git/1.git'}, 'v2 epoch 1 appeared');
+	like($v2epoch1->{description}, qr/ \[epoch 1\]\z/,
+		'epoch 1 in description');
 }
 
 my $pid;
-- 
EW

      parent reply index

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-06-20 19:00 Setting descriptions in manifest.js Konstantin Ryabitsev
2019-06-21  0:07 ` Eric Wong
2019-06-23 17:42 ` Eric Wong [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://public-inbox.org/README

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190623174205.vpwuofotloajz7ua@dcvr \
    --to=e@80x24.org \
    --cc=konstantin@linuxfoundation.org \
    --cc=meta@public-inbox.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

user/dev discussion of public-inbox itself

Archives are clonable:
	git clone --mirror https://public-inbox.org/meta
	git clone --mirror http://czquwvybam4bgbro.onion/meta
	git clone --mirror http://hjrcffqmbrq6wope.onion/meta
	git clone --mirror http://ou63pmih66umazou.onion/meta

Example config snippet for mirrors

Newsgroups are available over NNTP:
	nntp://news.public-inbox.org/inbox.comp.mail.public-inbox.meta
	nntp://ou63pmih66umazou.onion/inbox.comp.mail.public-inbox.meta
	nntp://czquwvybam4bgbro.onion/inbox.comp.mail.public-inbox.meta
	nntp://hjrcffqmbrq6wope.onion/inbox.comp.mail.public-inbox.meta
	nntp://news.gmane.io/gmane.mail.public-inbox.general

 note: .onion URLs require Tor: https://www.torproject.org/

AGPL code for this site: git clone https://public-inbox.org/public-inbox.git