gitweb: Add example of config file and how to generate projects list to gitweb/INSTALL

[Gitweb] / gitweb.perl

diff --git a/gitweb.perl b/gitweb.perl
index 357c624b8ec6ba9af39745dba56ee16720baba7b25e6a9f10e6b5e35e55054ff..87a1378ea243d224c05feb4d98a7b54a27cd009865c3915a7da85de35144dc27 100755 (executable)
--- a/gitweb.perl
+++ b/gitweb.perl
@@ -592,7 +592,7 @@ sub esc_html ($;%) {
        my %opts = @_;
 
        $str = to_utf8($str);
        my %opts = @_;
 
        $str = to_utf8($str);

-       $str = escapeHTML($str);
+       $str = $cgi->escapeHTML($str);

        if ($opts{'-nbsp'}) {
                $str =~ s/ / /g;
        }
        if ($opts{'-nbsp'}) {
                $str =~ s/ / /g;
        }


@@ -606,7 +606,7 @@ sub esc_path {
        my %opts = @_;
 
        $str = to_utf8($str);
        my %opts = @_;
 
        $str = to_utf8($str);

-       $str = escapeHTML($str);
+       $str = $cgi->escapeHTML($str);

        if ($opts{'-nbsp'}) {
                $str =~ s/ / /g;
        }
        if ($opts{'-nbsp'}) {
                $str =~ s/ / /g;
        }


@@ -835,7 +835,7 @@ sub file_type_long {
 
 ## ----------------------------------------------------------------------
 ## functions returning short HTML fragments, or transforming HTML fragments
 
 ## ----------------------------------------------------------------------
 ## functions returning short HTML fragments, or transforming HTML fragments

-## which don't beling to other sections
+## which don't belong to other sections

 
 # format line of commit message.
 sub format_log_line_html {
 
 # format line of commit message.
 sub format_log_line_html {


@@ -987,7 +987,7 @@ sub git_get_project_config {
        $key =~ s/^gitweb\.//;
        return if ($key =~ m/\W/);
 
        $key =~ s/^gitweb\.//;
        return if ($key =~ m/\W/);
 

-       my @x = (git_cmd(), 'repo-config');
+       my @x = (git_cmd(), 'config');

        if (defined $type) { push @x, $type; }
        push @x, "--get";
        push @x, "gitweb.$key";
        if (defined $type) { push @x, $type; }
        push @x, "--get";
        push @x, "gitweb.$key";


@@ -1691,7 +1691,7 @@ sub git_header_html {
 
        my $title = "$site_name";
        if (defined $project) {
 
        my $title = "$site_name";
        if (defined $project) {

-               $title .= " - $project";
+               $title .= " - " . to_utf8($project);

                if (defined $action) {
                        $title .= "/$action";
                        if (defined $file_name) {
                if (defined $action) {
                        $title .= "/$action";
                        if (defined $file_name) {


@@ -1964,7 +1964,7 @@ sub git_print_page_path {
 
        print "<div class=\"page_path\">";
        print $cgi->a({-href => href(action=>"tree", hash_base=>$hb),
 
        print "<div class=\"page_path\">";
        print $cgi->a({-href => href(action=>"tree", hash_base=>$hb),

-                     -title => 'tree root'}, "[$project]");
+                     -title => 'tree root'}, to_utf8("[$project]"));

        print " / ";
        if (defined $name) {
                my @dirname = split '/', $name;
        print " / ";
        if (defined $name) {
                my @dirname = split '/', $name;


@@ -1975,17 +1975,17 @@ sub git_print_page_path {
                        $fullname .= ($fullname ? '/' : '') . $dir;
                        print $cgi->a({-href => href(action=>"tree", file_name=>$fullname,
                                                     hash_base=>$hb),
                        $fullname .= ($fullname ? '/' : '') . $dir;
                        print $cgi->a({-href => href(action=>"tree", file_name=>$fullname,
                                                     hash_base=>$hb),

-                                     -title => esc_html($fullname)}, esc_path($dir));
+                                     -title => $fullname}, esc_path($dir));

                        print " / ";
                }
                if (defined $type && $type eq 'blob') {
                        print $cgi->a({-href => href(action=>"blob_plain", file_name=>$file_name,
                                                     hash_base=>$hb),
                        print " / ";
                }
                if (defined $type && $type eq 'blob') {
                        print $cgi->a({-href => href(action=>"blob_plain", file_name=>$file_name,
                                                     hash_base=>$hb),

-                                     -title => esc_html($name)}, esc_path($basename));
+                                     -title => $name}, esc_path($basename));

                } elsif (defined $type && $type eq 'tree') {
                        print $cgi->a({-href => href(action=>"tree", file_name=>$file_name,
                                                     hash_base=>$hb),
                } elsif (defined $type && $type eq 'tree') {
                        print $cgi->a({-href => href(action=>"tree", file_name=>$file_name,
                                                     hash_base=>$hb),

-                                     -title => esc_html($name)}, esc_path($basename));
+                                     -title => $name}, esc_path($basename));

                        print " / ";
                } else {
                        print esc_path($basename);
                        print " / ";
                } else {
                        print esc_path($basename);


@@ -2413,7 +2413,6 @@ sub git_patchset_body {
 
                        push @diff_header, $patch_line;
                }
 
                        push @diff_header, $patch_line;
                }

-               #last PATCH unless $patch_line;

                my $last_patch_line = $patch_line;
 
                # check if current patch belong to current raw line
                my $last_patch_line = $patch_line;
 
                # check if current patch belong to current raw line


@@ -2523,7 +2522,10 @@ sub git_patchset_body {
 
                # from-file/to-file diff header
                $patch_line = $last_patch_line;
 
                # from-file/to-file diff header
                $patch_line = $last_patch_line;

-               last PATCH unless $patch_line;
+               if (! $patch_line) {
+                       print "</div>\n"; # class="patch"
+                       last PATCH;
+               }

                next PATCH if ($patch_line =~ m/^diff /);
                #assert($patch_line =~ m/^---/) if DEBUG;
                if ($from{'href'} && $patch_line =~ m!^--- "?a/!) {
                next PATCH if ($patch_line =~ m/^diff /);
                #assert($patch_line =~ m/^---/) if DEBUG;
                if ($from{'href'} && $patch_line =~ m!^--- "?a/!) {


@@ -2534,7 +2536,6 @@ sub git_patchset_body {
                print "<div class=\"diff from_file\">$patch_line</div>\n";
 
                $patch_line = <$fd>;
                print "<div class=\"diff from_file\">$patch_line</div>\n";
 
                $patch_line = <$fd>;

-               #last PATCH unless $patch_line;

                chomp $patch_line;
 
                #assert($patch_line =~ m/^+++/) if DEBUG;
                chomp $patch_line;
 
                #assert($patch_line =~ m/^+++/) if DEBUG;


@@ -3610,7 +3611,7 @@ sub git_snapshot {
                $hash = git_get_head_hash($project);
        }
 
                $hash = git_get_head_hash($project);
        }
 

-       my $filename = basename($project) . "-$hash.tar.$suffix";
+       my $filename = to_utf8(basename($project)) . "-$hash.tar.$suffix";

 
        print $cgi->header(
                -type => "application/$ctype",
 
        print $cgi->header(
                -type => "application/$ctype",


@@ -3719,7 +3720,7 @@ sub git_commit {
                $formats_nav .=
                        '(merge: ' .
                        join(' ', map {
                $formats_nav .=
                        '(merge: ' .
                        join(' ', map {

-                               $cgi->a({-href => href(action=>"commitdiff",
+                               $cgi->a({-href => href(action=>"commit",

                                                       hash=>$_)},
                                        esc_html(substr($_, 0, 7)));
                        } @$parents ) .
                                                       hash=>$_)},
                                        esc_html(substr($_, 0, 7)));
                        } @$parents ) .