From: "Jakub Narębski" <jnareb@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Shin Kojima <shin@kojima.org>, git <git@vger.kernel.org>,
Christopher Wilson <cwilson@cdwilson.us>
Subject: Re: [PATCH] gitweb: apply fallback encoding before highlight
Date: Mon, 2 May 2016 20:12:52 +0200 [thread overview]
Message-ID: <CANQwDwfZPoNd7OTpSkEmf4amV0hh8kiuk3omwLCS0O=MZ1DB=A@mail.gmail.com> (raw)
In-Reply-To: <xmqqbn4ouz7u.fsf@gitster.mtv.corp.google.com>
On Mon, May 2, 2016 at 7:49 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Shin Kojima <shin@kojima.org> writes:
>
>> This patch prepare git blob objects to be encoded into UTF-8 before
>> highlighting in the manner of `to_utf8` subroutine.
>> ---
>
> The single liner Perl invoked from the script felt a bit too dense
> to my taste but other than that I have no complaints to what the
> patched code does.
>
> Jakub, does it look good to you, too?
Yes, it looks all right to me. $^X is current Perl. -CO means that
the output is utf8 (for `highlight` command), -p means read all lines
and print them (it could be replaced by "print" command in one-liner),
-s is here to pass $fallback_encoding as $fe (it could be replaced,
but it would require some fiddling with quoting $s), -e '...' means
execute one line.
> Please sign-off your patch (see Documentation/SubmittingPatches).
>
> Thanks.
>
>
>> gitweb/gitweb.perl | 3 +++
>> 1 file changed, 3 insertions(+)
>>
>> diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
>> index 05d7910..2fddf75 100755
>> --- a/gitweb/gitweb.perl
>> +++ b/gitweb/gitweb.perl
>> @@ -3935,6 +3935,9 @@ sub run_highlighter {
>>
>> close $fd;
>> open $fd, quote_command(git_cmd(), "cat-file", "blob", $hash)." | ".
>> + quote_command($^X, '-CO', '-MEncode=decode,FB_DEFAULT', '-pse',
>> + '$_ = decode($fe, $_, FB_DEFAULT) if !utf8::decode($_);',
>> + '--', "-fe=$fallback_encoding")." | ".
>> quote_command($highlight_bin).
>> " --replace-tabs=8 --fragment --syntax $syntax |"
>> or die_error(500, "Couldn't open file or run syntax highlighter");
--
Jakub Narebski
next prev parent reply other threads:[~2016-05-02 18:13 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-20 11:32 [PATCH] gitweb: apply fallback encoding before highlight Shin Kojima
2016-05-02 17:49 ` Junio C Hamano
2016-05-02 18:12 ` Jakub Narębski [this message]
2016-05-03 13:00 ` [PATCH v2] " Shin Kojima
2016-05-03 18:33 ` Junio C Hamano
2016-05-04 8:34 ` Shin Kojima
2016-05-04 19:34 ` Junio C Hamano
2016-05-05 10:22 ` Shin Kojima
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: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CANQwDwfZPoNd7OTpSkEmf4amV0hh8kiuk3omwLCS0O=MZ1DB=A@mail.gmail.com' \
--to=jnareb@gmail.com \
--cc=cwilson@cdwilson.us \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=shin@kojima.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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.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).