user/dev discussion of public-inbox itself
 help / color / mirror / code / Atom feed
From: Eric Wong <e@yhbt.net>
To: meta@public-inbox.org
Subject: [PATCH 3/4] solver: join multiple URLs with "||"
Date: Sat,  1 Feb 2020 09:12:14 +0000	[thread overview]
Message-ID: <20200201091215.30024-4-e@yhbt.net> (raw)
In-Reply-To: <20200201091215.30024-1-e@yhbt.net>

It seems to make sense to the target audience that any of
the URLs displayed could work.
---
 lib/PublicInbox/SolverGit.pm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/PublicInbox/SolverGit.pm b/lib/PublicInbox/SolverGit.pm
index 06b4cdc4..bf806f65 100644
--- a/lib/PublicInbox/SolverGit.pm
+++ b/lib/PublicInbox/SolverGit.pm
@@ -530,7 +530,8 @@ sub resolve_patch ($$) {
 	if (my $existing = solve_existing($self, $want)) {
 		my ($found_git, undef, $type, undef) = @$existing;
 		dbg($self, "found $cur_want in " .
-			join("\n", $found_git->pub_urls($self->{psgi_env})));
+			join(" ||\n\t",
+				$found_git->pub_urls($self->{psgi_env})));
 
 		if ($cur_want eq $self->{oid_want} || $type ne 'blob') {
 			eval { done($self, $existing) };
@@ -548,7 +549,7 @@ sub resolve_patch ($$) {
 
 		unshift @{$self->{patches}}, @$diffs;
 		dbg($self, "found $cur_want in ".
-			join("\n\t", map { di_url($self, $_) } @$diffs));
+			join(" ||\n\t", map { di_url($self, $_) } @$diffs));
 
 		# good, we can find a path to the oid we $want, now
 		# lets see if we need to apply more patches:

  parent reply	other threads:[~2020-02-01  9:12 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-01  9:12 [PATCH 0/4] flesh out multi-URL support Eric Wong
2020-02-01  9:12 ` [PATCH 1/4] wwwtext: show multiple infourl values properly Eric Wong
2020-02-01  9:12 ` [PATCH 2/4] wwwtext: give "url" examples in sample config Eric Wong
2020-02-01  9:12 ` Eric Wong [this message]
2020-02-01  9:12 ` [PATCH 4/4] config: assume multiple cgit URLs, too Eric Wong

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=20200201091215.30024-4-e@yhbt.net \
    --to=e@yhbt.net \
    --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
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/public-inbox.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).