gitweb: Fix handling of $file_name in feed generation

[Gitweb] / gitweb.perl

diff --git a/gitweb.perl b/gitweb.perl
index 5939fc6d7cfb28f50980a66ea16ab083d7d00b28bd0658040f012acedbd58b5a..74edff9a9686f21f2f83eb584fceb07be085ee5062807e1ce96a1b36d7b35617 100755 (executable)
--- a/gitweb.perl
+++ b/gitweb.perl
@@ -437,12 +437,11 @@ my %allowed_options = (
 
 our @extra_options = $cgi->param('opt');
 if (defined @extra_options) {
 
 our @extra_options = $cgi->param('opt');
 if (defined @extra_options) {

-       foreach(@extra_options)
-       {
-               if (not grep(/^$_$/, keys %allowed_options)) {
+       foreach my $opt (@extra_options) {
+               if (not exists $allowed_options{$opt}) {

                        die_error(undef, "Invalid option parameter");
                }
                        die_error(undef, "Invalid option parameter");
                }

-               if (not grep(/^$action$/, @{$allowed_options{$_}})) {
+               if (not grep(/^$action$/, @{$allowed_options{$opt}})) {

                        die_error(undef, "Invalid option parameter for this action");
                }
        }
                        die_error(undef, "Invalid option parameter for this action");
                }
        }


@@ -599,7 +598,6 @@ sub href(%) {
                action => "a",
                file_name => "f",
                file_parent => "fp",
                action => "a",
                file_name => "f",
                file_parent => "fp",

-               extra_options => "opt",

                hash => "h",
                hash_parent => "hp",
                hash_base => "hb",
                hash => "h",
                hash_parent => "hp",
                hash_base => "hb",


@@ -609,6 +607,7 @@ sub href(%) {
                searchtext => "s",
                searchtype => "st",
                snapshot_format => "sf",
                searchtext => "s",
                searchtype => "st",
                snapshot_format => "sf",

+               extra_options => "opt",

        );
        my %mapping = @mapping;
 
        );
        my %mapping = @mapping;
 


@@ -631,7 +630,13 @@ sub href(%) {
        for (my $i = 0; $i < @mapping; $i += 2) {
                my ($name, $symbol) = ($mapping[$i], $mapping[$i+1]);
                if (defined $params{$name}) {
        for (my $i = 0; $i < @mapping; $i += 2) {
                my ($name, $symbol) = ($mapping[$i], $mapping[$i+1]);
                if (defined $params{$name}) {

-                       push @result, $symbol . "=" . esc_param($params{$name});
+                       if (ref($params{$name}) eq "ARRAY") {
+                               foreach my $par (@{$params{$name}}) {
+                                       push @result, $symbol . "=" . esc_param($par);
+                               }
+                       } else {
+                               push @result, $symbol . "=" . esc_param($params{$name});
+                       }

                }
        }
        $href .= "?" . join(';', @result) if scalar @result;
                }
        }
        $href .= "?" . join(';', @result) if scalar @result;


@@ -891,11 +896,25 @@ sub age_string {
        return $age_str;
 }
 
        return $age_str;
 }
 

+use constant {
+       S_IFINVALID => 0030000,
+       S_IFGITLINK => 0160000,
+};
+
+# submodule/subproject, a commit object reference
+sub S_ISGITLINK($) {
+       my $mode = shift;
+
+       return (($mode & S_IFMT) == S_IFGITLINK)
+}
+

 # convert file mode in octal to symbolic file mode string
 sub mode_str {
        my $mode = oct shift;
 
 # convert file mode in octal to symbolic file mode string
 sub mode_str {
        my $mode = oct shift;
 

-       if (S_ISDIR($mode & S_IFMT)) {
+       if (S_ISGITLINK($mode)) {
+               return 'm---------';
+       } elsif (S_ISDIR($mode & S_IFMT)) {

                return 'drwxr-xr-x';
        } elsif (S_ISLNK($mode)) {
                return 'lrwxrwxrwx';
                return 'drwxr-xr-x';
        } elsif (S_ISLNK($mode)) {
                return 'lrwxrwxrwx';


@@ -921,7 +940,9 @@ sub file_type {
                $mode = oct $mode;
        }
 
                $mode = oct $mode;
        }
 

-       if (S_ISDIR($mode & S_IFMT)) {
+       if (S_ISGITLINK($mode)) {
+               return "submodule";
+       } elsif (S_ISDIR($mode & S_IFMT)) {

                return "directory";
        } elsif (S_ISLNK($mode)) {
                return "symlink";
                return "directory";
        } elsif (S_ISLNK($mode)) {
                return "symlink";


@@ -942,7 +963,9 @@ sub file_type_long {
                $mode = oct $mode;
        }
 
                $mode = oct $mode;
        }
 

-       if (S_ISDIR($mode & S_IFMT)) {
+       if (S_ISGITLINK($mode)) {
+               return "submodule";
+       } elsif (S_ISDIR($mode & S_IFMT)) {

                return "directory";
        } elsif (S_ISLNK($mode)) {
                return "symlink";
                return "directory";
        } elsif (S_ISLNK($mode)) {
                return "symlink";


@@ -1493,6 +1516,7 @@ sub git_get_projects_list {
 
                File::Find::find({
                        follow_fast => 1, # follow symbolic links
 
                File::Find::find({
                        follow_fast => 1, # follow symbolic links

+                       follow_skip => 2, # ignore duplicates

                        dangling_symlinks => 0, # ignore dangling symlinks, silently
                        wanted => sub {
                                # skip project-list toplevel, if we get it.
                        dangling_symlinks => 0, # ignore dangling symlinks, silently
                        wanted => sub {
                                # skip project-list toplevel, if we get it.


@@ -2268,9 +2292,17 @@ EOF
                printf('<link rel="alternate" title="%s log RSS feed" '.
                       'href="%s" type="application/rss+xml" />'."\n",
                       esc_param($project), href(action=>"rss"));
                printf('<link rel="alternate" title="%s log RSS feed" '.
                       'href="%s" type="application/rss+xml" />'."\n",
                       esc_param($project), href(action=>"rss"));

+               printf('<link rel="alternate" title="%s log RSS feed (no merges)" '.
+                      'href="%s" type="application/rss+xml" />'."\n",
+                      esc_param($project), href(action=>"rss",
+                                                extra_options=>"--no-merges"));

                printf('<link rel="alternate" title="%s log Atom feed" '.
                       'href="%s" type="application/atom+xml" />'."\n",
                       esc_param($project), href(action=>"atom"));
                printf('<link rel="alternate" title="%s log Atom feed" '.
                       'href="%s" type="application/atom+xml" />'."\n",
                       esc_param($project), href(action=>"atom"));

+               printf('<link rel="alternate" title="%s log Atom feed (no merges)" '.
+                      'href="%s" type="application/atom+xml" />'."\n",
+                      esc_param($project), href(action=>"atom",
+                                                extra_options=>"--no-merges"));

        } else {
                printf('<link rel="alternate" title="%s projects list" '.
                       'href="%s" type="text/plain; charset=utf-8"/>'."\n",
        } else {
                printf('<link rel="alternate" title="%s projects list" '.
                       'href="%s" type="text/plain; charset=utf-8"/>'."\n",


@@ -2708,6 +2740,20 @@ sub git_print_tree_entry {
                                      "history");
                }
                print "</td>\n";
                                      "history");
                }
                print "</td>\n";

+       } else {
+               # unknown object: we can only present history for it
+               # (this includes 'commit' object, i.e. submodule support)
+               print "<td class=\"list\">" .
+                     esc_path($t->{'name'}) .
+                     "</td>\n";
+               print "<td class=\"link\">";
+               if (defined $hash_base) {
+                       print $cgi->a({-href => href(action=>"history",
+                                                    hash_base=>$hash_base,
+                                                    file_name=>"$basedir$t->{'name'}")},
+                                     "history");
+               }
+               print "</td>\n";

        }
 }
 
        }
 }
 


@@ -4344,7 +4390,7 @@ sub git_snapshot {
        my $cmd;
        $filename .= "-$hash$known_snapshot_formats{$format}{'suffix'}";
        $cmd = "$git_command archive " .
        my $cmd;
        $filename .= "-$hash$known_snapshot_formats{$format}{'suffix'}";
        $cmd = "$git_command archive " .

-               "--format=$known_snapshot_formats{$format}{'format'}" .
+               "--format=$known_snapshot_formats{$format}{'format'} " .

                "--prefix=\'$name\'/ $hash";
        if (exists $known_snapshot_formats{$format}{'compressor'}) {
                $cmd .= ' | ' . join ' ', @{$known_snapshot_formats{$format}{'compressor'}};
                "--prefix=\'$name\'/ $hash";
        if (exists $known_snapshot_formats{$format}{'compressor'}) {
                $cmd .= ' | ' . join ' ', @{$known_snapshot_formats{$format}{'compressor'}};


@@ -5321,7 +5367,7 @@ sub git_feed {
 
        # log/feed of current (HEAD) branch, log of given branch, history of file/directory
        my $head = $hash || 'HEAD';
 
        # log/feed of current (HEAD) branch, log of given branch, history of file/directory
        my $head = $hash || 'HEAD';

-       my @commitlist = parse_commits($head, 150);
+       my @commitlist = parse_commits($head, 150, 0, undef, $file_name);

 
        my %latest_commit;
        my %latest_date;
 
        my %latest_commit;
        my %latest_date;