- my $state = DSTATE_INIT;
- my $dctx = { Q => '' }; # {}, keys: oid_a, oid_b, path_a, path_b
-
- foreach my $s (@$diff) {
- if ($s =~ /^---$/) {
- to_state($dst, $state, DSTATE_STAT);
- $$dst .= $s;
- } elsif ($s =~ /^ / || ($s =~ /^$/ && $state >= DSTATE_CTX)) {
- # works for common cases, but not weird/long filenames
- if ($state == DSTATE_STAT &&
- $s =~ /^ (.+)( +\| .*\z)/s) {
- anchor0($dst, $ctx, $linkify, $1, $2) and next;
- } elsif ($state2class[$state]) {
- to_state($dst, $state, DSTATE_CTX);
- }
- $$dst .= to_html($linkify, $s);
- } elsif ($s =~ /^-- $/) { # email signature begins
- $state == DSTATE_INIT or
- to_state($dst, $state, DSTATE_INIT);
- $$dst .= $s;
- } elsif ($s =~ m!^diff --git ($PATH_A) ($PATH_B)$!) {
- my ($pa, $pb) = ($1, $2);
- if ($state != DSTATE_HEAD) {
- to_state($dst, $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);
- }
- anchor1($dst, $ctx, $linkify, $pb, $s) and next;
- $$dst .= to_html($linkify, $s);
- } elsif ($s =~ s/^(index $OID_NULL\.\.)($OID_BLOB)\b//o) {
- $$dst .= $1 . oid($dctx, $spfx, $2);
- $dctx = { Q => '' };
- $$dst .= to_html($linkify, $s) ;
- } elsif ($s =~ s/^index ($OID_BLOB)(\.\.$OID_NULL)\b//o) {
- $$dst .= 'index ' . oid($dctx, $spfx, $1) . $2;
- $dctx = { Q => '' };
- $$dst .= to_html($linkify, $s);
- } elsif ($s =~ /^index ($OID_BLOB)\.\.($OID_BLOB)/o) {
- $dctx->{oid_a} = $1;
- $dctx->{oid_b} = $2;
- $$dst .= to_html($linkify, $s);
- } elsif ($s =~ s/^@@ (\S+) (\S+) @@//) {
- $$dst .= '</span>' if $state2class[$state];
- $$dst .= qq(<span\nclass="hunk">);
- $$dst .= diff_hunk($dctx, $spfx, $1, $2);
- $$dst .= '</span>';
- $state = DSTATE_CTX;
- $$dst .= to_html($linkify, $s);
- } elsif ($s =~ m!^--- (?:$PATH_A)! ||
- $s =~ m!^\+{3} (?:$PATH_B)!) {
- # color only (no oid link) if missing dctx->{oid_*}
- $state <= DSTATE_STAT and
- to_state($dst, $state, DSTATE_HEAD);
- $$dst .= to_html($linkify, $s);
- } elsif ($s =~ /^\+/) {
- if ($state != DSTATE_ADD && $state > DSTATE_STAT) {
- to_state($dst, $state, DSTATE_ADD);
+ 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};
+ for my $y (split(/(^---\n)/sm, $$x)) {
+ if ($y =~ /\A---\n\z/s) {
+ $$dst .= "---\n"; # all HTML is "\r\n" => "\n"
+ } elsif ($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;
+ }
+ $$dst .= $linkify->to_html($l);