undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gitweb: More explicit error messages for open "-|"

Browse Source 
Use more explicit error messages when failing magical "-|" open,
stating at least the name of the git command that failed.

Signed-off-by: Jakub Narebski <jnareb@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Jakub Narebski 2006-07-29 23:01:00 +02:00 committed by Junio C Hamano
parent dda754f7d4
commit 044bfdc8cb
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
gitweb/gitweb.cgi
View File

@ -1063,7 +1063,7 @@ sub git_summary {
"<tr><td>last change</td><td>$cd{'rfc2822'}</td></tr>\n" . "<tr><td>last change</td><td>$cd{'rfc2822'}</td></tr>\n" .
"</table>\n"; "</table>\n";
open my $fd, "-|", $GIT, "rev-list", "--max-count=17", git_read_head($project) open my $fd, "-|", $GIT, "rev-list", "--max-count=17", git_read_head($project)
or die_error(undef, "Open failed."); or die_error(undef, "Open git-rev-list failed.");
my (@revlist) = map { chomp; $_ } <$fd>; my (@revlist) = map { chomp; $_ } <$fd>;
close $fd; close $fd;
print "<div>\n" . print "<div>\n" .
@ -1271,7 +1271,7 @@ sub git_blame2 {
die_error("400 Bad Request", "object is not a blob"); die_error("400 Bad Request", "object is not a blob");
} }
open ($fd, "-|", $GIT, "blame", '-l', $file_name, $hash_base) open ($fd, "-|", $GIT, "blame", '-l', $file_name, $hash_base)
or die_error(undef, "Open failed"); or die_error(undef, "Open git-blame failed.");
git_header_html(); git_header_html();
print "<div class=\"page_nav\">\n" . print "<div class=\"page_nav\">\n" .
$cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=summary")}, "summary") . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=summary")}, "summary") .
@ -1333,7 +1333,7 @@ sub git_blame {
or die_error(undef, "Error lookup file."); or die_error(undef, "Error lookup file.");
} }
open ($fd, "-|", $GIT, "annotate", '-l', '-t', '-r', $file_name, $hash_base) open ($fd, "-|", $GIT, "annotate", '-l', '-t', '-r', $file_name, $hash_base)
or die_error(undef, "Open failed."); or die_error(undef, "Open git-annotate failed.");
git_header_html(); git_header_html();
print "<div class=\"page_nav\">\n" . print "<div class=\"page_nav\">\n" .
$cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=summary")}, "summary") . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=summary")}, "summary") .
@ -1609,7 +1609,8 @@ sub git_blob_plain {
} }
} }
my $type = shift; 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); $type ||= git_blob_plain_mimetype($fd, $file_name);
@ -1641,7 +1642,8 @@ sub git_blob {
} }
} }
my $have_blame = git_get_project_config_bool ('blame'); 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, "Couldn't cat $file_name, $hash.");
my $mimetype = git_blob_plain_mimetype($fd, $file_name); my $mimetype = git_blob_plain_mimetype($fd, $file_name);
if ($mimetype !~ m/^text\//) { if ($mimetype !~ m/^text\//) {
close $fd; close $fd;
@ -1705,7 +1707,8 @@ sub git_tree {
} }
} }
$/ = "\0"; $/ = "\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>); chomp (my (@entries) = <$fd>);
close $fd or die_error(undef, "Reading tree failed."); close $fd or die_error(undef, "Reading tree failed.");
$/ = "\n"; $/ = "\n";
@ -1787,7 +1790,7 @@ sub git_tree {
sub git_rss { sub git_rss {
# http://www.notestips.com/80256B3A007F2692/1/NAMO5P9UPQ # http://www.notestips.com/80256B3A007F2692/1/NAMO5P9UPQ
open my $fd, "-|", $GIT, "rev-list", "--max-count=150", git_read_head($project) open my $fd, "-|", $GIT, "rev-list", "--max-count=150", git_read_head($project)
or die_error(undef, "Open failed."); or die_error(undef, "Open git-rev-list failed.");
my (@revlist) = map { chomp; $_ } <$fd>; my (@revlist) = map { chomp; $_ } <$fd>;
close $fd or die_error(undef, "Reading rev-list failed."); close $fd or die_error(undef, "Reading rev-list failed.");
print $cgi->header(-type => 'text/xml', -charset => 'utf-8'); print $cgi->header(-type => 'text/xml', -charset => 'utf-8');
@ -1895,7 +1898,8 @@ sub git_log {
" | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=tree;h=$hash;hb=$hash")}, "tree") . "<br/>\n"; " | " . $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))); 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 git-rev-list failed.");
my (@revlist) = map { chomp; $_ } <$fd>; my (@revlist) = map { chomp; $_ } <$fd>;
close $fd; close $fd;
@ -1985,7 +1989,7 @@ sub git_commit {
$parent = "--root"; $parent = "--root";
} }
open my $fd, "-|", $GIT, "diff-tree", '-r', '-M', $parent, $hash open my $fd, "-|", $GIT, "diff-tree", '-r', '-M', $parent, $hash
or die_error(undef, "Open failed."); or die_error(undef, "Open git-diff-tree failed.");
@difftree = map { chomp; $_ } <$fd>; @difftree = map { chomp; $_ } <$fd>;
close $fd or die_error(undef, "Reading git-diff-tree failed."); close $fd or die_error(undef, "Reading git-diff-tree failed.");
@ -2232,7 +2236,7 @@ sub git_commitdiff {
$hash_parent = $co{'parent'}; $hash_parent = $co{'parent'};
} }
open my $fd, "-|", $GIT, "diff-tree", '-r', $hash_parent, $hash open my $fd, "-|", $GIT, "diff-tree", '-r', $hash_parent, $hash
or die_error(undef, "Open failed."); or die_error(undef, "Open git-diff-tree failed.");
my (@difftree) = map { chomp; $_ } <$fd>; my (@difftree) = map { chomp; $_ } <$fd>;
close $fd or die_error(undef, "Reading diff-tree failed."); close $fd or die_error(undef, "Reading diff-tree failed.");
@ -2323,7 +2327,7 @@ sub git_commitdiff {
sub git_commitdiff_plain { sub git_commitdiff_plain {
mkdir($git_temp, 0700); mkdir($git_temp, 0700);
open my $fd, "-|", $GIT, "diff-tree", '-r', $hash_parent, $hash open my $fd, "-|", $GIT, "diff-tree", '-r', $hash_parent, $hash
or die_error(undef, "Open failed."); or die_error(undef, "Open git-diff-tree failed.");
my (@difftree) = map { chomp; $_ } <$fd>; my (@difftree) = map { chomp; $_ } <$fd>;
close $fd or die_error(undef, "Reading diff-tree failed."); close $fd or die_error(undef, "Reading diff-tree failed.");
@ -2616,7 +2620,8 @@ sub git_shortlog {
" | " . $cgi->a({-href => "$my_uri?" . esc_param("p=$project;a=tree;h=$hash;hb=$hash")}, "tree") . "<br/>\n"; " | " . $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))); 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 git-rev-list failed.");
my (@revlist) = map { chomp; $_ } <$fd>; my (@revlist) = map { chomp; $_ } <$fd>;
close $fd; close $fd;