user/dev discussion of public-inbox itself
 help / color / mirror / code / Atom feed
0d1aefb78bdea037425867bc9f3366a7ed7b1fc5 blob 4859 bytes (raw)

  1
  2
  3
  4
  5
  6
  7
  8
  9
 10
 11
 12
 13
 14
 15
 16
 17
 18
 19
 20
 21
 22
 23
 24
 25
 26
 27
 28
 29
 30
 31
 32
 33
 34
 35
 36
 37
 38
 39
 40
 41
 42
 43
 44
 45
 46
 47
 48
 49
 50
 51
 52
 53
 54
 55
 56
 57
 58
 59
 60
 61
 62
 63
 64
 65
 66
 67
 68
 69
 70
 71
 72
 73
 74
 75
 76
 77
 78
 79
 80
 81
 82
 83
 84
 85
 86
 87
 88
 89
 90
 91
 92
 93
 94
 95
 96
 97
 98
 99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
 
# Copyright (C) 2019 all contributors <meta@public-inbox.org>
# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
#
# used by PublicInbox::View
# This adds CSS spans for diff highlighting.
# It also generates links for ViewVCS + SolverGit to show
# (or reconstruct) blobs.

package PublicInbox::ViewDiff;
use strict;
use warnings;
use base qw(Exporter);
our @EXPORT_OK = qw(flush_diff);
use URI::Escape qw(uri_escape_utf8);
use PublicInbox::Hval qw(ascii_html);
use PublicInbox::Git qw(git_unquote);

sub DSTATE_INIT () { 0 }
sub DSTATE_STAT () { 1 } # TODO
sub DSTATE_HEAD () { 2 } # /^diff --git /, /^index /, /^--- /, /^\+\+\+ /
sub DSTATE_HUNK () { 3 } # /^@@ /
sub DSTATE_CTX () { 4 } # /^ /
sub DSTATE_ADD () { 5 } # /^\+/
sub DSTATE_DEL () { 6 } # /^\-/
sub UNSAFE () { "^A-Za-z0-9\-\._~/" }

my $OID_NULL = '0{7,40}';
my $OID_BLOB = '[a-f0-9]{7,40}';
my $PATH_A = '"?a/.+|/dev/null';
my $PATH_B = '"?b/.+|/dev/null';

sub to_html ($$) {
	$_[0]->linkify_1($_[1]);
	$_[0]->linkify_2(ascii_html($_[1]));
}

# link to line numbers in blobs
sub diff_hunk ($$$$) {
	my ($dctx, $spfx, $ca, $cb) = @_;
	my $oid_a = $dctx->{oid_a};
	my $oid_b = $dctx->{oid_b};

	(defined($spfx) && defined($oid_a) && defined($oid_b)) or
		return "@@ $ca $cb @@";

	my ($n) = ($ca =~ /^-(\d+)/);
	$n = defined($n) ? do { ++$n; "#n$n" } : '';

	my $rv = qq(@@ <a\nhref=$spfx$oid_a/s/$dctx->{Q}$n>$ca</a>);

	($n) = ($cb =~ /^\+(\d+)/);
	$n = defined($n) ? do { ++$n; "#n$n" } : '';

	$rv .= qq( <a\nhref=$spfx$oid_b/s/$dctx->{Q}$n>$cb</a> @@);
}

sub oid ($$$) {
	my ($dctx, $spfx, $oid) = @_;
	defined($spfx) ? qq(<a\nhref=$spfx$oid/s/$dctx->{Q}>$oid</a>) : $oid;
}

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);
				}
			}
			$$dst .= to_html($linkify, $s);
		} elsif ($s =~ s/^(index $OID_NULL\.\.)($OID_BLOB)\b//o) {
			$$dst .= $1 . oid($dctx, $spfx, $2);
			$$dst .= to_html($linkify, $s) ;
		} elsif ($s =~ s/^index ($OID_NULL)(\.\.$OID_BLOB)\b//o) {
			$$dst .= 'index ' . oid($dctx, $spfx, $1) . $2;
			$$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+) @@//) {
			my ($ca, $cb) = ($1, $2);
			if ($state == DSTATE_HEAD || $state == DSTATE_CTX ||
			    $state == DSTATE_ADD || $state == DSTATE_DEL) {
				$$dst .= "</span><span\nclass=hunk>";
				$state = DSTATE_HUNK;
				$$dst .= diff_hunk($dctx, $spfx, $ca, $cb);
			} else {
				$$dst .= to_html($linkify, "@@ $ca $cb @@");
			}
			$$dst .= to_html($linkify, $s);
		} elsif ($s =~ m!^--- $PATH_A!) {
			if ($state == DSTATE_INIT) { # color only (no oid link)
				$state = DSTATE_HEAD;
				$$dst .= "<span\nclass=head>";
			}
			$$dst .= to_html($linkify, $s);
		} elsif ($s =~ m!^\+{3} $PATH_B!)  {
			if ($state == DSTATE_INIT) { # color only (no oid link)
				$state = DSTATE_HEAD;
				$$dst .= "<span\nclass=head>";
			}
			$$dst .= to_html($linkify, $s);
		} elsif ($s =~ /^\+/) {
			if ($state != DSTATE_ADD && $state != DSTATE_INIT) {
				$$dst .= "</span><span\nclass=add>";
				$state = DSTATE_ADD;
			}
			$$dst .= to_html($linkify, $s);
		} elsif ($s =~ /^-/) {
			if ($state != DSTATE_DEL && $state != DSTATE_INIT) {
				$$dst .= "</span><span\nclass=del>";
				$state = DSTATE_DEL;
			}
			$$dst .= to_html($linkify, $s);
		# ignore the following lines in headers:
		} elsif ($s =~ /^(?:dis)similarity index/ ||
			 $s =~ /^(?:old|new) mode/ ||
			 $s =~ /^(?:deleted|new) file mode/ ||
			 $s =~ /^(?:copy|rename) (?:from|to) / ||
			 $s =~ /^(?:dis)?similarity index /) {
			$$dst .= to_html($linkify, $s);
		} else {
			if ($state != DSTATE_INIT) {
				$$dst .= '</span>';
				$state = DSTATE_INIT;
			}
			$$dst .= to_html($linkify, $s);
		}
	}
	@$diff = ();
	$$dst .= '</span>' if $state != DSTATE_INIT;
	undef;
}

1;
debug log:

solving 0d1aefb ...
found 0d1aefb in public-inbox.git.git

Code repositories for project(s) associated with this 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).