From: Jakub Narebski <jnareb@gmail•com>
To: git@vger•kernel.org
Subject: [PATCH 2/6] gitweb: Simplify git_diff_print
Date: Sun, 6 Aug 2006 02:11:38 +0200 [thread overview]
Message-ID: <200608060211.38604.jnareb@gmail.com> (raw)
In-Reply-To: <200608060206.49086.jnareb@gmail.com>
Copy to temporaty file more directly, not using temporary variable @file.
Use list form of open for diff invocation (we cannot use git-diff because
first it doesn't support -L/--label option, and we cannot generate diff
between /dev/null and blob given by it's sha1 identifier).
Use "local $/ = undef;" for (temporary) slurp mode.
Signed-off-by: Jakub Narebski <jnareb@gmail•com>
---
gitweb/gitweb.perl | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 60113da..b72f12f 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -1230,31 +1230,31 @@ sub git_diff_print {
# create tmp from-file
if (defined $from) {
+ local $/ = undef;
$from_tmp = "$git_temp/gitweb_" . $$ . "_from";
open my $fd2, "> $from_tmp";
open my $fd, "-|", $GIT, "cat-file", "blob", $from;
- my @file = <$fd>;
- print $fd2 @file;
+ print { $fd2 } <$fd>;
close $fd2;
close $fd;
}
# create tmp to-file
if (defined $to) {
+ local $/ = undef;
$to_tmp = "$git_temp/gitweb_" . $$ . "_to";
open my $fd2, "> $to_tmp";
open my $fd, "-|", $GIT, "cat-file", "blob", $to;
- my @file = <$fd>;
- print $fd2 @file;
+ print { $fd2 } <$fd>;
close $fd2;
close $fd;
}
- open my $fd, "-|", "/usr/bin/diff -u -p -L \'$from_name\' -L \'$to_name\' $from_tmp $to_tmp";
+ open my $fd, "-|", "/usr/bin/diff",
+ '-u', '-p', '-L', $from_name, '-L', $to_name, $from_tmp, $to_tmp;
if ($format eq "plain") {
- undef $/;
+ local $/ = undef;
print <$fd>;
- $/ = "\n";
} else {
while (my $line = <$fd>) {
chomp $line;
--
1.4.1.1
next prev parent reply other threads:[~2006-08-06 0:16 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-08-06 0:06 [PATCH 0/6] gitweb: Further refactoring Jakub Narebski
2006-08-06 0:08 ` [PATCH 1/6] gitweb: Refactor untabifying - converting tabs to spaces Jakub Narebski
2006-08-06 8:31 ` Matthias Lederhofer
2006-08-06 0:11 ` Jakub Narebski [this message]
2006-08-06 9:26 ` [PATCH 2/6] gitweb: Simplify git_diff_print Junio C Hamano
2006-08-06 10:22 ` Jakub Narebski
2006-08-06 0:13 ` [PATCH 3/6] gitweb: Remove unused parse_date invocation from git_shortlog_body Jakub Narebski
2006-08-06 0:13 ` [PATCH 4/6] gitweb: Make blob diff -p1 like commit diff Jakub Narebski
2006-08-06 0:14 ` [PATCH 5/6] gitweb: Refactor printing shortened title in git_shortlog_body and git_tags_body Jakub Narebski
2006-08-06 0:17 ` [PATCH 6/6] gitweb: Refactor git_history_body Jakub Narebski
2006-08-06 10:01 ` [PATCH 0/6] gitweb: Further refactoring Junio C Hamano
2006-08-06 10:52 ` Jakub Narebski
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200608060211.38604.jnareb@gmail.com \
--to=jnareb@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox