* [PATCH 05/11] solvergit: do not solve blobs twice
2019-01-30 4:44 5% [PATCH 00/11] viewvcs: more fixes Eric Wong
@ 2019-01-30 4:44 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2019-01-30 4:44 UTC (permalink / raw)
To: meta
In some cases, a file may ping-pong between blob IDs in the same
message when reverts occur. So break out of this early.
This doesn't account for different abbreviations, but the
limited variations of abbreviations should alleviate the
problem.
---
lib/PublicInbox/SolverGit.pm | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/lib/PublicInbox/SolverGit.pm b/lib/PublicInbox/SolverGit.pm
index 39acbe4..24d9da2 100644
--- a/lib/PublicInbox/SolverGit.pm
+++ b/lib/PublicInbox/SolverGit.pm
@@ -439,6 +439,9 @@ sub resolve_patch ($$) {
# see if we can find the blob in an existing git repo:
my $cur_want = $want->{oid_b};
+ if ($self->{seen_oid}->{$cur_want}++) {
+ die "Loop detected solving $cur_want\n";
+ }
if (my $existing = solve_existing($self, $want)) {
dbg($self, "found $cur_want in " .
join("\n", $existing->[0]->pub_urls));
@@ -504,6 +507,7 @@ sub solve ($$$$$) {
$self->{oid_want} = $oid_want;
$self->{out} = $out;
+ $self->{seen_oid} = {};
$self->{tot} = 0;
$self->{psgi_env} = $env;
$self->{todo} = [ { %$hints, oid_b => $oid_want } ];
--
EW
^ permalink raw reply related [relevance 7%]
* [PATCH 00/11] viewvcs: more fixes
@ 2019-01-30 4:44 5% Eric Wong
2019-01-30 4:44 7% ` [PATCH 05/11] solvergit: do not solve blobs twice Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2019-01-30 4:44 UTC (permalink / raw)
To: meta
Been hammering away with check-www-inbox on git@vger without problems,
so I'll probably deploy this to the non-onion site soon...
And maybe I'll set the non-.onion to use 216dark, too...
Eric Wong (11):
hval: add src_escape for highlight post-processing
t/check-www-inbox: replace IPC::Run with PublicInbox::Spawn
t/check-www-inbox: don't follow mboxes
t/check-www-inbox: disable history
solvergit: do not solve blobs twice
viewvcs: avoid segfault with highlight.pm at shutdown
css/216dark: add comments and tweak highlight colors
solvergit: do not show full path names to "git apply"
solvergit: avoid "Wide character" warnings
solvergit: extract mode from diff headers properly
solvergit: deal with alternative diff prefixes
contrib/css/216dark.css | 14 ++++++------
lib/PublicInbox/Hval.pm | 8 ++++++-
lib/PublicInbox/SolverGit.pm | 18 ++++++++++-----
lib/PublicInbox/UserContent.pm | 14 ++++++------
lib/PublicInbox/ViewVCS.pm | 9 +++++++-
t/check-www-inbox.perl | 42 +++++++++++++++++++++++++++++-----
t/hval.t | 3 +++
7 files changed, 80 insertions(+), 28 deletions(-)
--
EW
^ permalink raw reply [relevance 5%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2019-01-30 4:44 5% [PATCH 00/11] viewvcs: more fixes Eric Wong
2019-01-30 4:44 7% ` [PATCH 05/11] solvergit: do not solve blobs twice Eric Wong
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).