gitweb: Use list for of open for running git commands, thorougly.
Use list form of open for running git commands and reading their output through pipe, for example open my $fd, "-|", $GIT, "rev-list", "--header", "--parents", $hash instead of open my $fd, "-|", "$GIT rev-list --header --parents $hash" Single letter options use ' instead of " as quotes, according to style used in list form of magic "-|" open. Signed-off-by: Jakub Narebski <jnareb@gmail.com> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Jakub Narebski
Junio C Hamano
parent
5be01bc8d5
commit
b9182987a8
@ -388,7 +388,7 @@ sub die_error {
|
||||
sub git_get_type {
|
||||
my $hash = shift;
|
||||
|
||||
open my $fd, "-|", "$GIT cat-file -t $hash" or return;
|
||||
open my $fd, "-|", $GIT, "cat-file", '-t', $hash or return;
|
||||
my $type = <$fd>;
|
||||
close $fd or return;
|
||||
chomp $type;
|
||||
@ -440,7 +440,7 @@ sub git_read_tag {
|
||||
my %tag;
|
||||
my @comment;
|
||||
|
||||
open my $fd, "-|", "$GIT cat-file tag $tag_id" or return;
|
||||
open my $fd, "-|", $GIT, "cat-file", "tag", $tag_id or return;
|
||||
$tag{'id'} = $tag_id;
|
||||
while (my $line = <$fd>) {
|
||||
chomp $line;
|
||||
@ -512,7 +512,7 @@ sub git_read_commit {
|
||||
@commit_lines = @$commit_text;
|
||||
} else {
|
||||
$/ = "\0";
|
||||
open my $fd, "-|", "$GIT rev-list --header --parents --max-count=1 $commit_id" or return;
|
||||
open my $fd, "-|", $GIT, "rev-list", "--header", "--parents", "--max-count=1", $commit_id or return;
|
||||
@commit_lines = split '\n', <$fd>;
|
||||
close $fd or return;
|
||||
$/ = "\n";
|
||||
@ -610,7 +610,7 @@ sub git_diff_print {
|
||||
if (defined $from) {
|
||||
$from_tmp = "$git_temp/gitweb_" . $$ . "_from";
|
||||
open my $fd2, "> $from_tmp";
|
||||
open my $fd, "-|", "$GIT cat-file blob $from";
|
||||
open my $fd, "-|", $GIT, "cat-file", "blob", $from;
|
||||
my @file = <$fd>;
|
||||
print $fd2 @file;
|
||||
close $fd2;
|
||||
@ -621,7 +621,7 @@ sub git_diff_print {
|
||||
if (defined $to) {
|
||||
$to_tmp = "$git_temp/gitweb_" . $$ . "_to";
|
||||
open my $fd2, "> $to_tmp";
|
||||
open my $fd, "-|", "$GIT cat-file blob $to";
|
||||
open my $fd, "-|", $GIT, "cat-file", "blob", $to;
|
||||
my @file = <$fd>;
|
||||
print $fd2 @file;
|
||||
close $fd2;
|
||||
@ -1062,7 +1062,8 @@ sub git_summary {
|
||||
"<tr><td>owner</td><td>$owner</td></tr>\n" .
|
||||
"<tr><td>last change</td><td>$cd{'rfc2822'}</td></tr>\n" .
|
||||
"</table>\n";
|
||||
open my $fd, "-|", "$GIT rev-list --max-count=17 " . git_read_head($project) or die_error(undef, "Open failed.");
|
||||
open my $fd, "-|", $GIT, "rev-list", "--max-count=17", git_read_head($project)
|
||||
or die_error(undef, "Open failed.");
|
||||
my (@revlist) = map { chomp; $_ } <$fd>;
|
||||
close $fd;
|
||||
print "<div>\n" .
|
||||
@ -1526,7 +1527,7 @@ sub git_get_hash_by_path {
|
||||
my $tree = $base;
|
||||
my @parts = split '/', $path;
|
||||
while (my $part = shift @parts) {
|
||||
open my $fd, "-|", "$GIT ls-tree $tree" or die_error(undef, "Open git-ls-tree failed.");
|
||||
open my $fd, "-|", $GIT, "ls-tree", $tree or die_error(undef, "Open git-ls-tree failed.");
|
||||
my (@entries) = map { chomp; $_ } <$fd>;
|
||||
close $fd or return undef;
|
||||
foreach my $line (@entries) {
|
||||
@ -1622,7 +1623,7 @@ sub git_blob_plain {
|
||||
}
|
||||
}
|
||||
my $type = shift;
|
||||
open my $fd, "-|", "$GIT cat-file blob $hash" or die_error("Couldn't cat $file_name, $hash");
|
||||
open my $fd, "-|", $GIT, "cat-file", "blob", $hash or die_error("Couldn't cat $file_name, $hash");
|
||||
|
||||
$type ||= git_blob_plain_mimetype($fd, $file_name);
|
||||
|
||||
@ -1654,7 +1655,7 @@ sub git_blob {
|
||||
}
|
||||
}
|
||||
my $have_blame = git_get_project_config_bool ('blame');
|
||||
open my $fd, "-|", "$GIT cat-file blob $hash" or die_error(undef, "Open failed.");
|
||||
open my $fd, "-|", $GIT, "cat-file", "blob", $hash or die_error(undef, "Open failed.");
|
||||
my $mimetype = git_blob_plain_mimetype($fd, $file_name);
|
||||
if ($mimetype !~ m/^text\//) {
|
||||
close $fd;
|
||||
@ -1718,7 +1719,7 @@ sub git_tree {
|
||||
}
|
||||
}
|
||||
$/ = "\0";
|
||||
open my $fd, "-|", "$GIT ls-tree -z $hash" or die_error(undef, "Open git-ls-tree failed.");
|
||||
open my $fd, "-|", $GIT, "ls-tree", '-z', $hash or die_error(undef, "Open git-ls-tree failed.");
|
||||
chomp (my (@entries) = <$fd>);
|
||||
close $fd or die_error(undef, "Reading tree failed.");
|
||||
$/ = "\n";
|
||||
@ -1799,7 +1800,8 @@ sub git_tree {
|
||||
|
||||
sub git_rss {
|
||||
# http://www.notestips.com/80256B3A007F2692/1/NAMO5P9UPQ
|
||||
open my $fd, "-|", "$GIT rev-list --max-count=150 " . git_read_head($project) or die_error(undef, "Open failed.");
|
||||
open my $fd, "-|", $GIT, "rev-list", "--max-count=150", git_read_head($project)
|
||||
or die_error(undef, "Open failed.");
|
||||
my (@revlist) = map { chomp; $_ } <$fd>;
|
||||
close $fd or die_error(undef, "Reading rev-list failed.");
|
||||
print $cgi->header(-type => 'text/xml', -charset => 'utf-8');
|
||||
@ -1819,7 +1821,7 @@ sub git_rss {
|
||||
last;
|
||||
}
|
||||
my %cd = date_str($co{'committer_epoch'});
|
||||
open $fd, "-|", "$GIT diff-tree -r $co{'parent'} $co{'id'}" or next;
|
||||
open $fd, "-|", $GIT, "diff-tree", '-r', $co{'parent'}, $co{'id'} or next;
|
||||
my @difftree = map { chomp; $_ } <$fd>;
|
||||
close $fd or next;
|
||||
print "<item>\n" .
|
||||
@ -1907,7 +1909,7 @@ sub git_log {
|
||||
" | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=tree;h=$hash;hb=$hash")}, "tree") . "<br/>\n";
|
||||
|
||||
my $limit = sprintf("--max-count=%i", (100 * ($page+1)));
|
||||
open my $fd, "-|", "$GIT rev-list $limit $hash" or die_error(undef, "Open failed.");
|
||||
open my $fd, "-|", $GIT, "rev-list", $limit, $hash or die_error(undef, "Open failed.");
|
||||
my (@revlist) = map { chomp; $_ } <$fd>;
|
||||
close $fd;
|
||||
|
||||
@ -1992,15 +1994,14 @@ sub git_commit {
|
||||
my %cd = date_str($co{'committer_epoch'}, $co{'committer_tz'});
|
||||
|
||||
my @difftree;
|
||||
my $root = "";
|
||||
my $parent = $co{'parent'};
|
||||
if (!defined $parent) {
|
||||
$root = " --root";
|
||||
$parent = "";
|
||||
$parent = "--root";
|
||||
}
|
||||
open my $fd, "-|", "$GIT diff-tree -r -M $root $parent $hash" or die_error(undef, "Open failed.");
|
||||
open my $fd, "-|", $GIT, "diff-tree", '-r', '-M', $parent, $hash
|
||||
or die_error(undef, "Open failed.");
|
||||
@difftree = map { chomp; $_ } <$fd>;
|
||||
close $fd or die_error(undef, "Reading diff-tree failed.");
|
||||
close $fd or die_error(undef, "Reading git-diff-tree failed.");
|
||||
|
||||
# non-textual hash id's can be cached
|
||||
my $expires;
|
||||
@ -2244,7 +2245,8 @@ sub git_commitdiff {
|
||||
if (!defined $hash_parent) {
|
||||
$hash_parent = $co{'parent'};
|
||||
}
|
||||
open my $fd, "-|", "$GIT diff-tree -r $hash_parent $hash" or die_error(undef, "Open failed.");
|
||||
open my $fd, "-|", $GIT, "diff-tree", '-r', $hash_parent, $hash
|
||||
or die_error(undef, "Open failed.");
|
||||
my (@difftree) = map { chomp; $_ } <$fd>;
|
||||
close $fd or die_error(undef, "Reading diff-tree failed.");
|
||||
|
||||
@ -2334,14 +2336,15 @@ sub git_commitdiff {
|
||||
|
||||
sub git_commitdiff_plain {
|
||||
mkdir($git_temp, 0700);
|
||||
open my $fd, "-|", "$GIT diff-tree -r $hash_parent $hash" or die_error(undef, "Open failed.");
|
||||
open my $fd, "-|", $GIT, "diff-tree", '-r', $hash_parent, $hash
|
||||
or die_error(undef, "Open failed.");
|
||||
my (@difftree) = map { chomp; $_ } <$fd>;
|
||||
close $fd or die_error(undef, "Reading diff-tree failed.");
|
||||
|
||||
# try to figure out the next tag after this commit
|
||||
my $tagname;
|
||||
my $refs = read_info_ref("tags");
|
||||
open $fd, "-|", "$GIT rev-list HEAD";
|
||||
open $fd, "-|", $GIT, "rev-list", "HEAD";
|
||||
chomp (my (@commits) = <$fd>);
|
||||
close $fd;
|
||||
foreach my $commit (@commits) {
|
||||
@ -2419,7 +2422,7 @@ sub git_history {
|
||||
git_print_page_path($file_name, $ftype);
|
||||
|
||||
open my $fd, "-|",
|
||||
"$GIT rev-list --full-history $hash_base -- \'$file_name\'";
|
||||
$GIT, "rev-list", "--full-history", $hash_base, "--", "\'$file_name\'";
|
||||
print "<table cellspacing=\"0\">\n";
|
||||
my $alternate = 0;
|
||||
while (my $line = <$fd>) {
|
||||
@ -2506,7 +2509,7 @@ sub git_search {
|
||||
my $alternate = 0;
|
||||
if ($commit_search) {
|
||||
$/ = "\0";
|
||||
open my $fd, "-|", "$GIT rev-list --header --parents $hash" or next;
|
||||
open my $fd, "-|", $GIT, "rev-list", "--header", "--parents", $hash or next;
|
||||
while (my $commit_text = <$fd>) {
|
||||
if (!grep m/$searchtext/i, $commit_text) {
|
||||
next;
|
||||
@ -2627,7 +2630,7 @@ sub git_shortlog {
|
||||
" | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=tree;h=$hash;hb=$hash")}, "tree") . "<br/>\n";
|
||||
|
||||
my $limit = sprintf("--max-count=%i", (100 * ($page+1)));
|
||||
open my $fd, "-|", "$GIT rev-list $limit $hash" or die_error(undef, "Open failed.");
|
||||
open my $fd, "-|", $GIT, "rev-list", $limit, $hash or die_error(undef, "Open failed.");
|
||||
my (@revlist) = map { chomp; $_ } <$fd>;
|
||||
close $fd;
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user