delta/git.git/gitweb, branch jc/signed-commit

Merge branch 'jn/gitweb-manpages'

2011-10-19T04:59:11+00:00

* jn/gitweb-manpages:
  gitweb: Add gitweb manpages to 'gitweb' package in git.spec
  Documentation: Add gitweb config variables to git-config(1)
  Documentation: Link to gitweb(1) and gitweb.conf(5) in other manpages
  gitweb: Add gitweb(1) manpage for gitweb itself
  gitweb: Add gitweb.conf(5) manpage for gitweb configuration files

gitweb: Add gitweb(1) manpage for gitweb itself

2011-10-16T18:09:34+00:00

Most of what is in gitweb.txt it has been pulled directly from the
README and INSTALL files of gitweb.

Current version is somewhat based on structure of SVN::Web manpage
(one of web interfaces for Subversion).

gitweb.conf(5) i.e. gitweb configuration manpage now refers to
appropriate sections in gitweb(1).  gitweb/README now refers to
gitweb/INSTALL and gitweb(1) manpage.  gitweb/INSTALL now refers to
gitweb.conf(5) and gitweb(1).

Inspired-by: Drew Northup 
Signed-off-by: Jakub Narebski 
Signed-off-by: Junio C Hamano

gitweb: Add gitweb.conf(5) manpage for gitweb configuration files

2011-10-16T18:09:34+00:00

Much of what is in gitweb.conf.txt has been pulled directly from the
README file of gitweb.  The manpage was supplemented with description
of missing gitweb config variables, and with description of gitweb's
%features.

There remains a bit of redundancy, which should be reduced if
possible... but I think some of duplication of information is
inevitable.

[jn: Improved, extended, removed duplicate info from README]

Signed-off-by: Drew Northup 
Signed-off-by: Jakub Narebski 
Helped-by: Jonathan Nieder 
Signed-off-by: Junio C Hamano

Merge branch 'ps/gitweb-js-with-lineno'

2011-10-10T22:56:20+00:00

* ps/gitweb-js-with-lineno:
  gitweb: Fix links to lines in blobs when javascript-actions are enabled

gitweb: Fix links to lines in blobs when javascript-actions are enabled

2011-09-27T16:34:37+00:00

The fixLinks() function adds 'js=1' to each link that does not already
have 'js' query parameter specified. This is used to signal to gitweb
that the browser can actually do javascript when these links are used.

There are two problems with the existing code:

  1. URIs with fragment and 'js' query parameter, like e.g.

        ...foo?js=0#l199

     were not recognized as having 'js' query parameter already.

  2. The 'js' query parameter, in the form of either '?js=1' or ';js=1'
     was appended at the end of URI, even if it included a fragment
     (had a hash part).  This lead to the incorrect links like this

        ...foo#l199?js=1

     instead of adding query parameter as last part of query, but
     before the fragment part, i.e.

        ...foo?js=1#l199

Signed-off-by: Peter Stuge 
Acked-by: Jakub Narebski 
Signed-off-by: Junio C Hamano

gitweb: Strip non-printable characters from syntax highlighter output

2011-09-16T16:22:47+00:00

The current code, as is, passes control characters, such as form-feed
(^L) to highlight which then passes it through to the browser.  User
agents (web browsers) that support 'application/xhtml+xml' usually
require that web pages declared as XHTML and with this mimetype are
well-formed XML.  Unescaped control characters cannot appear within a
contents of a valid XML document.

This will cause the browser to display one of the following warnings:

* Safari v5.1 (6534.50) & Google Chrome v13.0.782.112:

   This page contains the following errors:

   error on line 657 at column 38: PCDATA invalid Char value 12
   Below is a rendering of the page up to the first error.

* Mozilla Firefox 3.6.19 & Mozilla Firefox 5.0:

   XML Parsing Error: not well-formed
   Location:
   http://path/to/git/repo/blah/blah

Both errors were generated by gitweb.perl v1.7.3.4 w/ highlight 2.7
using arch/ia64/kernel/unwind.c from the Linux kernel.

When syntax highlighter is not used, control characters are replaced
by esc_html(), but with syntax highlighter they were passed through to
browser (to_utf8() doesn't remove control characters).

Introduce sanitize() subroutine which strips forbidden characters, but
does not perform HTML escaping, and use it in git_blob() to sanitize
syntax highlighter output for XHTML.

Note that excluding "\t" (U+0009), "\n" (U+000A) and "\r" (U+000D) is
not strictly necessary, atleast for currently the only callsite: "\t"
tabs are replaced by spaces by untabify(), "\n" is stripped from each
line before processing it, and replacing "\r" could be considered
improvement.

Originally-by: Christopher M. Fuhrman 
Signed-off-by: Jakub Narebski 
Signed-off-by: Junio C Hamano

Merge branch 'jn/gitweb-config-list-case'

2011-08-08T19:33:35+00:00

* jn/gitweb-config-list-case:
  gitweb: Git config keys are case insensitive, make config search too

Merge branch 'jn/gitweb-system-config'

2011-08-08T19:33:34+00:00

* jn/gitweb-system-config:
  gitweb: Introduce common system-wide settings for convenience

gitweb: pass string after encoding in utf-8 to syntax highlighter

2011-08-04T19:13:38+00:00

Otherwise the highlight filter would work on a corrupt byte sequence.

Signed-off-by: 张忠山 
Acked-by: Jakub Narebski 
Signed-off-by: Junio C Hamano

gitweb: Git config keys are case insensitive, make config search too

2011-08-01T01:39:19+00:00

"git config -z -l" that gitweb uses in git_parse_project_config() to
populate %config hash returns section and key names of config
variables in lowercase (they are case insensitive).  When checking
%config in git_get_project_config() we have to take it into account.

Helped-by: Junio C Hamano 
Signed-off-by: Jakub Narebski 
Signed-off-by: Junio C Hamano