2006-02-22 10:50:15 +01:00
|
|
|
git-cvsserver(1)
|
|
|
|
================
|
|
|
|
|
|
|
|
NAME
|
|
|
|
----
|
2013-01-21 20:17:53 +01:00
|
|
|
git-cvsserver - A CVS server emulator for Git
|
2006-02-22 10:50:15 +01:00
|
|
|
|
|
|
|
SYNOPSIS
|
|
|
|
--------
|
2007-06-07 16:57:01 +02:00
|
|
|
|
|
|
|
SSH:
|
|
|
|
|
2006-02-22 10:50:15 +01:00
|
|
|
[verse]
|
2008-08-18 16:17:04 +02:00
|
|
|
export CVS_SERVER="git cvsserver"
|
2006-02-22 10:50:15 +01:00
|
|
|
'cvs' -d :ext:user@server/path/repo.git co <HEAD_name>
|
|
|
|
|
2007-06-07 16:57:01 +02:00
|
|
|
pserver (/etc/inetd.conf):
|
|
|
|
|
|
|
|
[verse]
|
|
|
|
cvspserver stream tcp nowait nobody /usr/bin/git-cvsserver git-cvsserver pserver
|
|
|
|
|
|
|
|
Usage:
|
|
|
|
|
|
|
|
[verse]
|
2018-05-24 22:11:39 +02:00
|
|
|
'git-cvsserver' [<options>] [pserver|server] [<directory> ...]
|
2007-06-07 16:57:01 +02:00
|
|
|
|
2021-04-09 17:02:50 +02:00
|
|
|
DESCRIPTION
|
|
|
|
-----------
|
|
|
|
|
|
|
|
This application is a CVS emulation layer for Git.
|
|
|
|
|
|
|
|
It is highly functional. However, not all methods are implemented,
|
|
|
|
and for those methods that are implemented,
|
|
|
|
not all switches are implemented.
|
|
|
|
|
|
|
|
Testing has been done using both the CLI CVS client, and the Eclipse CVS
|
|
|
|
plugin. Most functionality works fine with both of these clients.
|
|
|
|
|
2007-06-07 16:57:01 +02:00
|
|
|
OPTIONS
|
|
|
|
-------
|
|
|
|
|
|
|
|
All these options obviously only make sense if enforced by the server side.
|
2007-12-29 07:20:38 +01:00
|
|
|
They have been implemented to resemble the linkgit:git-daemon[1] options as
|
2007-06-07 16:57:01 +02:00
|
|
|
closely as possible.
|
|
|
|
|
|
|
|
--base-path <path>::
|
|
|
|
Prepend 'path' to requested CVSROOT
|
|
|
|
|
|
|
|
--strict-paths::
|
|
|
|
Don't allow recursing into subdirectories
|
|
|
|
|
|
|
|
--export-all::
|
2007-06-15 03:01:53 +02:00
|
|
|
Don't check for `gitcvs.enabled` in config. You also have to specify a list
|
|
|
|
of allowed directories (see below) if you want to use this option.
|
2007-06-07 16:57:01 +02:00
|
|
|
|
2008-06-08 03:36:09 +02:00
|
|
|
-V::
|
|
|
|
--version::
|
2007-06-07 16:57:01 +02:00
|
|
|
Print version information and exit
|
|
|
|
|
2008-06-08 03:36:09 +02:00
|
|
|
-h::
|
|
|
|
-H::
|
|
|
|
--help::
|
2007-06-07 16:57:01 +02:00
|
|
|
Print usage information and exit
|
|
|
|
|
|
|
|
<directory>::
|
2022-07-19 20:32:14 +02:00
|
|
|
The remaining arguments provide a list of directories. If no directories
|
|
|
|
are given, then all are allowed. Repositories within these directories
|
|
|
|
still require the `gitcvs.enabled` config option, unless `--export-all`
|
|
|
|
is specified.
|
2007-06-07 16:57:01 +02:00
|
|
|
|
2006-02-22 10:50:15 +01:00
|
|
|
LIMITATIONS
|
|
|
|
-----------
|
|
|
|
|
2013-01-21 20:16:20 +01:00
|
|
|
CVS clients cannot tag, branch or perform Git merges.
|
2006-02-22 10:50:15 +01:00
|
|
|
|
2013-01-21 20:16:20 +01:00
|
|
|
'git-cvsserver' maps Git branches to CVS modules. This is very different
|
2007-04-12 16:54:28 +02:00
|
|
|
from what most CVS users would expect since in CVS modules usually represent
|
|
|
|
one or more directories.
|
|
|
|
|
2006-02-22 10:50:15 +01:00
|
|
|
INSTALLATION
|
|
|
|
------------
|
2006-03-05 11:11:00 +01:00
|
|
|
|
2010-05-15 17:06:46 +02:00
|
|
|
1. If you are going to offer CVS access via pserver, add a line in
|
2006-03-05 11:11:00 +01:00
|
|
|
/etc/inetd.conf like
|
2006-06-08 00:28:34 +02:00
|
|
|
+
|
|
|
|
--
|
|
|
|
------
|
2006-03-05 11:11:00 +01:00
|
|
|
cvspserver stream tcp nowait nobody git-cvsserver pserver
|
|
|
|
|
2006-06-08 00:28:34 +02:00
|
|
|
------
|
2007-05-27 14:33:06 +02:00
|
|
|
Note: Some inetd servers let you specify the name of the executable
|
|
|
|
independently of the value of argv[0] (i.e. the name the program assumes
|
|
|
|
it was executed with). In this case the correct line in /etc/inetd.conf
|
|
|
|
looks like
|
2006-03-05 11:11:00 +01:00
|
|
|
|
2006-06-08 00:28:34 +02:00
|
|
|
------
|
2007-05-27 14:33:06 +02:00
|
|
|
cvspserver stream tcp nowait nobody /usr/bin/git-cvsserver git-cvsserver pserver
|
2006-03-05 11:11:00 +01:00
|
|
|
|
2006-06-08 00:28:34 +02:00
|
|
|
------
|
2010-05-15 17:06:46 +02:00
|
|
|
|
2021-09-15 10:09:48 +02:00
|
|
|
Only anonymous access is provided by pserver by default. To commit you
|
2010-05-15 17:07:54 +02:00
|
|
|
will have to create pserver accounts, simply add a gitcvs.authdb
|
|
|
|
setting in the config file of the repositories you want the cvsserver
|
|
|
|
to allow writes to, for example:
|
2010-05-15 17:06:46 +02:00
|
|
|
|
|
|
|
------
|
|
|
|
|
2010-05-15 17:07:54 +02:00
|
|
|
[gitcvs]
|
|
|
|
authdb = /etc/cvsserver/passwd
|
2010-05-15 17:06:46 +02:00
|
|
|
|
|
|
|
------
|
2014-11-03 21:37:07 +01:00
|
|
|
The format of these files is username followed by the encrypted password,
|
2010-05-15 17:07:54 +02:00
|
|
|
for example:
|
|
|
|
|
|
|
|
------
|
2021-09-15 10:09:48 +02:00
|
|
|
myuser:sqkNi8zPf01HI
|
|
|
|
myuser:$1$9K7FzU28$VfF6EoPYCJEYcVQwATgOP/
|
|
|
|
myuser:$5$.NqmNH1vwfzGpV8B$znZIcumu1tNLATgV2l6e1/mY8RzhUDHMOaVOeL1cxV3
|
2010-05-15 17:07:54 +02:00
|
|
|
------
|
|
|
|
You can use the 'htpasswd' facility that comes with Apache to make these
|
2021-09-15 10:09:46 +02:00
|
|
|
files, but only with the -d option (or -B if your system suports it).
|
2010-05-15 17:07:54 +02:00
|
|
|
|
2021-09-15 10:09:46 +02:00
|
|
|
Preferably use the system specific utility that manages password hash
|
|
|
|
creation in your platform (e.g. mkpasswd in Linux, encrypt in OpenBSD or
|
|
|
|
pwhash in NetBSD) and paste it in the right location.
|
2010-05-15 04:46:03 +02:00
|
|
|
|
2010-05-15 17:06:46 +02:00
|
|
|
Then provide your password via the pserver method, for example:
|
|
|
|
------
|
2021-09-15 10:09:48 +02:00
|
|
|
cvs -d:pserver:someuser:somepassword@server:/path/repo.git co <HEAD_name>
|
2010-05-15 17:06:46 +02:00
|
|
|
------
|
2013-01-21 20:16:20 +01:00
|
|
|
No special setup is needed for SSH access, other than having Git tools
|
2006-06-08 00:28:34 +02:00
|
|
|
in the PATH. If you have clients that do not accept the CVS_SERVER
|
2008-07-03 07:41:41 +02:00
|
|
|
environment variable, you can rename 'git-cvsserver' to `cvs`.
|
2007-05-27 14:33:07 +02:00
|
|
|
|
2007-08-24 02:40:08 +02:00
|
|
|
Note: Newer CVS versions (>= 1.12.11) also support specifying
|
2007-05-27 14:33:07 +02:00
|
|
|
CVS_SERVER directly in CVSROOT like
|
|
|
|
|
|
|
|
------
|
2021-09-15 10:09:48 +02:00
|
|
|
cvs -d ":ext;CVS_SERVER=git cvsserver:user@server/path/repo.git" co <HEAD_name>
|
2007-05-27 14:33:07 +02:00
|
|
|
------
|
|
|
|
This has the advantage that it will be saved in your 'CVS/Root' files and
|
|
|
|
you don't need to worry about always setting the correct environment
|
2008-07-03 07:41:41 +02:00
|
|
|
variable. SSH users restricted to 'git-shell' don't need to override the default
|
|
|
|
with CVS_SERVER (and shouldn't) as 'git-shell' understands `cvs` to mean
|
2008-07-03 07:55:07 +02:00
|
|
|
'git-cvsserver' and pretends that the other end runs the real 'cvs' better.
|
2006-06-08 00:28:34 +02:00
|
|
|
--
|
2006-02-22 10:50:15 +01:00
|
|
|
2. For each repo that you want accessible from CVS you need to edit config in
|
|
|
|
the repo and add the following section.
|
2006-06-08 00:28:34 +02:00
|
|
|
+
|
|
|
|
--
|
|
|
|
------
|
2006-02-22 10:50:15 +01:00
|
|
|
[gitcvs]
|
|
|
|
enabled=1
|
2006-03-05 11:11:00 +01:00
|
|
|
# optional for debugging
|
2015-03-11 21:32:45 +01:00
|
|
|
logFile=/path/to/logfile
|
2006-02-22 10:50:15 +01:00
|
|
|
|
2006-06-08 00:28:34 +02:00
|
|
|
------
|
2008-07-03 07:41:41 +02:00
|
|
|
Note: you need to ensure each user that is going to invoke 'git-cvsserver' has
|
2007-04-07 16:58:10 +02:00
|
|
|
write access to the log file and to the database (see
|
|
|
|
<<dbbackend,Database Backend>>. If you want to offer write access over
|
2013-01-21 20:17:53 +01:00
|
|
|
SSH, the users of course also need write access to the Git repository itself.
|
2007-03-19 16:55:59 +01:00
|
|
|
|
2013-01-21 20:17:53 +01:00
|
|
|
You also need to ensure that each repository is "bare" (without a Git index
|
2008-07-05 06:43:41 +02:00
|
|
|
file) for `cvs commit` to work. See linkgit:gitcvs-migration[7].
|
|
|
|
|
2007-04-07 16:58:10 +02:00
|
|
|
[[configaccessmethod]]
|
2007-05-27 14:33:08 +02:00
|
|
|
All configuration variables can also be overridden for a specific method of
|
2007-03-19 16:55:59 +01:00
|
|
|
access. Valid method names are "ext" (for SSH access) and "pserver". The
|
|
|
|
following example configuration would disable pserver access while still
|
|
|
|
allowing access over SSH.
|
|
|
|
------
|
|
|
|
[gitcvs]
|
|
|
|
enabled=0
|
|
|
|
|
|
|
|
[gitcvs "ext"]
|
|
|
|
enabled=1
|
|
|
|
------
|
2006-06-08 00:28:34 +02:00
|
|
|
--
|
2008-04-15 23:44:43 +02:00
|
|
|
3. If you didn't specify the CVSROOT/CVS_SERVER directly in the checkout command,
|
|
|
|
automatically saving it in your 'CVS/Root' files, then you need to set them
|
|
|
|
explicitly in your environment. CVSROOT should be set as per normal, but the
|
2013-01-21 20:17:53 +01:00
|
|
|
directory should point at the appropriate Git repo. As above, for SSH clients
|
2008-07-03 07:41:41 +02:00
|
|
|
_not_ restricted to 'git-shell', CVS_SERVER should be set to 'git-cvsserver'.
|
2006-06-08 00:28:34 +02:00
|
|
|
+
|
|
|
|
--
|
|
|
|
------
|
2021-09-15 10:09:48 +02:00
|
|
|
export CVSROOT=:ext:user@server:/var/git/project.git
|
|
|
|
export CVS_SERVER="git cvsserver"
|
2006-06-08 00:28:34 +02:00
|
|
|
------
|
|
|
|
--
|
2008-04-15 23:44:43 +02:00
|
|
|
4. For SSH clients that will make commits, make sure their server-side
|
|
|
|
.ssh/environment files (or .bashrc, etc., according to their specific shell)
|
|
|
|
export appropriate values for GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL,
|
|
|
|
GIT_COMMITTER_NAME, and GIT_COMMITTER_EMAIL. For SSH clients whose login
|
|
|
|
shell is bash, .bashrc may be a reasonable alternative.
|
2006-03-05 11:11:00 +01:00
|
|
|
|
|
|
|
5. Clients should now be able to check out the project. Use the CVS 'module'
|
2013-01-21 20:16:20 +01:00
|
|
|
name to indicate what Git 'head' you want to check out. This also sets the
|
2008-04-15 23:44:43 +02:00
|
|
|
name of your newly checked-out directory, unless you tell it otherwise with
|
|
|
|
`-d <dir_name>`. For example, this checks out 'master' branch to the
|
|
|
|
`project-master` directory:
|
2006-06-08 00:28:34 +02:00
|
|
|
+
|
|
|
|
------
|
2021-09-15 10:09:48 +02:00
|
|
|
cvs co -d project-master master
|
2006-06-08 00:28:34 +02:00
|
|
|
------
|
2006-02-22 10:50:15 +01:00
|
|
|
|
2007-04-07 16:58:10 +02:00
|
|
|
[[dbbackend]]
|
2018-04-30 17:35:33 +02:00
|
|
|
DATABASE BACKEND
|
2007-04-07 16:58:10 +02:00
|
|
|
----------------
|
|
|
|
|
2013-01-21 20:17:53 +01:00
|
|
|
'git-cvsserver' uses one database per Git head (i.e. CVS module) to
|
2009-11-23 03:07:29 +01:00
|
|
|
store information about the repository to maintain consistent
|
|
|
|
CVS revision numbers. The database needs to be
|
|
|
|
updated (i.e. written to) after every commit.
|
2007-04-12 16:43:36 +02:00
|
|
|
|
2008-06-30 20:56:34 +02:00
|
|
|
If the commit is done directly by using `git` (as opposed to
|
2008-07-03 07:41:41 +02:00
|
|
|
using 'git-cvsserver') the update will need to happen on the
|
|
|
|
next repository access by 'git-cvsserver', independent of
|
2007-04-12 16:43:36 +02:00
|
|
|
access method and requested operation.
|
|
|
|
|
|
|
|
That means that even if you offer only read access (e.g. by using
|
2008-07-03 07:41:41 +02:00
|
|
|
the pserver method), 'git-cvsserver' should have write access to
|
2007-04-07 16:58:10 +02:00
|
|
|
the database to work reliably (otherwise you need to make sure
|
2017-08-23 19:49:35 +02:00
|
|
|
that the database is up to date any time 'git-cvsserver' is executed).
|
2007-04-07 16:58:10 +02:00
|
|
|
|
2013-01-21 20:17:53 +01:00
|
|
|
By default it uses SQLite databases in the Git directory, named
|
2007-04-07 16:58:10 +02:00
|
|
|
`gitcvs.<module_name>.sqlite`. Note that the SQLite backend creates
|
|
|
|
temporary files in the same directory as the database file on
|
|
|
|
write so it might not be enough to grant the users using
|
2008-07-03 07:41:41 +02:00
|
|
|
'git-cvsserver' write access to the database file without granting
|
2007-04-12 16:43:36 +02:00
|
|
|
them write access to the directory, too.
|
2007-04-07 16:58:10 +02:00
|
|
|
|
2019-08-03 07:33:51 +02:00
|
|
|
The database cannot be reliably regenerated in a
|
2009-11-23 03:07:29 +01:00
|
|
|
consistent form after the branch it is tracking has changed.
|
|
|
|
Example: For merged branches, 'git-cvsserver' only tracks
|
2010-01-10 00:33:00 +01:00
|
|
|
one branch of development, and after a 'git merge' an
|
2009-11-23 03:07:29 +01:00
|
|
|
incrementally updated database may track a different branch
|
|
|
|
than a database regenerated from scratch, causing inconsistent
|
|
|
|
CVS revision numbers. `git-cvsserver` has no way of knowing which
|
|
|
|
branch it would have picked if it had been run incrementally
|
|
|
|
pre-merge. So if you have to fully or partially (from old
|
|
|
|
backup) regenerate the database, you should be suspicious
|
|
|
|
of pre-existing CVS sandboxes.
|
|
|
|
|
2007-04-07 16:58:10 +02:00
|
|
|
You can configure the database backend with the following
|
|
|
|
configuration variables:
|
|
|
|
|
|
|
|
Configuring database backend
|
|
|
|
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
|
|
|
2008-07-03 07:41:41 +02:00
|
|
|
'git-cvsserver' uses the Perl DBI module. Please also read
|
2007-04-07 16:58:10 +02:00
|
|
|
its documentation if changing these variables, especially
|
docs: stop using asciidoc no-inline-literal
In asciidoc 7, backticks like `foo` produced a typographic
effect, but did not otherwise affect the syntax. In asciidoc
8, backticks introduce an "inline literal" inside which markup
is not interpreted. To keep compatibility with existing
documents, asciidoc 8 has a "no-inline-literal" attribute to
keep the old behavior. We enabled this so that the
documentation could be built on either version.
It has been several years now, and asciidoc 7 is no longer
in wide use. We can now decide whether or not we want
inline literals on their own merits, which are:
1. The source is much easier to read when the literal
contains punctuation. You can use `master~1` instead
of `master{tilde}1`.
2. They are less error-prone. Because of point (1), we
tend to make mistakes and forget the extra layer of
quoting.
This patch removes the no-inline-literal attribute from the
Makefile and converts every use of backticks in the
documentation to an inline literal (they must be cleaned up,
or the example above would literally show "{tilde}" in the
output).
Problematic sites were found by grepping for '`.*[{\\]' and
examined and fixed manually. The results were then verified
by comparing the output of "html2text" on the set of
generated html pages. Doing so revealed that in addition to
making the source more readable, this patch fixes several
formatting bugs:
- HTML rendering used the ellipsis character instead of
literal "..." in code examples (like "git log A...B")
- some code examples used the right-arrow character
instead of '->' because they failed to quote
- api-config.txt did not quote tilde, and the resulting
HTML contained a bogus snippet like:
<tt><sub></tt> foo <tt></sub>bar</tt>
which caused some parsers to choke and omit whole
sections of the page.
- git-commit.txt confused ``foo`` (backticks inside a
literal) with ``foo'' (matched double-quotes)
- mentions of `A U Thor <author@example.com>` used to
erroneously auto-generate a mailto footnote for
author@example.com
- the description of --word-diff=plain incorrectly showed
the output as "[-removed-] and {added}", not "{+added+}".
- using "prime" notation like:
commit `C` and its replacement `C'`
confused asciidoc into thinking that everything between
the first backtick and the final apostrophe were meant
to be inside matched quotes
- asciidoc got confused by the escaping of some of our
asterisks. In particular,
`credential.\*` and `credential.<url>.\*`
properly escaped the asterisk in the first case, but
literally passed through the backslash in the second
case.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-04-26 10:51:57 +02:00
|
|
|
about `DBI->connect()`.
|
2007-04-07 16:58:10 +02:00
|
|
|
|
2015-03-11 21:32:45 +01:00
|
|
|
gitcvs.dbName::
|
2007-04-07 16:58:10 +02:00
|
|
|
Database name. The exact meaning depends on the
|
2008-01-29 20:38:55 +01:00
|
|
|
selected database driver, for SQLite this is a filename.
|
2007-04-07 16:58:10 +02:00
|
|
|
Supports variable substitution (see below). May
|
|
|
|
not contain semicolons (`;`).
|
|
|
|
Default: '%Ggitcvs.%m.sqlite'
|
|
|
|
|
2015-03-11 21:32:45 +01:00
|
|
|
gitcvs.dbDriver::
|
2007-04-07 16:58:10 +02:00
|
|
|
Used DBI driver. You can specify any available driver
|
|
|
|
for this here, but it might not work. cvsserver is tested
|
|
|
|
with 'DBD::SQLite', reported to work with
|
|
|
|
'DBD::Pg', and reported *not* to work with 'DBD::mysql'.
|
|
|
|
Please regard this as an experimental feature. May not
|
2008-01-29 20:38:55 +01:00
|
|
|
contain colons (`:`).
|
2007-04-07 16:58:10 +02:00
|
|
|
Default: 'SQLite'
|
|
|
|
|
|
|
|
gitcvs.dbuser::
|
2015-03-11 21:32:45 +01:00
|
|
|
Database user. Only useful if setting `dbDriver`, since
|
2007-04-07 16:58:10 +02:00
|
|
|
SQLite has no concept of database users. Supports variable
|
|
|
|
substitution (see below).
|
|
|
|
|
2015-03-11 21:32:45 +01:00
|
|
|
gitcvs.dbPass::
|
|
|
|
Database password. Only useful if setting `dbDriver`, since
|
2007-04-07 16:58:10 +02:00
|
|
|
SQLite has no concept of database passwords.
|
|
|
|
|
2008-03-27 22:02:14 +01:00
|
|
|
gitcvs.dbTableNamePrefix::
|
|
|
|
Database table name prefix. Supports variable substitution
|
|
|
|
(see below). Any non-alphabetic characters will be replaced
|
|
|
|
with underscores.
|
|
|
|
|
2007-04-07 16:58:10 +02:00
|
|
|
All variables can also be set per access method, see <<configaccessmethod,above>>.
|
|
|
|
|
|
|
|
Variable substitution
|
|
|
|
^^^^^^^^^^^^^^^^^^^^^
|
2015-03-11 21:32:45 +01:00
|
|
|
In `dbDriver` and `dbUser` you can use the following variables:
|
2007-04-07 16:58:10 +02:00
|
|
|
|
|
|
|
%G::
|
2013-01-21 20:17:53 +01:00
|
|
|
Git directory name
|
2007-04-07 16:58:10 +02:00
|
|
|
%g::
|
2013-01-21 20:17:53 +01:00
|
|
|
Git directory name, where all characters except for
|
2019-11-05 18:07:20 +01:00
|
|
|
alphanumeric ones, `.`, and `-` are replaced with
|
2007-04-07 16:58:10 +02:00
|
|
|
`_` (this should make it easier to use the directory
|
|
|
|
name in a filename if wanted)
|
|
|
|
%m::
|
2013-01-21 20:17:53 +01:00
|
|
|
CVS module/Git head name
|
2007-04-07 16:58:10 +02:00
|
|
|
%a::
|
|
|
|
access method (one of "ext" or "pserver")
|
|
|
|
%u::
|
2008-07-03 07:41:41 +02:00
|
|
|
Name of the user running 'git-cvsserver'.
|
2007-04-07 16:58:10 +02:00
|
|
|
If no name can be determined, the
|
|
|
|
numeric uid is used.
|
|
|
|
|
CVS Server: Support reading base and roots from environment
The Gitosis single-account Git/ssh hosting system runs git commands
through git-shell after confirming that the connecting user is
authorized to access the requested repository. This works well for
upload-pack and receive-pack, which take a repository argument through
git-shell. This doesn't work so well for `cvs server', which is passed
through literally, with no arguments. Allowing arguments risks
sneaking in `--export-all', so that restriction should be maintained.
Despite that, passing a repository root is necessary for per-user
access control by the hosting software, and passing a base path
improves usability without weakening security. Thus, git-cvsserver
needs to come up with these values at runtime by some other
means. Since git-shell preserves the environment for other purposes,
the environment can carry these arguments as well.
Thus, modify git-cvsserver to read $GIT_CVSSERVER_{BASE_PATH,ROOT} in
the absence of equivalent command line arguments.
Signed-off-by: Phil Miller <mille121@illinois.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-12-30 20:35:31 +01:00
|
|
|
ENVIRONMENT
|
|
|
|
-----------
|
|
|
|
|
|
|
|
These variables obviate the need for command-line options in some
|
|
|
|
circumstances, allowing easier restricted usage through git-shell.
|
|
|
|
|
2022-07-19 20:32:14 +02:00
|
|
|
GIT_CVSSERVER_BASE_PATH::
|
|
|
|
This variable replaces the argument to --base-path.
|
CVS Server: Support reading base and roots from environment
The Gitosis single-account Git/ssh hosting system runs git commands
through git-shell after confirming that the connecting user is
authorized to access the requested repository. This works well for
upload-pack and receive-pack, which take a repository argument through
git-shell. This doesn't work so well for `cvs server', which is passed
through literally, with no arguments. Allowing arguments risks
sneaking in `--export-all', so that restriction should be maintained.
Despite that, passing a repository root is necessary for per-user
access control by the hosting software, and passing a base path
improves usability without weakening security. Thus, git-cvsserver
needs to come up with these values at runtime by some other
means. Since git-shell preserves the environment for other purposes,
the environment can carry these arguments as well.
Thus, modify git-cvsserver to read $GIT_CVSSERVER_{BASE_PATH,ROOT} in
the absence of equivalent command line arguments.
Signed-off-by: Phil Miller <mille121@illinois.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-12-30 20:35:31 +01:00
|
|
|
|
2022-07-19 20:32:14 +02:00
|
|
|
GIT_CVSSERVER_ROOT::
|
|
|
|
This variable specifies a single directory, replacing the
|
|
|
|
`<directory>...` argument list. The repository still requires the
|
|
|
|
`gitcvs.enabled` config option, unless `--export-all` is specified.
|
CVS Server: Support reading base and roots from environment
The Gitosis single-account Git/ssh hosting system runs git commands
through git-shell after confirming that the connecting user is
authorized to access the requested repository. This works well for
upload-pack and receive-pack, which take a repository argument through
git-shell. This doesn't work so well for `cvs server', which is passed
through literally, with no arguments. Allowing arguments risks
sneaking in `--export-all', so that restriction should be maintained.
Despite that, passing a repository root is necessary for per-user
access control by the hosting software, and passing a base path
improves usability without weakening security. Thus, git-cvsserver
needs to come up with these values at runtime by some other
means. Since git-shell preserves the environment for other purposes,
the environment can carry these arguments as well.
Thus, modify git-cvsserver to read $GIT_CVSSERVER_{BASE_PATH,ROOT} in
the absence of equivalent command line arguments.
Signed-off-by: Phil Miller <mille121@illinois.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-12-30 20:35:31 +01:00
|
|
|
|
|
|
|
When these environment variables are set, the corresponding
|
|
|
|
command-line arguments may not be used.
|
|
|
|
|
2018-04-30 17:35:33 +02:00
|
|
|
ECLIPSE CVS CLIENT NOTES
|
2006-02-24 00:20:51 +01:00
|
|
|
------------------------
|
|
|
|
|
|
|
|
To get a checkout with the Eclipse CVS client:
|
|
|
|
|
2006-03-05 11:11:00 +01:00
|
|
|
1. Select "Create a new project -> From CVS checkout"
|
|
|
|
2. Create a new location. See the notes below for details on how to choose the
|
|
|
|
right protocol.
|
|
|
|
3. Browse the 'modules' available. It will give you a list of the heads in
|
|
|
|
the repository. You will not be able to browse the tree from there. Only
|
|
|
|
the heads.
|
2016-06-28 13:40:15 +02:00
|
|
|
4. Pick `HEAD` when it asks what branch/tag to check out. Untick the
|
2006-03-05 11:11:00 +01:00
|
|
|
"launch commit wizard" to avoid committing the .project file.
|
|
|
|
|
2006-06-03 22:27:26 +02:00
|
|
|
Protocol notes: If you are using anonymous access via pserver, just select that.
|
2006-03-05 11:11:00 +01:00
|
|
|
Those using SSH access should choose the 'ext' protocol, and configure 'ext'
|
|
|
|
access on the Preferences->Team->CVS->ExtConnection pane. Set CVS_SERVER to
|
2010-01-07 17:49:12 +01:00
|
|
|
"`git cvsserver`". Note that password support is not good when using 'ext',
|
2006-03-05 11:11:00 +01:00
|
|
|
you will definitely want to have SSH keys setup.
|
|
|
|
|
|
|
|
Alternatively, you can just use the non-standard extssh protocol that Eclipse
|
|
|
|
offer. In that case CVS_SERVER is ignored, and you will have to replace
|
2008-07-03 07:41:41 +02:00
|
|
|
the cvs utility on the server with 'git-cvsserver' or manipulate your `.bashrc`
|
|
|
|
so that calling 'cvs' effectively calls 'git-cvsserver'.
|
2006-02-24 00:20:51 +01:00
|
|
|
|
2018-04-30 17:35:33 +02:00
|
|
|
CLIENTS KNOWN TO WORK
|
2006-02-24 00:20:51 +01:00
|
|
|
---------------------
|
|
|
|
|
2007-03-13 18:24:26 +01:00
|
|
|
- CVS 1.12.9 on Debian
|
|
|
|
- CVS 1.11.17 on MacOSX (from Fink package)
|
|
|
|
- Eclipse 3.0, 3.1.2 on MacOSX (see Eclipse CVS Client Notes)
|
|
|
|
- TortoiseCVS
|
2006-02-24 00:20:51 +01:00
|
|
|
|
2018-04-30 17:35:33 +02:00
|
|
|
OPERATIONS SUPPORTED
|
2006-02-22 10:50:15 +01:00
|
|
|
--------------------
|
|
|
|
|
|
|
|
All the operations required for normal use are supported, including
|
|
|
|
checkout, diff, status, update, log, add, remove, commit.
|
2012-10-14 07:42:33 +02:00
|
|
|
|
|
|
|
Most CVS command arguments that read CVS tags or revision numbers
|
|
|
|
(typically -r) work, and also support any git refspec
|
|
|
|
(tag, branch, commit ID, etc).
|
|
|
|
However, CVS revision numbers for non-default branches are not well
|
|
|
|
emulated, and cvs log does not show tags or branches at
|
|
|
|
all. (Non-main-branch CVS revision numbers superficially resemble CVS
|
|
|
|
revision numbers, but they actually encode a git commit ID directly,
|
|
|
|
rather than represent the number of revisions since the branch point.)
|
|
|
|
|
|
|
|
Note that there are two ways to checkout a particular branch.
|
|
|
|
As described elsewhere on this page, the "module" parameter
|
|
|
|
of cvs checkout is interpreted as a branch name, and it becomes
|
|
|
|
the main branch. It remains the main branch for a given sandbox
|
|
|
|
even if you temporarily make another branch sticky with
|
|
|
|
cvs update -r. Alternatively, the -r argument can indicate
|
|
|
|
some other branch to actually checkout, even though the module
|
|
|
|
is still the "main" branch. Tradeoffs (as currently
|
|
|
|
implemented): Each new "module" creates a new database on disk with
|
|
|
|
a history for the given module, and after the database is created,
|
|
|
|
operations against that main branch are fast. Or alternatively,
|
|
|
|
-r doesn't take any extra disk space, but may be significantly slower for
|
|
|
|
many operations, like cvs update.
|
|
|
|
|
|
|
|
If you want to refer to a git refspec that has characters that are
|
|
|
|
not allowed by CVS, you have two options. First, it may just work
|
|
|
|
to supply the git refspec directly to the appropriate CVS -r argument;
|
|
|
|
some CVS clients don't seem to do much sanity checking of the argument.
|
|
|
|
Second, if that fails, you can use a special character escape mechanism
|
|
|
|
that only uses characters that are valid in CVS tags. A sequence
|
|
|
|
of 4 or 5 characters of the form (underscore (`"_"`), dash (`"-"`),
|
|
|
|
one or two characters, and dash (`"-"`)) can encode various characters based
|
|
|
|
on the one or two letters: `"s"` for slash (`"/"`), `"p"` for
|
|
|
|
period (`"."`), `"u"` for underscore (`"_"`), or two hexadecimal digits
|
|
|
|
for any byte value at all (typically an ASCII number, or perhaps a part
|
|
|
|
of a UTF-8 encoded character).
|
|
|
|
|
2006-02-22 10:50:15 +01:00
|
|
|
Legacy monitoring operations are not supported (edit, watch and related).
|
|
|
|
Exports and tagging (tags and branches) are not supported at this stage.
|
|
|
|
|
2008-05-15 06:35:47 +02:00
|
|
|
CRLF Line Ending Conversions
|
2008-05-22 04:28:43 +02:00
|
|
|
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
2008-05-15 06:35:47 +02:00
|
|
|
|
2016-06-28 13:40:10 +02:00
|
|
|
By default the server leaves the `-k` mode blank for all files,
|
2010-07-19 23:17:17 +02:00
|
|
|
which causes the CVS client to treat them as a text files, subject
|
|
|
|
to end-of-line conversion on some platforms.
|
2008-05-15 06:35:47 +02:00
|
|
|
|
2010-05-19 22:43:11 +02:00
|
|
|
You can make the server use the end-of-line conversion attributes to
|
2016-06-28 13:40:10 +02:00
|
|
|
set the `-k` modes for files by setting the `gitcvs.usecrlfattr`
|
2010-05-19 22:43:11 +02:00
|
|
|
config variable. See linkgit:gitattributes[5] for more information
|
|
|
|
about end-of-line conversion.
|
2008-05-15 06:35:47 +02:00
|
|
|
|
|
|
|
Alternatively, if `gitcvs.usecrlfattr` config is not enabled
|
2010-05-19 22:43:11 +02:00
|
|
|
or the attributes do not allow automatic detection for a filename, then
|
2015-03-11 21:32:45 +01:00
|
|
|
the server uses the `gitcvs.allBinary` config for the default setting.
|
|
|
|
If `gitcvs.allBinary` is set, then file not otherwise
|
2016-06-28 13:40:10 +02:00
|
|
|
specified will default to '-kb' mode. Otherwise the `-k` mode
|
2015-03-11 21:32:45 +01:00
|
|
|
is left blank. But if `gitcvs.allBinary` is set to "guess", then
|
2016-06-28 13:40:10 +02:00
|
|
|
the correct `-k` mode will be guessed based on the contents of
|
2008-05-15 06:35:48 +02:00
|
|
|
the file.
|
|
|
|
|
2008-07-03 07:55:07 +02:00
|
|
|
For best consistency with 'cvs', it is probably best to override the
|
2008-05-15 06:35:48 +02:00
|
|
|
defaults by setting `gitcvs.usecrlfattr` to true,
|
2015-03-11 21:32:45 +01:00
|
|
|
and `gitcvs.allBinary` to "guess".
|
2006-02-22 10:50:15 +01:00
|
|
|
|
2018-04-30 17:35:33 +02:00
|
|
|
DEPENDENCIES
|
2006-02-22 10:50:15 +01:00
|
|
|
------------
|
2008-07-03 07:41:41 +02:00
|
|
|
'git-cvsserver' depends on DBD::SQLite.
|
2006-02-22 10:50:15 +01:00
|
|
|
|
|
|
|
GIT
|
|
|
|
---
|
2008-06-06 09:07:32 +02:00
|
|
|
Part of the linkgit:git[1] suite
|