gitweb: start to generate PATH_INFO URLs.

Instead of providing the project as a ?p= parameter it is simply appended to
the base URI.  All other parameters are appended to that, except for ?a=summary
which is the default and can be omitted.

The this can be enabled with the "pathinfo" feature in gitweb_config.perl.

[jc: let's introduce new features disabled by default not to
 upset too many existing installations.]

Signed-off-by: Martin Waitz <redacted>
Signed-off-by: Junio C Hamano <redacted>

diff --git a/gitweb.perl b/gitweb.perl
index 590ebddff3ceea70fbfe98b6a42c9e289c5d1437cfa0cd3df4281ef08bc3656c..01e98defd04bcc5a5d09a7c5072084eeb730176519d7f3fd6ce65c64a4d0857f 100755 (executable)
--- a/gitweb.perl
+++ b/gitweb.perl
@@ -102,6 +102,10 @@ our %feature = (
                'sub' => \&feature_pickaxe,
                'override' => 0,
                'default' => [1]},
                'sub' => \&feature_pickaxe,
                'override' => 0,
                'default' => [1]},

+
+       'pathinfo' => {
+               'override' => 0,
+               'default' => [0]},

 );
 
 sub gitweb_check_feature {
 );
 
 sub gitweb_check_feature {


@@ -375,6 +379,7 @@ exit;
 
 sub href(%) {
        my %params = @_;
 
 sub href(%) {
        my %params = @_;

+       my $href = $my_uri;

 
        my @mapping = (
                project => "p",
 
        my @mapping = (
                project => "p",


@@ -393,6 +398,19 @@ sub href(%) {
 
        $params{'project'} = $project unless exists $params{'project'};
 
 
        $params{'project'} = $project unless exists $params{'project'};
 

+       my ($use_pathinfo) = gitweb_check_feature('pathinfo');
+       if ($use_pathinfo) {
+               # use PATH_INFO for project name
+               $href .= "/$params{'project'}" if defined $params{'project'};
+               delete $params{'project'};
+
+               # Summary just uses the project path URL
+               if (defined $params{'action'} && $params{'action'} eq 'summary') {
+                       delete $params{'action'};
+               }
+       }
+
+       # now encode the parameters explicitly

        my @result = ();
        for (my $i = 0; $i < @mapping; $i += 2) {
                my ($name, $symbol) = ($mapping[$i], $mapping[$i+1]);
        my @result = ();
        for (my $i = 0; $i < @mapping; $i += 2) {
                my ($name, $symbol) = ($mapping[$i], $mapping[$i+1]);


@@ -400,7 +418,9 @@ sub href(%) {
                        push @result, $symbol . "=" . esc_param($params{$name});
                }
        }
                        push @result, $symbol . "=" . esc_param($params{$name});
                }
        }

-       return "$my_uri?" . join(';', @result);
+       $href .= "?" . join(';', @result) if scalar @result;
+
+       return $href;

 }
 
 
 }