),
+ $l->to_html($cur), '';
} elsif ($diff) {
flush_diff($ctx, \$cur);
- } else {
- # regular lines, OK
- $$rv .= $l->to_html($cur);
+ } else { # regular lines, OK
+ print $zfh $l->to_html($cur);
}
undef $cur; # free memory
}
@@ -646,7 +623,8 @@ sub _msg_page_prepare {
return;
}
$ctx->{-html_tip} =
-"WARNING: multiple messages have this Message-ID\n
";
+qq[WARNING: multiple messages have this Message-ID (diff)
];
} else {
$ctx->{first_hdr} = $eml->header_obj;
$ctx->{chash} = content_hash($eml) if $ctx->{smsg}; # reused MID
@@ -691,10 +669,10 @@ sub _msg_page_prepare {
$hbuf .= qq[Message-ID: <$x> (raw)\n];
}
if (!$nr) { # first (and only) message, common case
- $ctx->zmore($ctx->html_top, $hbuf);
+ print { $ctx->zfh } $ctx->html_top, $hbuf;
} else {
delete $ctx->{-title_html};
- $ctx->zmore($ctx->{-html_tip}, $hbuf);
+ print { $ctx->zfh } $ctx->{-html_tip}, $hbuf;
}
$ctx->{-linkify} //= PublicInbox::Linkify->new;
$hbuf = '';
@@ -705,7 +683,7 @@ sub _msg_page_prepare {
$hbuf .= "$h: $_\n" for ($eml->header_raw($h));
}
$ctx->{-linkify}->linkify_mids('..', \$hbuf, 1); # escapes HTML
- $ctx->zmore($hbuf);
+ print { $ctx->{zfh} } $hbuf;
$hbuf = '';
}
my @irt = $eml->header_raw('In-Reply-To');
@@ -723,8 +701,7 @@ sub _msg_page_prepare {
$hbuf .= 'References: <'.join(">\n\t<", @$refs).">\n" if @$refs;
}
$ctx->{-linkify}->linkify_mids('..', \$hbuf); # escapes HTML
- $ctx->zmore($hbuf .= "\n");
- ${$ctx->{obuf}} = ''; # TODO remove
+ say { $ctx->{zfh} } $hbuf;
1;
}
@@ -778,7 +755,7 @@ sub thread_skel ($$$) {
sub html_footer {
my ($ctx, $hdr) = @_;
my $upfx = '../';
- my ($related, $skel);
+ my (@related, $skel);
my $foot = '';
my $qry = delete $ctx->{-qry};
if ($qry && $ctx->{ibx}->isrch) {
@@ -793,7 +770,7 @@ sub html_footer {
$q = wrap('', '', $q);
my $rows = ($q =~ tr/\n/\n/) + 1;
$q = ascii_html($q);
- $related = <find likely ancestor, descendant, or conflicting patches for {ibx}->over) {
my $t = ts2str($ctx->{-t_max});
my $t_fmt = fmt_ts($ctx->{-t_max});
- my $fallback = $related ? "\t" : "\t";
+ my $fallback = @related ? "\t" : "\t";
$skel = <~$t_fmt UTC|{next_msg}) {
$n = mid_href($n);
- $next = "next";
+ $next = qq(next);
}
my $par = $ctx->{parent_msg};
my $u = $par ? $upfx.mid_href($par).'/' : undef;
if (my $p = $ctx->{prev_msg}) {
$prev = mid_href($p);
if ($p && $par && $p eq $par) {
- $prev = "prev parent';
$parent = '';
} else {
- $prev = "prev';
- $parent = " parent" if $u;
+ $parent = qq( parent) if $u;
}
} elsif ($u) { # unlikely
- $parent = " parent";
+ $parent = qq( parent);
}
$foot .= "$next $prev$parent ";
} else { # unindexed inboxes w/o over
$skel = qq( latest);
}
- $foot .= qq(reply);
# $skel may be big for big threads, don't append it to $foot
- $skel .= '' . ($related // '');
- $ctx->zmore($foot, $skel .= msg_reply($ctx, $hdr)); # flushes obuf
+ print { $ctx->zfh } $foot, qq(reply),
+ $skel, '', @related,
+ msg_reply($ctx, $hdr);
}
sub ghost_parent {
@@ -1042,6 +1019,8 @@ sub _skel_ghost {
1;
}
+# note: we favor Date: here because git-send-email increments it
+# to preserve [PATCH $N/$M] ordering in series (it can't control Received:)
sub sort_ds {
@{$_[0]} = sort {
(eval { $a->topmost->{ds} } || 0) <=>
@@ -1063,9 +1042,10 @@ sub acc_topic { # walk_thread callback
if ($has_blob) {
my $subj = subject_normalized($smsg->{subject});
$subj = '(no subject)' if $subj eq '';
+ my $ts = $smsg->{ts};
my $ds = $smsg->{ds};
if ($level == 0) { # new, top-level topic
- my $topic = [ $ds, 1, { $subj => $mid }, $subj ];
+ my $topic = [ $ts, $ds, 1, { $subj => $mid }, $subj ];
$ctx->{-cur_topic} = $topic;
push @{$ctx->{order}}, $topic;
return 1;
@@ -1073,10 +1053,11 @@ sub acc_topic { # walk_thread callback
# continue existing topic
my $topic = $ctx->{-cur_topic}; # should never be undef
- $topic->[0] = $ds if $ds > $topic->[0];
- $topic->[1]++; # bump N+ message counter
- my $seen = $topic->[2];
- if (scalar(@$topic) == 3) { # parent was a ghost
+ $topic->[0] = $ts if $ts > $topic->[0];
+ $topic->[1] = $ds if $ds > $topic->[1];
+ $topic->[2]++; # bump N+ message counter
+ my $seen = $topic->[3];
+ if (scalar(@$topic) == 4) { # parent was a ghost
push @$topic, $subj;
} elsif (!defined($seen->{$subj})) {
push @$topic, $level, $subj; # @extra messages
@@ -1084,7 +1065,7 @@ sub acc_topic { # walk_thread callback
$seen->{$subj} = $mid; # latest for subject
} else { # ghost message
return 1 if $level != 0; # ignore child ghosts
- my $topic = $ctx->{-cur_topic} = [ -666, 0, {} ];
+ my $topic = $ctx->{-cur_topic} = [ -666, -666, 0, {} ];
push @{$ctx->{order}}, $topic;
}
1;
@@ -1105,7 +1086,7 @@ sub dump_topics {
}
# sort by recency, this allows new posts to "bump" old topics...
foreach my $topic (sort { $b->[0] <=> $a->[0] } @$order) {
- my ($ds, $n, $seen, $top_subj, @extra) = @$topic;
+ my ($ts, $ds, $n, $seen, $top_subj, @extra) = @$topic;
@$topic = ();
next unless defined $top_subj; # ghost topic
my $mid = delete $seen->{$top_subj};
@@ -1249,4 +1230,30 @@ sub ghost_index_entry {
. '' . $end;
}
+# /$INBOX/$MSGID/d/ endpoint
+sub diff_msg {
+ my ($ctx) = @_;
+ require PublicInbox::MailDiff;
+ my $ibx = $ctx->{ibx};
+ my $over = $ibx->over or return no_over_html($ctx);
+ my ($id, $prev);
+ my $md = bless { ctx => $ctx }, 'PublicInbox::MailDiff';
+ my $next_arg = $md->{next_arg} = [ $ctx->{mid}, \$id, \$prev ];
+ my $smsg = $md->{smsg} = $over->next_by_mid(@$next_arg) or
+ return; # undef == 404
+ $ctx->{-t_max} = $smsg->{ts};
+ $ctx->{-upfx} = '../../';
+ $ctx->{-apfx} = '//'; # fail on to_attr()
+ $ctx->{-linkify} = PublicInbox::Linkify->new;
+ my $mid = ascii_html($smsg->{mid});
+ $ctx->{-title_html} = "diff for duplicates of <$mid>";
+ PublicInbox::WwwStream::html_init($ctx);
+ print { $ctx->{zfh} } 'diff for duplicates of <',
+ $mid, ">\n\n";
+ sub {
+ $ctx->attach($_[0]->([200, delete $ctx->{-res_hdr}]));
+ $md->begin_mail_diff;
+ };
+}
+
1;