-sub flush_diff ($$$$) {
- my ($dst, $spfx, $linkify, $diff) = @_;
- my $state = DSTATE_INIT;
- my $dctx = { Q => '' }; # {}, keys: oid_a, oid_b, path_a, path_b
-
- foreach my $s (@$diff) {
- if ($s =~ /^ /) {
- if ($state == DSTATE_HUNK || $state == DSTATE_ADD ||
- $state == DSTATE_DEL || $state == DSTATE_HEAD) {
- $$dst .= "</span><span\nclass=ctx>";
- $state = DSTATE_CTX;
- }
- $$dst .= to_html($linkify, $s);
- } elsif ($s =~ /^-- $/) { # email signature begins
- if ($state != DSTATE_INIT) {
- $state = DSTATE_INIT;
- $$dst .= '</span>';
- }
- $$dst .= $s;
- } elsif ($s =~ m!^diff --git ($PATH_A) ($PATH_B)$!) {
- if ($state != DSTATE_HEAD) {
- my ($pa, $pb) = ($1, $2);
- $$dst .= '</span>' if $state != DSTATE_INIT;
- $$dst .= "<span\nclass=head>";
- $state = DSTATE_HEAD;
- $pa = (split('/', git_unquote($pa), 2))[1];
- $pb = (split('/', git_unquote($pb), 2))[1];
- $dctx = {
- Q => "?b=".uri_escape_utf8($pb, UNSAFE),
- };
- if ($pa ne $pb) {
- $dctx->{Q} .=
- "&a=".uri_escape_utf8($pa, UNSAFE);
+# returns true if diffstat anchor written, false otherwise
+sub anchor0 ($$$$) {
+ my ($dst, $ctx, $fn, $rest) = @_;
+
+ my $orig = $fn;
+
+ # normal git diffstat output is impossible to parse reliably
+ # without --numstat, and that isn't the default for format-patch.
+ # So only do best-effort handling of renames for common cases;
+ # which works well in practice. If projects put "=>", or trailing
+ # spaces in filenames, oh well :P
+ $fn =~ s/$DIFFSTAT_COMMENT//;
+ $fn =~ s/{(?:.+) => (.+)}/$1/ or $fn =~ s/.* => (.+)/$1/;
+ $fn = git_unquote($fn);
+
+ # long filenames will require us to check in anchor1()
+ push(@{$ctx->{-long_path}}, $fn) if $fn =~ s!\A\.\.\./?!!;
+
+ if (my $attr = to_attr($ctx->{-apfx}.$fn)) {
+ $ctx->{-anchors}->{$attr} = 1;
+ my $spaces = ($orig =~ s/( +)\z//) ? $1 : '';
+ $$dst .= " <a\nid=i$attr\nhref=#$attr>" .
+ ascii_html($orig) . '</a>' . $spaces .
+ $ctx->{-linkify}->to_html($rest);
+ return 1;
+ }
+ undef;
+}
+
+# returns "diff --git" anchor destination, undef otherwise
+sub anchor1 ($$) {
+ my ($ctx, $pb) = @_;
+ my $attr = to_attr($ctx->{-apfx}.$pb) or return;
+
+ my $ok = delete $ctx->{-anchors}->{$attr};
+
+ # unlikely, check the end of long path names we captured,
+ # assume diffstat and diff output follow the same order,
+ # and ignore different ordering (could be malicious input)
+ unless ($ok) {
+ my $fn = shift(@{$ctx->{-long_path}}) or return;
+ $pb =~ /\Q$fn\E\z/s or return;
+ $attr = to_attr($ctx->{-apfx}.$fn) or return;
+ $ok = delete $ctx->{-anchors}->{$attr} or return;
+ }
+ $ok ? "<a\nhref=#i$attr\nid=$attr>diff</a> --git" : undef
+}
+
+sub diff_header ($$$) {
+ my ($x, $ctx, $top) = @_;
+ my (undef, undef, $pa, $pb) = splice(@$top, 0, 4); # ignore oid_{a,b}
+ my $spfx = $ctx->{-spfx};
+ my $dctx = { spfx => $spfx };
+
+ # get rid of leading "a/" or "b/" (or whatever --{src,dst}-prefix are)
+ $pa = (split('/', git_unquote($pa), 2))[1] if $pa ne '/dev/null';
+ $pb = (split('/', git_unquote($pb), 2))[1] if $pb ne '/dev/null';
+ if ($pa eq $pb && $pb ne '/dev/null') {
+ $dctx->{Q} = "?b=".uri_escape_utf8($pb, UNSAFE);
+ } else {
+ my @q;
+ if ($pb ne '/dev/null') {
+ push @q, 'b='.uri_escape_utf8($pb, UNSAFE);
+ }
+ if ($pa ne '/dev/null') {
+ push @q, 'a='.uri_escape_utf8($pa, UNSAFE);
+ }
+ $dctx->{Q} = '?'.join('&', @q);
+ }
+
+ # linkify early and all at once, since we know the following
+ # subst ops on $$x won't need further escaping:
+ $$x = $ctx->{-linkify}->to_html($$x);
+
+ # no need to capture oid_a and oid_b on add/delete,
+ # we just linkify OIDs directly via s///e in conditional
+ if (($$x =~ s/$NULL_TO_BLOB/$1 . oid($dctx, $spfx, $2)/e) ||
+ ($$x =~ s/$BLOB_TO_NULL/
+ 'index ' . oid($dctx, $spfx, $1) . $2/e)) {
+ } elsif ($$x =~ $BLOB_TO_BLOB) {
+ # modification-only, not add/delete:
+ # linkify hunk headers later using oid_a and oid_b
+ @$dctx{qw(oid_a oid_b)} = ($1, $2);
+ } else {
+ warn "BUG? <$$x> had no ^index line";
+ }
+ $$x =~ s!^diff --git!anchor1($ctx, $pb) // 'diff --git'!ems;
+ my $dst = $ctx->{obuf};
+ $$dst .= qq(<span\nclass="head">);
+ $$dst .= $$x;
+ $$dst .= '</span>';
+ $dctx;
+}
+
+sub diff_before_or_after ($$) {
+ my ($ctx, $x) = @_;
+ my $linkify = $ctx->{-linkify};
+ my $dst = $ctx->{obuf};
+ my $anchors = exists($ctx->{-anchors}) ? 1 : 0;
+ for my $y (split(/(^---\n)/sm, $$x)) {
+ if ($y =~ /\A---\n\z/s) {
+ $$dst .= "---\n"; # all HTML is "\r\n" => "\n"
+ $anchors |= 2;
+ } elsif ($anchors == 3 && $y =~ /^ [0-9]+ files? changed, /sm) {
+ # ok, looks like a diffstat, go line-by-line:
+ for my $l (split(/^/m, $y)) {
+ if ($l =~ /^ (.+)( +\| .*\z)/s) {
+ anchor0($dst, $ctx, $1, $2) and next;