From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 1156D1F884 for ; Sat, 1 Feb 2020 09:12:16 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 3/4] solver: join multiple URLs with "||" Date: Sat, 1 Feb 2020 09:12:14 +0000 Message-Id: <20200201091215.30024-4-e@yhbt.net> In-Reply-To: <20200201091215.30024-1-e@yhbt.net> References: <20200201091215.30024-1-e@yhbt.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: 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: