From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 3/3] solver: minor cleanups to diff extraction
Date: Sat, 4 Jan 2020 03:34:15 +0000 [thread overview]
Message-ID: <20200104033415.17097-4-e@80x24.org> (raw)
In-Reply-To: <20200104033415.17097-1-e@80x24.org>
Initialize the $di hashref at use to make it more obvious it's
a local variable. We can also use the :utf8 IO layer via
open+print to save ourselves the trouble of converting the UTF-8
patch to an octet stream.
---
lib/PublicInbox/SolverGit.pm | 18 ++++++++----------
1 file changed, 8 insertions(+), 10 deletions(-)
diff --git a/lib/PublicInbox/SolverGit.pm b/lib/PublicInbox/SolverGit.pm
index b12cd9d2..eab8459b 100644
--- a/lib/PublicInbox/SolverGit.pm
+++ b/lib/PublicInbox/SolverGit.pm
@@ -102,7 +102,6 @@ sub extract_diff ($$) {
my $ct = $part->content_type || 'text/plain';
my ($s, undef) = msg_part_text($part, $ct);
defined $s or return;
- my $di = {};
# Email::MIME::Encodings forces QP to be CRLF upon decoding,
# change it back to LF:
@@ -159,12 +158,14 @@ sub extract_diff ($$) {
(?:^(?:[\@\+\x20\-\\][^\r\n]*|)$LF)+
)!smx or return;
- my $hdr_lines = $1;
+ my $di = {
+ hdr_lines => $1,
+ oid_a => $6,
+ oid_b => $7,
+ mode_a => $5 // $8 // $4, # new (file) // unchanged // old
+ };
my $path_a = $2 // $10;
my $path_b = $3 // $11;
- $di->{oid_a} = $6;
- $di->{oid_b} = $7;
- $di->{mode_a} = $5 // $8 // $4; # new (file) // unchanged // old
my $patch = $9;
# don't care for leading 'a/' and 'b/'
@@ -179,19 +180,16 @@ sub extract_diff ($$) {
$di->{path_a} = join('/', @a);
$di->{path_b} = join('/', @b);
- utf8::encode($hdr_lines);
- utf8::encode($patch);
my $path = ++$self->{tot};
$di->{n} = $path;
- open(my $tmp, '>', $self->{tmp}->dirname . "/$path") or
+ open(my $tmp, '>:utf8', $self->{tmp}->dirname . "/$path") or
die "open(tmp): $!";
- print $tmp $hdr_lines, $patch or die "print(tmp): $!";
+ print $tmp $di->{hdr_lines}, $patch or die "print(tmp): $!";
close $tmp or die "close(tmp): $!";
# for debugging/diagnostics:
$di->{ibx} = $ibx;
$di->{smsg} = $smsg;
- $di->{hdr_lines} = $hdr_lines;
push @$diffs, $di;
}
next prev parent reply other threads:[~2020-01-04 3:34 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-04 3:34 [PATCH 0/3] more solver fixes Eric Wong
2020-01-04 3:34 ` [PATCH 1/3] xt/solver.t: real-world regression tests Eric Wong
2020-01-04 3:34 ` [PATCH 2/3] solver: do not enforce order on extended headers Eric Wong
2020-01-04 3:34 ` Eric Wong [this message]
2020-01-04 4:19 ` [PATCH 4/3] solver: allow literal '\r' character in diff lines 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: http://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=20200104033415.17097-4-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
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/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).