git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH 6/9] gitweb: No periods for error messages

From
LTLuben Tuikov <ltuikov@yahoo.com>
Date
Aug 5, 2006, 15:55 UTC
Message-ID
<20060805155504.6832.qmail@web31807.mail.mud.yahoo.com>
In-Reply-To
<eb1ug6$8ti$2@sea.gmane.org>
--- Jakub Narebski <jnareb@gmail.com> wrote:
> Signed-off-by: Jakub Narebski <jnareb@gmail.com>
> ---
> Like in Luben Tuikov patch
Good work!

I see this patch bears identical Subject line and is logically identical as the one I posted.

Maybe you ment to include the above line above your
Signed-off-by: line?
    Luben
Show 339 quoted lines
> 
>  gitweb/gitweb.perl |   92 ++++++++++++++++++++++++++--------------------------
>  1 files changed, 46 insertions(+), 46 deletions(-)
> 
> diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
> index 8773a8d..d8ba016 100755
> --- a/gitweb/gitweb.perl
> +++ b/gitweb/gitweb.perl
> @@ -76,7 +76,7 @@ # input validation and dispatch
>  our $action = $cgi->param('a');
>  if (defined $action) {
>         if ($action =~ m/[^0-9a-zA-Z\.\-_]/) {
> -               die_error(undef, "Invalid action parameter.");
> +               die_error(undef, "Invalid action parameter");
>         }
>         # action which does not check rest of parameters
>         if ($action eq "opml") {
> @@ -89,13 +89,13 @@ our $project = ($cgi->param('p') || $ENV
>  if (defined $project) {
>         $project =~ s|^/||; $project =~ s|/$||;
>         if (!validate_input($project)) {
> -               die_error(undef, "Invalid project parameter.");
> +               die_error(undef, "Invalid project parameter");
>         }
>         if (!(-d "$projectroot/$project")) {
> -               die_error(undef, "No such directory.");
> +               die_error(undef, "No such directory");
>         }
>         if (!(-e "$projectroot/$project/HEAD")) {
> -               die_error(undef, "No such project.");
> +               die_error(undef, "No such project");
>         }
>         $rss_link = "<link rel=\"alternate\" title=\"" . esc_param($project) . " log\" href=\""
> .
>                     "$my_uri?" . esc_param("p=$project;a=rss") . "\"
> type=\"application/rss+xml\"/>";
> @@ -108,42 +108,42 @@ if (defined $project) {
>  our $file_name = $cgi->param('f');
>  if (defined $file_name) {
>         if (!validate_input($file_name)) {
> -               die_error(undef, "Invalid file parameter.");
> +               die_error(undef, "Invalid file parameter");
>         }
>  }
>  
>  our $hash = $cgi->param('h');
>  if (defined $hash) {
>         if (!validate_input($hash)) {
> -               die_error(undef, "Invalid hash parameter.");
> +               die_error(undef, "Invalid hash parameter");
>         }
>  }
>  
>  our $hash_parent = $cgi->param('hp');
>  if (defined $hash_parent) {
>         if (!validate_input($hash_parent)) {
> -               die_error(undef, "Invalid hash parent parameter.");
> +               die_error(undef, "Invalid hash parent parameter");
>         }
>  }
>  
>  our $hash_base = $cgi->param('hb');
>  if (defined $hash_base) {
>         if (!validate_input($hash_base)) {
> -               die_error(undef, "Invalid hash base parameter.");
> +               die_error(undef, "Invalid hash base parameter");
>         }
>  }
>  
>  our $page = $cgi->param('pg');
>  if (defined $page) {
>         if ($page =~ m/[^0-9]$/) {
> -               die_error(undef, "Invalid page parameter.");
> +               die_error(undef, "Invalid page parameter");
>         }
>  }
>  
>  our $searchtext = $cgi->param('s');
>  if (defined $searchtext) {
>         if ($searchtext =~ m/[^a-zA-Z0-9_\.\/\-\+\:\@ ]/) {
> -               die_error(undef, "Invalid search parameter.");
> +               die_error(undef, "Invalid search parameter");
>         }
>         $searchtext = quotemeta $searchtext;
>  }
> @@ -172,7 +172,7 @@ my %actions = (
>  
>  $action = 'summary' if (!defined($action));
>  if (!defined($actions{$action})) {
> -       die_error(undef, "Unknown action.");
> +       die_error(undef, "Unknown action");
>  }
>  $actions{$action}->();
>  exit;
> @@ -418,7 +418,7 @@ sub git_get_hash_by_path {
>         my $tree = $base;
>  
>         open my $fd, "-|", $GIT, "ls-tree", $base, "--", $path
> -               or die_error(undef, "Open git-ls-tree failed.");
> +               or die_error(undef, "Open git-ls-tree failed");
>         my $line = <$fd>;
>         close $fd or return undef;
>  
> @@ -1265,13 +1265,13 @@ ## actions
>  sub git_project_list {
>         my $order = $cgi->param('o');
>         if (defined $order && $order !~ m/project|descr|owner|age/) {
> -               die_error(undef, "Invalid order parameter '$order'.");
> +               die_error(undef, "Invalid order parameter '$order'");
>         }
>  
>         my @list = git_read_projects();
>         my @projects;
>         if (!@list) {
> -               die_error(undef, "No projects found.");
> +               die_error(undef, "No projects found");
>         }
>         foreach my $pr (@list) {
>                 my $head = git_read_head($pr->{'path'});
> @@ -1405,7 +1405,7 @@ sub git_summary {
>               "</table>\n";
>  
>         open my $fd, "-|", $GIT, "rev-list", "--max-count=17", git_read_head($project)
> -               or die_error(undef, "Open git-rev-list failed.");
> +               or die_error(undef, "Open git-rev-list failed");
>         my @revlist = map { chomp; $_ } <$fd>;
>         close $fd;
>         git_header_div('shortlog');
> @@ -1461,10 +1461,10 @@ sub git_tag {
>  sub git_blame2 {
>         my $fd;
>         my $ftype;
> -       die_error(undef, "Permission denied.") if (!git_get_project_config_bool ('blame'));
> +       die_error(undef, "Permission denied") if (!git_get_project_config_bool ('blame'));
>         die_error('404 Not Found', "File name not defined") if (!$file_name);
>         $hash_base ||= git_read_head($project);
> -       die_error(undef, "Couldn't find base commit.") unless ($hash_base);
> +       die_error(undef, "Couldn't find base commit") unless ($hash_base);
>         my %co = git_read_commit($hash_base)
>                 or die_error(undef, "Reading commit failed");
>         if (!defined $hash) {
> @@ -1476,7 +1476,7 @@ sub git_blame2 {
>                 die_error("400 Bad Request", "Object is not a blob");
>         }
>         open ($fd, "-|", $GIT, "blame", '-l', $file_name, $hash_base)
> -               or die_error(undef, "Open git-blame failed.");
> +               or die_error(undef, "Open git-blame failed");
>         git_header_html();
>         my $formats_nav =
>                 $cgi->a({-href => "$my_uri?" .
> esc_param("p=$project;a=blob;h=$hash;hb=$hash_base;f=$file_name")}, "blob") .
> @@ -1519,18 +1519,18 @@ sub git_blame2 {
>  
>  sub git_blame {
>         my $fd;
> -       die_error('403 Permission denied', "Permission denied.") if
> (!git_get_project_config_bool ('blame'));
> -       die_error('404 Not Found', "File name not defined.") if (!$file_name);
> +       die_error('403 Permission denied', "Permission denied") if (!git_get_project_config_bool
> ('blame'));
> +       die_error('404 Not Found', "File name not defined") if (!$file_name);
>         $hash_base ||= git_read_head($project);
> -       die_error(undef, "Couldn't find base commit.") unless ($hash_base);
> +       die_error(undef, "Couldn't find base commit") unless ($hash_base);
>         my %co = git_read_commit($hash_base)
> -               or die_error(undef, "Reading commit failed.");
> +               or die_error(undef, "Reading commit failed");
>         if (!defined $hash) {
>                 $hash = git_get_hash_by_path($hash_base, $file_name, "blob")
> -                       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)
> -               or die_error(undef, "Open git-annotate failed.");
> +               or die_error(undef, "Open git-annotate failed");
>         git_header_html();
>         my $formats_nav =
>                 $cgi->a({-href => "$my_uri?" .
> esc_param("p=$project;a=blob;h=$hash;hb=$hash_base;f=$file_name")}, "blob") .
> @@ -1640,9 +1640,9 @@ sub git_blob_plain {
>                 if (defined $file_name) {
>                         my $base = $hash_base || git_read_head($project);
>                         $hash = git_get_hash_by_path($base, $file_name, "blob")
> -                               or die_error(undef, "Error lookup file.");
> +                               or die_error(undef, "Error lookup file");
>                 } else {
> -                       die_error(undef, "No file name defined.");
> +                       die_error(undef, "No file name defined");
>                 }
>         }
>         my $type = shift;
> @@ -1673,14 +1673,14 @@ sub git_blob {
>                 if (defined $file_name) {
>                         my $base = $hash_base || git_read_head($project);
>                         $hash = git_get_hash_by_path($base, $file_name, "blob")
> -                               or die_error(undef, "Error lookup file.");
> +                               or die_error(undef, "Error lookup file");
>                 } else {
> -                       die_error(undef, "No file name defined.");
> +                       die_error(undef, "No file name defined");
>                 }
>         }
>         my $have_blame = git_get_project_config_bool ('blame');
>         open my $fd, "-|", $GIT, "cat-file", "blob", $hash
> -               or die_error(undef, "Couldn't cat $file_name, $hash.");
> +               or die_error(undef, "Couldn't cat $file_name, $hash");
>         my $mimetype = git_blob_plain_mimetype($fd, $file_name);
>         if ($mimetype !~ m/^text\//) {
>                 close $fd;
> @@ -1738,9 +1738,9 @@ sub git_tree {
>         }
>         $/ = "\0";
>         open my $fd, "-|", $GIT, "ls-tree", '-z', $hash
> -               or die_error(undef, "Open git-ls-tree failed.");
> +               or die_error(undef, "Open git-ls-tree failed");
>         my @entries = map { chomp; $_ } <$fd>;
> -       close $fd or die_error(undef, "Reading tree failed.");
> +       close $fd or die_error(undef, "Reading tree failed");
>         $/ = "\n";
>  
>         my $refs = read_info_ref();
> @@ -1816,7 +1816,7 @@ sub git_log {
>  
>         my $limit = sprintf("--max-count=%i", (100 * ($page+1)));
>         open my $fd, "-|", $GIT, "rev-list", $limit, $hash
> -               or die_error(undef, "Open git-rev-list failed.");
> +               or die_error(undef, "Open git-rev-list failed");
>         my @revlist = map { chomp; $_ } <$fd>;
>         close $fd;
>  
> @@ -1877,7 +1877,7 @@ sub git_log {
>  sub git_commit {
>         my %co = git_read_commit($hash);
>         if (!%co) {
> -               die_error(undef, "Unknown commit object.");
> +               die_error(undef, "Unknown commit object");
>         }
>         my %ad = date_str($co{'author_epoch'}, $co{'author_tz'});
>         my %cd = date_str($co{'committer_epoch'}, $co{'committer_tz'});
> @@ -1887,9 +1887,9 @@ sub git_commit {
>                 $parent = "--root";
>         }
>         open my $fd, "-|", $GIT, "diff-tree", '-r', '-M', $parent, $hash
> -               or die_error(undef, "Open git-diff-tree failed.");
> +               or die_error(undef, "Open git-diff-tree failed");
>         my @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");
>  
>         # non-textual hash id's can be cached
>         my $expires;
> @@ -2105,15 +2105,15 @@ sub git_commitdiff {
>         mkdir($git_temp, 0700);
>         my %co = git_read_commit($hash);
>         if (!%co) {
> -               die_error(undef, "Unknown commit object.");
> +               die_error(undef, "Unknown commit object");
>         }
>         if (!defined $hash_parent) {
>                 $hash_parent = $co{'parent'};
>         }
>         open my $fd, "-|", $GIT, "diff-tree", '-r', $hash_parent, $hash
> -               or die_error(undef, "Open git-diff-tree failed.");
> +               or die_error(undef, "Open git-diff-tree failed");
>         my @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");
>  
>         # non-textual hash id's can be cached
>         my $expires;
> @@ -2191,9 +2191,9 @@ 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 git-diff-tree failed.");
> +               or die_error(undef, "Open git-diff-tree failed");
>         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");
>  
>         # try to figure out the next tag after this commit
>         my $tagname;
> @@ -2251,7 +2251,7 @@ sub git_history {
>         my $ftype;
>         my %co = git_read_commit($hash_base);
>         if (!%co) {
> -               die_error(undef, "Unknown commit object.");
> +               die_error(undef, "Unknown commit object");
>         }
>         my $refs = read_info_ref();
>         git_header_html();
> @@ -2309,14 +2309,14 @@ sub git_history {
>  
>  sub git_search {
>         if (!defined $searchtext) {
> -               die_error(undef, "Text field empty.");
> +               die_error(undef, "Text field empty");
>         }
>         if (!defined $hash) {
>                 $hash = git_read_head($project);
>         }
>         my %co = git_read_commit($hash);
>         if (!%co) {
> -               die_error(undef, "Unknown commit object.");
> +               die_error(undef, "Unknown commit object");
>         }
>         # pickaxe may take all resources of your box and run for several minutes
>         # with every query - so decide by yourself how public you make this feature :)
> @@ -2454,7 +2454,7 @@ sub git_shortlog {
>  
>         my $limit = sprintf("--max-count=%i", (100 * ($page+1)));
>         open my $fd, "-|", $GIT, "rev-list", $limit, $hash
> -               or die_error(undef, "Open git-rev-list failed.");
> +               or die_error(undef, "Open git-rev-list failed");
>         my @revlist = map { chomp; $_ } <$fd>;
>         close $fd;
>  
> @@ -2482,9 +2482,9 @@ ## feeds (RSS, OPML)
>  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 git-rev-list failed.");
> +               or die_error(undef, "Open git-rev-list failed");
>         my @revlist = map { chomp; $_ } <$fd>;
> -       close $fd or die_error(undef, "Reading git-rev-list failed.");
> +       close $fd or die_error(undef, "Reading git-rev-list failed");
>         print $cgi->header(-type => 'text/xml', -charset => 'utf-8');
>         print "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n".
>               "<rss version=\"2.0\"
> xmlns:content=\"http://purl.org/rss/1.0/modules/content/\">\n";
> -- 
> 1.4.1.1
> 
> 
> -
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>
Previous: Jakub NarebskiNext: Jakub Narebski
Message 15 of 26 in “Some further gitweb patches”
  1. 0/5 Some further gitweb patchesJakub Narebski, Aug 4, 2006
  2. 1/5 gitweb: Cleanup input validation and error messagesJakub Narebski, Aug 4, 2006
  3. Luben TuikovAug 4, 2006
  4. 6/5 gitweb: No periods for error messagesJakub Narebski, Aug 5, 2006
  5. Luben TuikovAug 4, 2006
  6. Junio C HamanoAug 5, 2006
  7. Jakub NarebskiAug 5, 2006
  8. 0/9 gitweb: First patch corrected and split into separate patchesJakub Narebski, Aug 5, 2006
  9. 1/9 gitweb: Separate input validation and dispatch, add comment about opml actionJakub Narebski, Aug 5, 2006
  10. 2/9 gitweb: die_error first (optional) parameter is HTTP statusJakub Narebski, Aug 5, 2006
  11. 3/9 gitweb: Use undef for die_error to use default first (status) parameter valueJakub Narebski, Aug 5, 2006
  12. 4/9 gitweb: Don't undefine query parameter related variables before die_errorJakub Narebski, Aug 5, 2006
  13. 5/9 gitweb: Cleanup and uniquify error messagesJakub Narebski, Aug 5, 2006
  14. 6/9 gitweb: No periods for error messagesJakub Narebski, Aug 5, 2006
  15. Luben TuikovAug 5, 2006
  16. Jakub NarebskiAug 5, 2006
  17. 7/9 gitweb: No error messages with unescaped/unprotected user inputJakub Narebski, Aug 5, 2006
  18. 8/9 gitweb: PATH_INFO=/ means no projectJakub Narebski, Aug 5, 2006
  19. 9/9 gitweb: Inline $rss_linkJakub Narebski, Aug 5, 2006
  20. 2/5 gitweb: Great subroutines renamingJakub Narebski, Aug 4, 2006
  21. 3/5 gitweb: Separate ref parsing in git_read_refs into parse_refJakub Narebski, Aug 4, 2006
  22. 4/5 gitweb: git_heads cleanupJakub Narebski, Aug 4, 2006
  23. 5/5 gitweb: Change appereance of marker of refs pointing to given objectJakub Narebski, Aug 4, 2006
  24. 7/5 Merge changes in "split patch 1" seriesJakub Narebski, Aug 5, 2006
  25. Johannes SchindelinAug 5, 2006
  26. Jakub NarebskiAug 5, 2006

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.