user/dev discussion of public-inbox itself
 help / color / Atom feed
From: Eric Wong <e@80x24.org>
To: SZEDER Gábor <szeder.dev@gmail.com>
Cc: meta@public-inbox.org
Subject: [PATCH] viewdiff: group path match to not be confused by "/dev/null"
Date: Mon, 4 Feb 2019 11:49:22 +0000
Message-ID: <20190204114922.GA5127@dcvr> (raw)
In-Reply-To: <20190204105454.GG10587@szeder.dev>

SZEDER Gábor <szeder.dev@gmail.com> wrote:
> Hi,
> 
> First of all, thanks you very much for adding syntax highlighting for
> patch emails, it's fantastic!

You're welcome, but it's clearly a work-in-progress :)

> However, I noticed that a patch I recently sent to the Git mailing
> list got bogus syntax highlighting, as the added line is colored as
> removed:
> 
>   https://public-inbox.org/git/20190202163421.19686-1-szeder.dev@gmail.com/  
> 
> Perhaps the '>' shell redirection operator causes troubles?  I clicked
> around in the list archives, and sure enough found other occurrance of
> this bug, that also seems to suggest that a '>' might be problematic
> only when it's on the first added line:

Not the '>', it was actually "/dev/null" :x

The following seems to work:

---------8<--------
Subject: [PATCH] viewdiff: group path match to not be confused by "/dev/null"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Leaving out parentheses caused transitions to state="del" or
state="add" to be misidentified.

cf. https://public-inbox.org/meta/20190204105454.GG10587@szeder.dev/

Reported-by: SZEDER Gábor <szeder.dev@gmail.com>
---
 lib/PublicInbox/ViewDiff.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/PublicInbox/ViewDiff.pm b/lib/PublicInbox/ViewDiff.pm
index c818203..a773e38 100644
--- a/lib/PublicInbox/ViewDiff.pm
+++ b/lib/PublicInbox/ViewDiff.pm
@@ -190,8 +190,8 @@ sub flush_diff ($$$) {
 			$$dst .= '</span>';
 			$state = DSTATE_CTX;
 			$$dst .= to_html($linkify, $s);
-		} elsif ($s =~ m!^--- $PATH_A! ||
-		         $s =~ m!^\+{3} $PATH_B!)  {
+		} 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);
-- 
EW

      reply index

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-02-04 10:54 syntax highlighting bug with lines containing '>' SZEDER Gábor
2019-02-04 11:49 ` Eric Wong [this message]

Reply instructions:

You may reply publically 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=20190204114922.GA5127@dcvr \
    --to=e@80x24.org \
    --cc=meta@public-inbox.org \
    --cc=szeder.dev@gmail.com \
    /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

Archives are clonable:
	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

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.org/gmane.mail.public-inbox.general

 note: .onion URLs require Tor: https://www.torproject.org/

AGPL code for this site: git clone https://public-inbox.org/ public-inbox