From: Eric Wong <e@80x24.org> To: meta@public-inbox.org Subject: [PATCH 26/37] viewdiff: cleanup state transitions a bit Date: Mon, 21 Jan 2019 20:52:42 +0000 Message-ID: <20190121205253.10455-27-e@80x24.org> (raw) In-Reply-To: <20190121205253.10455-1-e@80x24.org> This makes things less error-prone and allows us to only highlight the "@@ -\S+ \+\S+ @@" part of the hunk header line, without highlighting the function context. This more closely matches the coloring behavior of git-diff(1) --- lib/PublicInbox/ViewDiff.pm | 84 ++++++++++++++++++------------------- 1 file changed, 40 insertions(+), 44 deletions(-) diff --git a/lib/PublicInbox/ViewDiff.pm b/lib/PublicInbox/ViewDiff.pm index 0d1aefb..1fa1845 100644 --- a/lib/PublicInbox/ViewDiff.pm +++ b/lib/PublicInbox/ViewDiff.pm @@ -18,10 +18,18 @@ 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 DSTATE_CTX () { 3 } # /^ / +sub DSTATE_ADD () { 4 } # /^\+/ +sub DSTATE_DEL () { 5 } # /^\-/ +my @state2class = ( + '', # init + '', # stat + 'head', + '', # ctx + 'add', + 'del' +); + sub UNSAFE () { "^A-Za-z0-9\-\._~/" } my $OID_NULL = '0{7,40}'; @@ -59,6 +67,14 @@ sub oid ($$$) { defined($spfx) ? qq(<a\nhref=$spfx$oid/s/$dctx->{Q}>$oid</a>) : $oid; } +sub to_state ($$$) { + my ($dst, $state, $new_state) = @_; + $$dst .= '</span>' if $state2class[$state]; + $_[1] = $new_state; + my $class = $state2class[$new_state] or return; + $$dst .= "<span\nclass=$class>"; +} + sub flush_diff ($$$$) { my ($dst, $spfx, $linkify, $diff) = @_; my $state = DSTATE_INIT; @@ -66,24 +82,18 @@ sub flush_diff ($$$$) { 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; + if ($state2class[$state]) { + to_state($dst, $state, DSTATE_CTX); } $$dst .= to_html($linkify, $s); } elsif ($s =~ /^-- $/) { # email signature begins - if ($state != DSTATE_INIT) { - $state = DSTATE_INIT; - $$dst .= '</span>'; - } + $state == DSTATE_INIT or + to_state($dst, $state, DSTATE_INIT); $$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; + to_state($dst, $state, DSTATE_HEAD); $pa = (split('/', git_unquote($pa), 2))[1]; $pb = (split('/', git_unquote($pb), 2))[1]; $dctx = { @@ -106,38 +116,26 @@ sub flush_diff ($$$$) { $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 .= '</span>' if $state2class[$state]; + $$dst .= "<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!) { - 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>"; - } + } elsif ($s =~ m!^--- $PATH_A! || + $s =~ m!^\+{3} $PATH_B!) { + # color only (no oid link) + $state == DSTATE_INIT and + to_state($dst, $state, DSTATE_HEAD); $$dst .= to_html($linkify, $s); } elsif ($s =~ /^\+/) { if ($state != DSTATE_ADD && $state != DSTATE_INIT) { - $$dst .= "</span><span\nclass=add>"; - $state = DSTATE_ADD; + to_state($dst, $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; + to_state($dst, $state, DSTATE_DEL); } $$dst .= to_html($linkify, $s); # ignore the following lines in headers: @@ -148,15 +146,13 @@ sub flush_diff ($$$$) { $s =~ /^(?:dis)?similarity index /) { $$dst .= to_html($linkify, $s); } else { - if ($state != DSTATE_INIT) { - $$dst .= '</span>'; - $state = DSTATE_INIT; - } + $state == DSTATE_INIT or + to_state($dst, $state, DSTATE_INIT); $$dst .= to_html($linkify, $s); } } @$diff = (); - $$dst .= '</span>' if $state != DSTATE_INIT; + $$dst .= '</span>' if $state2class[$state]; undef; } -- EW
next prev parent reply other threads:[~2019-01-21 20:52 UTC|newest] Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-01-21 20:52 [PATCH 00/37] viewvcs: diff highlighting and more Eric Wong 2019-01-21 20:52 ` [PATCH 01/37] view: disable bold in topic display Eric Wong 2019-01-21 20:52 ` [PATCH 02/37] hval: force monospace for <form> elements, too Eric Wong 2019-01-21 20:52 ` [PATCH 03/37] t/perf-msgview: add test to check msg_html performance Eric Wong 2019-01-21 20:52 ` [PATCH 04/37] solver: initial Perl implementation Eric Wong 2019-01-21 20:52 ` [PATCH 05/37] git: support multiple URL endpoints Eric Wong 2019-01-21 20:52 ` [PATCH 06/37] git: add git_quote Eric Wong 2019-01-21 20:52 ` [PATCH 07/37] git: check saves error on disambiguation Eric Wong 2019-01-21 20:52 ` [PATCH 08/37] solver: various bugfixes and cleanups Eric Wong 2019-01-21 20:52 ` [PATCH 09/37] view: wire up diff and vcs viewers with solver Eric Wong 2019-01-21 20:52 ` [PATCH 10/37] git: disable abbreviations with cat-file hints Eric Wong 2019-01-21 20:52 ` [PATCH 11/37] solver: operate directly on git index Eric Wong 2019-01-21 20:52 ` [PATCH 12/37] view: enable naming hints for raw blob downloads Eric Wong 2019-01-21 20:52 ` [PATCH 13/37] git: support 'ambiguous' result from --batch-check Eric Wong 2019-01-21 20:52 ` [PATCH 14/37] solver: more verbose blob resolution Eric Wong 2019-01-21 20:52 ` [PATCH 15/37] solver: break up patch application steps Eric Wong 2019-01-21 20:52 ` [PATCH 16/37] solver: switch patch application to use a callback Eric Wong 2019-01-21 20:52 ` [PATCH 17/37] solver: simplify control flow for initial loop Eric Wong 2019-01-21 20:52 ` [PATCH 18/37] solver: break @todo loop into a callback Eric Wong 2019-01-21 20:52 ` [PATCH 19/37] solver: note the synchronous nature of index preparation Eric Wong 2019-01-21 20:52 ` [PATCH 20/37] solver: add a TODO note about making this fully evented Eric Wong 2019-01-21 20:52 ` [PATCH 21/37] view: enforce trailing slash for /$INBOX/$OID/s/ endpoints Eric Wong 2019-01-21 20:52 ` [PATCH 22/37] solver: restore diagnostics and deal with CRLF Eric Wong 2019-01-21 20:52 ` [PATCH 23/37] www: admin-configurable CSS via "publicinbox.css" Eric Wong 2019-01-21 20:52 ` [PATCH 24/37] $INBOX/_/text/color/ and sample user-side CSS Eric Wong 2019-01-21 20:52 ` [PATCH 25/37] viewdiff: support diff-highlighting w/o coderepo Eric Wong 2019-01-21 20:52 ` Eric Wong [this message] 2019-01-21 20:52 ` [PATCH 27/37] viewdiff: quote attributes for Atom feed Eric Wong 2019-01-21 20:52 ` [PATCH 28/37] t/check-www-inbox: use xmlstarlet to validate Atom if available Eric Wong 2019-01-21 20:52 ` [PATCH 29/37] viewdiff: do not link to 0{7,40} blobs (again) Eric Wong 2019-01-21 20:52 ` [PATCH 30/37] viewvcs: disable white-space prewrap in blob view Eric Wong 2019-01-21 20:52 ` [PATCH 31/37] solver: force quoted-printable bodies to LF Eric Wong 2019-01-21 20:52 ` [PATCH 32/37] solver: remove extra "^index $OID..$OID" line Eric Wong 2019-01-21 20:52 ` [PATCH 33/37] config: each_inbox iteration preserves config order Eric Wong 2019-01-21 20:52 ` [PATCH 34/37] t/check-www-inbox: warn on missing Content-Type Eric Wong 2019-01-21 20:52 ` [PATCH 35/37] highlight: initial wrapper and PSGI service Eric Wong 2019-01-21 20:52 ` [PATCH 36/37] hval: split out escape sequences to a separate table Eric Wong 2019-01-21 20:52 ` [PATCH 37/37] t/check-www-inbox: trap SIGINT for File::Temp destruction Eric Wong
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style List information: https://public-inbox.org/README * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20190121205253.10455-27-e@80x24.org \ --to=e@80x24.org \ --cc=meta@public-inbox.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
user/dev discussion of public-inbox itself This inbox may be cloned and mirrored by anyone: git clone --mirror https://public-inbox.org/meta git clone --mirror http://czquwvybam4bgbro.onion/meta git clone --mirror http://hjrcffqmbrq6wope.onion/meta git clone --mirror http://ou63pmih66umazou.onion/meta # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V1 meta meta/ https://public-inbox.org/meta \ meta@public-inbox.org public-inbox-index meta Example config snippet for mirrors. Newsgroups are available over NNTP: nntp://news.public-inbox.org/inbox.comp.mail.public-inbox.meta nntp://ou63pmih66umazou.onion/inbox.comp.mail.public-inbox.meta nntp://czquwvybam4bgbro.onion/inbox.comp.mail.public-inbox.meta nntp://hjrcffqmbrq6wope.onion/inbox.comp.mail.public-inbox.meta nntp://news.gmane.io/gmane.mail.public-inbox.general note: .onion URLs require Tor: https://www.torproject.org/ code repositories for the project(s) associated with this inbox: https://80x24.org/public-inbox.git AGPL code for this site: git clone https://public-inbox.org/public-inbox.git