From: Junio C Hamano <junkio@cox.net>
Date: Wed, 18 Apr 2007 05:17:46 +0000 (-0700)
Subject: Merge branch 'fl/cvsserver'
X-Git-Tag: v1.5.2-rc0~34
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=abbf594763a14e9c00c61f688e45bed636f1eb52;p=git.git

Merge branch 'fl/cvsserver'

* fl/cvsserver:
  config.txt: Add gitcvs.db* variables
  cvsserver: Document the GIT branches -> CVS modules mapping more prominently
  cvsserver: Reword documentation on necessity of write access
  cvsserver: Allow to "add" a removed file
  cvsserver: Add asciidoc documentation for new database backend configuration
  cvsserver: Corrections to the database backend configuration
  cvsserver: Use DBI->table_info instead of DBI->tables
  cvsserver: Abort if connect to database fails
  cvsserver: Make the database backend configurable
  cvsserver: Allow to override the configuration per access method
  cvsserver: Handle three part keys in git config correctly
  cvsserver: Introduce new state variable 'method'

Conflicts:

	Documentation/config.txt
---

abbf594763a14e9c00c61f688e45bed636f1eb52
diff --cc Documentation/config.txt
index 7e41ca6a0,d0d284f3e..2c0a66632
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -415,16 -405,36 +415,42 @@@ gitcvs.enabled:
  	See gitlink:git-cvsserver[1].
  
  gitcvs.logfile::
 -	Path to a log file where the cvs pserver interface well... logs
 +	Path to a log file where the cvs server interface well... logs
  	various stuff. See gitlink:git-cvsserver[1].
  
 +gitcvs.allbinary::
 +	If true, all files are sent to the client in mode '-kb'. This
 +	causes the client to treat all files as binary files which suppresses
 +	any newline munging it otherwise might do. A work-around for the
 +	fact that there is no way yet to set single files to mode '-kb'.
++
+ gitcvs.dbname::
+ 	Database used by git-cvsserver to cache revision information
+ 	derived from the git repository. The exact meaning depends on the
+ 	used database driver, for SQLite (which is the default driver) this
+ 	is a filename. Supports variable substitution (see
+ 	gitlink:git-cvsserver[1] for details). May not contain semicolons (`;`).
+ 	Default: '%Ggitcvs.%m.sqlite'
+ 
+ gitcvs.dbdriver::
+ 	Used Perl DBI driver. You can specify any available driver
+         for this here, but it might not work. git-cvsserver is tested
+ 	with 'DBD::SQLite', reported to work with 'DBD::Pg', and
+ 	reported *not* to work with 'DBD::mysql'. Experimental feature.
+ 	May not contain double colons (`:`). Default: 'SQLite'.
  	See gitlink:git-cvsserver[1].
  
+ gitcvs.dbuser, gitcvs.dbpass::
+ 	Database user and password. Only useful if setting 'gitcvs.dbdriver',
+ 	since SQLite has no concept of database users and/or passwords.
+ 	'gitcvs.dbuser' supports variable substitution (see
+ 	gitlink:git-cvsserver[1] for details).
+ 
+ All gitcvs variables except for 'gitcvs.allbinary' can also specifed
+ as 'gitcvs.<access_method>.<varname>' (where 'access_method' is one
+ of "ext" and "pserver") to make them apply only for the given access
+ method.
+ 
  http.sslVerify::
  	Whether to verify the SSL certificate when fetching or pushing
  	over HTTPS. Can be overridden by the 'GIT_SSL_NO_VERIFY' environment