blob: 472f5cbd0712bc3202f44743e80397bfa6fb16ba [file] [log] [blame]
Junio C Hamano34b18112006-02-23 11:21:401git-cvsserver(1)
2================
3
4NAME
5----
Junio C Hamano076ffcc2013-02-06 05:13:216git-cvsserver - A CVS server emulator for Git
Junio C Hamano34b18112006-02-23 11:21:407
Junio C Hamano34b18112006-02-23 11:21:408SYNOPSIS
9--------
Junio C Hamano6926bef2007-06-16 09:54:0510
11SSH:
12
Junio C Hamano34b18112006-02-23 11:21:4013[verse]
Junio C Hamano7c2d9ea2008-08-19 09:01:4414export CVS_SERVER="git cvsserver"
Junio C Hamano34b18112006-02-23 11:21:4015'cvs' -d :ext:user@server/path/repo.git co <HEAD_name>
16
Junio C Hamano6926bef2007-06-16 09:54:0517pserver (/etc/inetd.conf):
18
19[verse]
20cvspserver stream tcp nowait nobody /usr/bin/git-cvsserver git-cvsserver pserver
21
22Usage:
23
24[verse]
Junio C Hamano1aa40d22010-01-21 17:46:4325'git-cvsserver' [options] [pserver|server] [<directory> ...]
Junio C Hamano6926bef2007-06-16 09:54:0526
27OPTIONS
28-------
29
30All these options obviously only make sense if enforced by the server side.
Junio C Hamano35738e82008-01-07 07:55:4631They have been implemented to resemble the linkgit:git-daemon[1] options as
Junio C Hamano6926bef2007-06-16 09:54:0532closely as possible.
33
34--base-path <path>::
35Prepend 'path' to requested CVSROOT
36
37--strict-paths::
38Don't allow recursing into subdirectories
39
40--export-all::
41Don't check for `gitcvs.enabled` in config. You also have to specify a list
42of allowed directories (see below) if you want to use this option.
43
Junio C Hamanoeb415992008-06-08 22:49:4744-V::
45--version::
Junio C Hamano6926bef2007-06-16 09:54:0546Print version information and exit
47
Junio C Hamanoeb415992008-06-08 22:49:4748-h::
49-H::
50--help::
Junio C Hamano6926bef2007-06-16 09:54:0551Print usage information and exit
52
53<directory>::
54You can specify a list of allowed directories. If no directories
55are given, all are allowed. This is an additional restriction, gitcvs
56access still needs to be enabled by the `gitcvs.enabled` config option
57unless '--export-all' was given, too.
58
59
Junio C Hamano34b18112006-02-23 11:21:4060DESCRIPTION
61-----------
62
Junio C Hamano076ffcc2013-02-06 05:13:2163This application is a CVS emulation layer for Git.
Junio C Hamano34b18112006-02-23 11:21:4064
65It is highly functional. However, not all methods are implemented,
66and for those methods that are implemented,
67not all switches are implemented.
68
69Testing has been done using both the CLI CVS client, and the Eclipse CVS
70plugin. Most functionality works fine with both of these clients.
71
72LIMITATIONS
73-----------
Junio C Hamano34b18112006-02-23 11:21:4074
Junio C Hamano076ffcc2013-02-06 05:13:2175CVS clients cannot tag, branch or perform Git merges.
Junio C Hamano34b18112006-02-23 11:21:4076
Junio C Hamano076ffcc2013-02-06 05:13:2177'git-cvsserver' maps Git branches to CVS modules. This is very different
Junio C Hamanoa2ad99e2007-04-18 09:57:0478from what most CVS users would expect since in CVS modules usually represent
79one or more directories.
80
Junio C Hamano34b18112006-02-23 11:21:4081INSTALLATION
82------------
Junio C Hamanodecf50e2006-03-05 10:51:1483
Junio C Hamanoa574a092010-06-13 19:57:10841. If you are going to offer CVS access via pserver, add a line in
Junio C Hamanodecf50e2006-03-05 10:51:1485 /etc/inetd.conf like
Junio C Hamanof1d14802006-06-08 00:48:1786+
87--
88------
Junio C Hamanodecf50e2006-03-05 10:51:1489 cvspserver stream tcp nowait nobody git-cvsserver pserver
90
Junio C Hamanof1d14802006-06-08 00:48:1791------
Junio C Hamano591dc6a2007-05-29 09:18:1992Note: Some inetd servers let you specify the name of the executable
93independently of the value of argv[0] (i.e. the name the program assumes
94it was executed with). In this case the correct line in /etc/inetd.conf
95looks like
Junio C Hamanodecf50e2006-03-05 10:51:1496
Junio C Hamanof1d14802006-06-08 00:48:1797------
Junio C Hamano591dc6a2007-05-29 09:18:1998 cvspserver stream tcp nowait nobody /usr/bin/git-cvsserver git-cvsserver pserver
Junio C Hamanodecf50e2006-03-05 10:51:1499
Junio C Hamanof1d14802006-06-08 00:48:17100------
Junio C Hamanoa574a092010-06-13 19:57:10101
102Only anonymous access is provided by pserve by default. To commit you
103will have to create pserver accounts, simply add a gitcvs.authdb
104setting in the config file of the repositories you want the cvsserver
105to allow writes to, for example:
106
107------
108
109 [gitcvs]
110authdb = /etc/cvsserver/passwd
111
112------
113The format of these files is username followed by the crypted password,
114for example:
115
116------
117 myuser:$1Oyx5r9mdGZ2
118 myuser:$1$BA)@$vbnMJMDym7tA32AamXrm./
119------
120You can use the 'htpasswd' facility that comes with Apache to make these
121files, but Apache's MD5 crypt method differs from the one used by most C
122library's crypt() function, so don't use the -m option.
123
124Alternatively you can produce the password with perl's crypt() operator:
125-----
126 perl -e 'my ($user, $pass) = @ARGV; printf "%s:%s\n", $user, crypt($user, $pass)' $USER password
127-----
128
129Then provide your password via the pserver method, for example:
130------
131 cvs -d:pserver:someuser:somepassword <at> server/path/repo.git co <HEAD_name>
132------
Junio C Hamano076ffcc2013-02-06 05:13:21133No special setup is needed for SSH access, other than having Git tools
Junio C Hamanof1d14802006-06-08 00:48:17134in the PATH. If you have clients that do not accept the CVS_SERVER
Junio C Hamanoba4b9282008-07-06 05:20:31135environment variable, you can rename 'git-cvsserver' to `cvs`.
Junio C Hamano591dc6a2007-05-29 09:18:19136
Junio C Hamanoa6387422007-08-25 03:54:27137Note: Newer CVS versions (>= 1.12.11) also support specifying
Junio C Hamano591dc6a2007-05-29 09:18:19138CVS_SERVER directly in CVSROOT like
139
140------
Junio C Hamano7c2d9ea2008-08-19 09:01:44141cvs -d ":ext;CVS_SERVER=git cvsserver:user@server/path/repo.git" co <HEAD_name>
Junio C Hamano591dc6a2007-05-29 09:18:19142------
143This has the advantage that it will be saved in your 'CVS/Root' files and
144you don't need to worry about always setting the correct environment
Junio C Hamanoba4b9282008-07-06 05:20:31145variable. SSH users restricted to 'git-shell' don't need to override the default
146with CVS_SERVER (and shouldn't) as 'git-shell' understands `cvs` to mean
147'git-cvsserver' and pretends that the other end runs the real 'cvs' better.
Junio C Hamanof1d14802006-06-08 00:48:17148--
Junio C Hamano34b18112006-02-23 11:21:401492. For each repo that you want accessible from CVS you need to edit config in
150 the repo and add the following section.
Junio C Hamanof1d14802006-06-08 00:48:17151+
152--
153------
Junio C Hamano34b18112006-02-23 11:21:40154 [gitcvs]
155 enabled=1
Junio C Hamanodecf50e2006-03-05 10:51:14156 # optional for debugging
Junio C Hamano34b18112006-02-23 11:21:40157 logfile=/path/to/logfile
158
Junio C Hamanof1d14802006-06-08 00:48:17159------
Junio C Hamanoba4b9282008-07-06 05:20:31160Note: you need to ensure each user that is going to invoke 'git-cvsserver' has
Junio C Hamanoa2ad99e2007-04-18 09:57:04161write access to the log file and to the database (see
162<<dbbackend,Database Backend>>. If you want to offer write access over
Junio C Hamano076ffcc2013-02-06 05:13:21163SSH, the users of course also need write access to the Git repository itself.
Junio C Hamanoa2ad99e2007-04-18 09:57:04164
Junio C Hamano076ffcc2013-02-06 05:13:21165You also need to ensure that each repository is "bare" (without a Git index
Junio C Hamanoba4b9282008-07-06 05:20:31166file) for `cvs commit` to work. See linkgit:gitcvs-migration[7].
167
Junio C Hamanoa2ad99e2007-04-18 09:57:04168[[configaccessmethod]]
Junio C Hamano591dc6a2007-05-29 09:18:19169All configuration variables can also be overridden for a specific method of
Junio C Hamanoa2ad99e2007-04-18 09:57:04170access. Valid method names are "ext" (for SSH access) and "pserver". The
171following example configuration would disable pserver access while still
172allowing access over SSH.
173------
174 [gitcvs]
175 enabled=0
176
177 [gitcvs "ext"]
178 enabled=1
179------
Junio C Hamanof1d14802006-06-08 00:48:17180--
Junio C Hamano33f98432008-04-16 09:10:051813. If you didn't specify the CVSROOT/CVS_SERVER directly in the checkout command,
182 automatically saving it in your 'CVS/Root' files, then you need to set them
183 explicitly in your environment. CVSROOT should be set as per normal, but the
Junio C Hamano076ffcc2013-02-06 05:13:21184 directory should point at the appropriate Git repo. As above, for SSH clients
Junio C Hamanoba4b9282008-07-06 05:20:31185 _not_ restricted to 'git-shell', CVS_SERVER should be set to 'git-cvsserver'.
Junio C Hamanof1d14802006-06-08 00:48:17186+
187--
Junio C Hamanof1d14802006-06-08 00:48:17188------
Junio C Hamanodecf50e2006-03-05 10:51:14189 export CVSROOT=:ext:user@server:/var/git/project.git
Junio C Hamano7c2d9ea2008-08-19 09:01:44190 export CVS_SERVER="git cvsserver"
Junio C Hamanof1d14802006-06-08 00:48:17191------
192--
Junio C Hamano33f98432008-04-16 09:10:051934. For SSH clients that will make commits, make sure their server-side
194 .ssh/environment files (or .bashrc, etc., according to their specific shell)
195 export appropriate values for GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL,
196 GIT_COMMITTER_NAME, and GIT_COMMITTER_EMAIL. For SSH clients whose login
197 shell is bash, .bashrc may be a reasonable alternative.
Junio C Hamanodecf50e2006-03-05 10:51:14198
1995. Clients should now be able to check out the project. Use the CVS 'module'
Junio C Hamano076ffcc2013-02-06 05:13:21200 name to indicate what Git 'head' you want to check out. This also sets the
Junio C Hamano33f98432008-04-16 09:10:05201 name of your newly checked-out directory, unless you tell it otherwise with
202 `-d <dir_name>`. For example, this checks out 'master' branch to the
203 `project-master` directory:
Junio C Hamanof1d14802006-06-08 00:48:17204+
205------
Junio C Hamanodecf50e2006-03-05 10:51:14206 cvs co -d project-master master
Junio C Hamanof1d14802006-06-08 00:48:17207------
Junio C Hamano34b18112006-02-23 11:21:40208
Junio C Hamanoa2ad99e2007-04-18 09:57:04209[[dbbackend]]
210Database Backend
211----------------
212
Junio C Hamano076ffcc2013-02-06 05:13:21213'git-cvsserver' uses one database per Git head (i.e. CVS module) to
Junio C Hamano9df0c662009-11-23 11:09:27214store information about the repository to maintain consistent
215CVS revision numbers. The database needs to be
216updated (i.e. written to) after every commit.
Junio C Hamanoa2ad99e2007-04-18 09:57:04217
Junio C Hamanofce7c7e2008-07-02 03:06:38218If the commit is done directly by using `git` (as opposed to
Junio C Hamanoba4b9282008-07-06 05:20:31219using 'git-cvsserver') the update will need to happen on the
220next repository access by 'git-cvsserver', independent of
Junio C Hamanoa2ad99e2007-04-18 09:57:04221access method and requested operation.
222
223That means that even if you offer only read access (e.g. by using
Junio C Hamanoba4b9282008-07-06 05:20:31224the pserver method), 'git-cvsserver' should have write access to
Junio C Hamanoa2ad99e2007-04-18 09:57:04225the database to work reliably (otherwise you need to make sure
Junio C Hamanoba4b9282008-07-06 05:20:31226that the database is up-to-date any time 'git-cvsserver' is executed).
Junio C Hamanoa2ad99e2007-04-18 09:57:04227
Junio C Hamano076ffcc2013-02-06 05:13:21228By default it uses SQLite databases in the Git directory, named
Junio C Hamanoa2ad99e2007-04-18 09:57:04229`gitcvs.<module_name>.sqlite`. Note that the SQLite backend creates
230temporary files in the same directory as the database file on
231write so it might not be enough to grant the users using
Junio C Hamanoba4b9282008-07-06 05:20:31232'git-cvsserver' write access to the database file without granting
Junio C Hamanoa2ad99e2007-04-18 09:57:04233them write access to the directory, too.
234
Junio C Hamano9df0c662009-11-23 11:09:27235The database can not be reliably regenerated in a
236consistent form after the branch it is tracking has changed.
237Example: For merged branches, 'git-cvsserver' only tracks
Junio C Hamano1aa40d22010-01-21 17:46:43238one branch of development, and after a 'git merge' an
Junio C Hamano9df0c662009-11-23 11:09:27239incrementally updated database may track a different branch
240than a database regenerated from scratch, causing inconsistent
241CVS revision numbers. `git-cvsserver` has no way of knowing which
242branch it would have picked if it had been run incrementally
243pre-merge. So if you have to fully or partially (from old
244backup) regenerate the database, you should be suspicious
245of pre-existing CVS sandboxes.
246
Junio C Hamanoa2ad99e2007-04-18 09:57:04247You can configure the database backend with the following
248configuration variables:
249
250Configuring database backend
251~~~~~~~~~~~~~~~~~~~~~~~~~~~~
252
Junio C Hamanoba4b9282008-07-06 05:20:31253'git-cvsserver' uses the Perl DBI module. Please also read
Junio C Hamanoa2ad99e2007-04-18 09:57:04254its documentation if changing these variables, especially
Junio C Hamanob76a6862012-05-02 22:02:46255about `DBI->connect()`.
Junio C Hamanoa2ad99e2007-04-18 09:57:04256
257gitcvs.dbname::
258Database name. The exact meaning depends on the
Junio C Hamano1f511962008-01-30 08:28:52259selected database driver, for SQLite this is a filename.
Junio C Hamanoa2ad99e2007-04-18 09:57:04260Supports variable substitution (see below). May
261not contain semicolons (`;`).
262Default: '%Ggitcvs.%m.sqlite'
263
264gitcvs.dbdriver::
265Used DBI driver. You can specify any available driver
266for this here, but it might not work. cvsserver is tested
267with 'DBD::SQLite', reported to work with
268'DBD::Pg', and reported *not* to work with 'DBD::mysql'.
269Please regard this as an experimental feature. May not
Junio C Hamano1f511962008-01-30 08:28:52270contain colons (`:`).
Junio C Hamanoa2ad99e2007-04-18 09:57:04271Default: 'SQLite'
272
273gitcvs.dbuser::
274Database user. Only useful if setting `dbdriver`, since
275SQLite has no concept of database users. Supports variable
276substitution (see below).
277
278gitcvs.dbpass::
279Database password. Only useful if setting `dbdriver`, since
280SQLite has no concept of database passwords.
281
Junio C Hamanoa74efce2008-04-02 08:39:08282gitcvs.dbTableNamePrefix::
283Database table name prefix. Supports variable substitution
284(see below). Any non-alphabetic characters will be replaced
285with underscores.
286
Junio C Hamanoa2ad99e2007-04-18 09:57:04287All variables can also be set per access method, see <<configaccessmethod,above>>.
288
289Variable substitution
290^^^^^^^^^^^^^^^^^^^^^
291In `dbdriver` and `dbuser` you can use the following variables:
292
293%G::
Junio C Hamano076ffcc2013-02-06 05:13:21294Git directory name
Junio C Hamanoa2ad99e2007-04-18 09:57:04295%g::
Junio C Hamano076ffcc2013-02-06 05:13:21296Git directory name, where all characters except for
Junio C Hamanoa2ad99e2007-04-18 09:57:04297alpha-numeric ones, `.`, and `-` are replaced with
298`_` (this should make it easier to use the directory
299name in a filename if wanted)
300%m::
Junio C Hamano076ffcc2013-02-06 05:13:21301CVS module/Git head name
Junio C Hamanoa2ad99e2007-04-18 09:57:04302%a::
303access method (one of "ext" or "pserver")
304%u::
Junio C Hamanoba4b9282008-07-06 05:20:31305Name of the user running 'git-cvsserver'.
Junio C Hamanoa2ad99e2007-04-18 09:57:04306If no name can be determined, the
307numeric uid is used.
308
Junio C Hamanob141a922010-01-10 19:55:14309ENVIRONMENT
310-----------
311
312These variables obviate the need for command-line options in some
313circumstances, allowing easier restricted usage through git-shell.
314
315GIT_CVSSERVER_BASE_PATH takes the place of the argument to --base-path.
316
317GIT_CVSSERVER_ROOT specifies a single-directory whitelist. The
318repository must still be configured to allow access through
319git-cvsserver, as described above.
320
321When these environment variables are set, the corresponding
322command-line arguments may not be used.
323
Junio C Hamano9512fcf2006-03-01 12:05:14324Eclipse CVS Client Notes
325------------------------
326
327To get a checkout with the Eclipse CVS client:
328
Junio C Hamanodecf50e2006-03-05 10:51:143291. Select "Create a new project -> From CVS checkout"
3302. Create a new location. See the notes below for details on how to choose the
331 right protocol.
3323. Browse the 'modules' available. It will give you a list of the heads in
333 the repository. You will not be able to browse the tree from there. Only
334 the heads.
3354. Pick 'HEAD' when it asks what branch/tag to check out. Untick the
336 "launch commit wizard" to avoid committing the .project file.
Junio C Hamano9512fcf2006-03-01 12:05:14337
Junio C Hamano341071d2006-06-04 07:24:48338Protocol notes: If you are using anonymous access via pserver, just select that.
Junio C Hamanodecf50e2006-03-05 10:51:14339Those using SSH access should choose the 'ext' protocol, and configure 'ext'
340access on the Preferences->Team->CVS->ExtConnection pane. Set CVS_SERVER to
Junio C Hamano1aa40d22010-01-21 17:46:43341"`git cvsserver`". Note that password support is not good when using 'ext',
Junio C Hamanodecf50e2006-03-05 10:51:14342you will definitely want to have SSH keys setup.
343
344Alternatively, you can just use the non-standard extssh protocol that Eclipse
345offer. In that case CVS_SERVER is ignored, and you will have to replace
Junio C Hamanoba4b9282008-07-06 05:20:31346the cvs utility on the server with 'git-cvsserver' or manipulate your `.bashrc`
347so that calling 'cvs' effectively calls 'git-cvsserver'.
Junio C Hamano9512fcf2006-03-01 12:05:14348
349Clients known to work
350---------------------
351
Junio C Hamano103ad7f2007-03-14 11:19:26352- CVS 1.12.9 on Debian
353- CVS 1.11.17 on MacOSX (from Fink package)
354- Eclipse 3.0, 3.1.2 on MacOSX (see Eclipse CVS Client Notes)
355- TortoiseCVS
Junio C Hamano9512fcf2006-03-01 12:05:14356
Junio C Hamano34b18112006-02-23 11:21:40357Operations supported
358--------------------
359
360All the operations required for normal use are supported, including
361checkout, diff, status, update, log, add, remove, commit.
Junio C Hamano36d52292013-01-25 21:32:36362
363Most CVS command arguments that read CVS tags or revision numbers
364(typically -r) work, and also support any git refspec
365(tag, branch, commit ID, etc).
366However, CVS revision numbers for non-default branches are not well
367emulated, and cvs log does not show tags or branches at
368all. (Non-main-branch CVS revision numbers superficially resemble CVS
369revision numbers, but they actually encode a git commit ID directly,
370rather than represent the number of revisions since the branch point.)
371
372Note that there are two ways to checkout a particular branch.
373As described elsewhere on this page, the "module" parameter
374of cvs checkout is interpreted as a branch name, and it becomes
375the main branch. It remains the main branch for a given sandbox
376even if you temporarily make another branch sticky with
377cvs update -r. Alternatively, the -r argument can indicate
378some other branch to actually checkout, even though the module
379is still the "main" branch. Tradeoffs (as currently
380implemented): Each new "module" creates a new database on disk with
381a history for the given module, and after the database is created,
382operations against that main branch are fast. Or alternatively,
383-r doesn't take any extra disk space, but may be significantly slower for
384many operations, like cvs update.
385
386If you want to refer to a git refspec that has characters that are
387not allowed by CVS, you have two options. First, it may just work
388to supply the git refspec directly to the appropriate CVS -r argument;
389some CVS clients don't seem to do much sanity checking of the argument.
390Second, if that fails, you can use a special character escape mechanism
391that only uses characters that are valid in CVS tags. A sequence
392of 4 or 5 characters of the form (underscore (`"_"`), dash (`"-"`),
393one or two characters, and dash (`"-"`)) can encode various characters based
394on the one or two letters: `"s"` for slash (`"/"`), `"p"` for
395period (`"."`), `"u"` for underscore (`"_"`), or two hexadecimal digits
396for any byte value at all (typically an ASCII number, or perhaps a part
397of a UTF-8 encoded character).
398
Junio C Hamano34b18112006-02-23 11:21:40399Legacy monitoring operations are not supported (edit, watch and related).
400Exports and tagging (tags and branches) are not supported at this stage.
401
Junio C Hamanodfccbb02008-05-26 01:16:14402CRLF Line Ending Conversions
403~~~~~~~~~~~~~~~~~~~~~~~~~~~~
404
405By default the server leaves the '-k' mode blank for all files,
Junio C Hamano619596a2010-08-18 22:15:35406which causes the CVS client to treat them as a text files, subject
407to end-of-line conversion on some platforms.
Junio C Hamanodfccbb02008-05-26 01:16:14408
Junio C Hamanobb88cf42010-06-21 15:23:55409You can make the server use the end-of-line conversion attributes to
410set the '-k' modes for files by setting the `gitcvs.usecrlfattr`
411config variable. See linkgit:gitattributes[5] for more information
412about end-of-line conversion.
Junio C Hamanodfccbb02008-05-26 01:16:14413
414Alternatively, if `gitcvs.usecrlfattr` config is not enabled
Junio C Hamanobb88cf42010-06-21 15:23:55415or the attributes do not allow automatic detection for a filename, then
Junio C Hamanodfccbb02008-05-26 01:16:14416the server uses the `gitcvs.allbinary` config for the default setting.
417If `gitcvs.allbinary` is set, then file not otherwise
418specified will default to '-kb' mode. Otherwise the '-k' mode
419is left blank. But if `gitcvs.allbinary` is set to "guess", then
420the correct '-k' mode will be guessed based on the contents of
421the file.
422
Junio C Hamanoba4b9282008-07-06 05:20:31423For best consistency with 'cvs', it is probably best to override the
Junio C Hamanodfccbb02008-05-26 01:16:14424defaults by setting `gitcvs.usecrlfattr` to true,
425and `gitcvs.allbinary` to "guess".
Junio C Hamano34b18112006-02-23 11:21:40426
427Dependencies
428------------
Junio C Hamanoba4b9282008-07-06 05:20:31429'git-cvsserver' depends on DBD::SQLite.
Junio C Hamano34b18112006-02-23 11:21:40430
Junio C Hamano34b18112006-02-23 11:21:40431GIT
432---
Junio C Hamanof7c042d2008-06-06 22:50:53433Part of the linkgit:git[1] suite