path: root/git-cvsserver.perl
AgeCommit message (Collapse)Author
2007-06-08cvsserver: Make req_Root more critical of its input dataFrank Lichtenheld
The path submitted with the Root request has to be absolute (cvs does it this way and it may save us some sanity checks later) If multiple roots are specified (e.g. because we use pserver authentication which will already include the root), ensure that they say all the same. Probably neither is a security risk, and neither should ever be triggered by a sane client, but when validating input data, it's better to be save than sorry. Signed-off-by: Frank Lichtenheld <> Signed-off-by: Junio C Hamano <>
2007-05-29cvsserver: Handle 'cvs login'Frank Lichtenheld
Since this is a trivial variation of the general pserver authentication, there is really no reason not to support it. Signed-off-by: Frank Lichtenheld <> Signed-off-by: Junio C Hamano <>
2007-05-22git-cvsserver: fix disabling service via per-method configJunio C Hamano
When the per-method enable logic disables the access, we should not even look at the global one. git-cvsserver.perl | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) Signed-off-by: Junio C Hamano <>
2007-05-20git-cvsserver: exit with 1 upon "I HATE YOU"Junio C Hamano
Signed-off-by: Junio C Hamano <>
2007-05-14cvsserver: Don't send mixed messages to clientsFrank Lichtenheld
After we send I HATE YOU we should probably exit and not happily continue with I LOVE YOU and further communication. Most clients will probably just exit and ignore everything we send after the I HATE YOU and it is not a security problem either because we don't really care about the user name anyway. But it is still the right thing to do. [jc: with a minor fixup to its exit code...] Signed-off-by: Frank Lichtenheld <> Acked-by: "Martin Langhoff" <> Signed-off-by: Junio C Hamano <>
2007-05-13cvsserver: Limit config parser to needed optionsFrank Lichtenheld
Change the configuration parser so that it ignores everything except for ^gitcvs.((ext|pserver).)? This greatly reduces the risk of failing while parsing some unknown and irrelevant config option. The bug that triggered this change was that the parsing doesn't handle sections that have a subsection and a variable with the same name. While this bug still remains, all remaining causes can be attributed to user error, since there are no defined variables gitcvs.ext and gitcvs.pserver. Signed-off-by: Frank Lichtenheld <> Signed-off-by: Junio C Hamano <>
2007-05-02Merge branch 'maint'Junio C Hamano
* maint: cvsserver: Handle re-added files correctly Fix compilation of test-delta
2007-05-02cvsserver: Handle re-added files correctlyFrank Lichtenheld
We can't unconditionally assign revision 1.1 to newly added files. In case the file did exist in the past and was deleted we need to honor the old revision number. Signed-off-by: Frank Lichtenheld <> Signed-off-by: Junio C Hamano <>
2007-04-18Merge branch 'fl/cvsserver'Junio C Hamano
* 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
2007-04-12cvsserver: Allow to "add" a removed fileFrank Lichtenheld
CVS allows you to add a removed file (where the removal is not yet committed) which will cause the server to send the latest revision of the file and to delete the "removed" status. Copy this behaviour. Signed-off-by: Frank Lichtenheld <> Signed-off-by: Junio C Hamano <>
2007-04-11cvsserver: Fix handling of diappeared files on updateFrank Lichtenheld
Only send a modified response if the client sent a "Modified" entry. This fixes the case where the file was locally deleted on the client without being removed from CVS. In this case the client will only have sent the Entry for the file but nothing else. Signed-off-by: Frank Lichtenheld <> Acked-by: Martin Langhoff <> Acked-by: Daniel Barkalow <> Signed-off-by: Junio C Hamano <>
2007-04-08cvsserver: Corrections to the database backend configurationFrank Lichtenheld
Don't include the scheme name in gitcvs.dbdriver, it is always 'dbi' anyway. Don't allow ':' in driver names nor ';' in database names for sanity reasons. Signed-off-by: Frank Lichtenheld <> Signed-off-by: Junio C Hamano <>
2007-03-31cvsserver: Use DBI->table_info instead of DBI->tablesFrank Lichtenheld
DBI->table_info is portable across different DBD backends, DBI->tables is not. Limit the output to objects of type TABLE. Signed-off-by: Junio C Hamano <> Signed-off-by: Frank Lichtenheld <>
2007-03-22cvsserver: Abort if connect to database failsFrank Lichtenheld
Currently all calls to the database backend make no error checking or handling at all. At least abort if the connection to the database failed since there is really no way we could do anything useful after that. Signed-off-by: Frank Lichtenheld <> Signed-off-by: Junio C Hamano <>
2007-03-22cvsserver: Make the database backend configurableFrank Lichtenheld
Make all the different parts of the database backend connection configurable. This adds the following string configuration variables: - gitcvs.dbdriver - gitcvs.dbname - gitcvs.dbuser - gitcvs.dbpass The default values emulate the current behavior exactly for backwards compatibility. All configuration variables can also be specified for a specific access method (i.e. in the form gitcvs.<method>.<var>) The dbdriver/dbuser/dbpass variables are added for completness. No other backend than SQLite is tested yet. The dbname variable on the other hand is useful with this backend already (to not discriminate against other possible backends it was not splitted in dbdir and dbfile). Both dbname and dbuser support dynamic variable substitution where the available variables are: %m -- the CVS 'module' (i.e. GIT 'head') worked on %a -- CVS access method used (i.e. 'ext' or 'pserver') %u -- User name of the user invoking git-cvsserver %G -- .git directory name %g -- .git directory name, mangled to be used in a filename, currently this substitutes all chars except for [\w.-] with '_' Signed-off-by: Frank Lichtenheld <> Signed-off-by: Junio C Hamano <>
2007-03-22cvsserver: Allow to override the configuration per access methodFrank Lichtenheld
Allow to override the gitcvs.enabled and gitcvs.logfile configuration variables for each access method (i.e. "ext" or "pserver") in the form gitcvs.<method>.<var> Signed-off-by: Frank Lichtenheld <> Signed-off-by: Junio C Hamano <>
2007-03-22cvsserver: Handle three part keys in git config correctlyFrank Lichtenheld
This is intended to be used in the form gitcvs.<method>.<var> but this patch doesn't introduce any users yet. Signed-off-by: Frank Lichtenheld <> Signed-off-by: Junio C Hamano <>
2007-03-22cvsserver: Introduce new state variable 'method'Frank Lichtenheld
$state->{method} contains the CVS access method used, either 'ext' or 'pserver' Signed-off-by: Frank Lichtenheld <> Signed-off-by: Junio C Hamano <>
2007-03-14cvsserver: further improve messages on commit and statusFrank Lichtenheld
commit: Also print the old revision similar to how cvs does it and prepend a line stating the filename so that one can actually understand what happened when commiting more than one file. status: Fix the RCS filename displayed. The directory was printed twice. Signed-off-by: Frank Lichtenheld <> Signed-off-by: Junio C Hamano <>
2007-03-14cvsserver: Be more chattyFrank Lichtenheld
Submit some additional messages to the client on commit and update. Inspired by the standard CVS server though a little more terse. Signed-off-by: Frank Lichtenheld <> Signed-off-by: Junio C Hamano <>
2007-03-12cvsserver: Use Merged response instead of Update-existing for merged filesFrank Lichtenheld
Using Update-existing leads to the client forgetting about the "locally modified" status of the file which can lead to loss of local changes on later updates. Signed-off-by: Frank Lichtenheld <> Acked-by: Martin Langhoff <> Signed-off-by: Junio C Hamano <>
2007-02-28cvsserver: Make always-binary mode a config file optionAndy Parkins
The config option gitcvs.allbinary may be set to force all entries to get the -kb flag. In the future the gitattributes system will probably be a more appropriate way of doing this, but that will easily slot in as the entries lines sent to the CVS client now have their kopts set via the function kopts_from_path(). In the interim it might be better to not just have a all-or-nothing approach, but rather detect based on file extension (or file contents?). That would slot in easily here as well. However, I personally prefer everything to be binary-safe, so I just switch the switch. Signed-off-by: Andy Parkins <> Signed-off-by: Junio C Hamano <>
2007-02-27cvsserver: Remove trailing "\n" from commithash in checkin functionAndy Parkins
The commithash for updating the ref is obtained from a call to git-commit-tree. However, it was returned (and stored) with the trailing newline. This meant that the later call to git-update-ref that was trying to update to $commithash was including the newline in the parameter - obviously that hash would never exist, and so git-update-ref would always fail. The solution is to chomp() the commithash as soon as it is returned by git-commit-tree. Signed-off-by: Andy Parkins <> Signed-off-by: Junio C Hamano <>
2007-02-27Make 'cvs ci' lockless in git-cvsserver by using git-update-refJunio C Hamano
This makes "ci" codepath lockless by following the usual "remember the tip, do your thing, then compare and swap at the end" update pattern using update-ref. Incidentally, by updating the code that reads where the tip of the head is to use show-ref, it makes it safe to use in a repository whose refs are pack-pruned. I noticed that other parts of the program are not yet pack-refs safe, but tried to keep the changes to the minimum. Signed-off-by: Junio C Hamano <>
2007-02-14Have git-cvsserver call hooks/update before really altering the refAndy Parkins
git-cvsserver is analogous to git-receive-pack; a checking from a cvs client to a central server is like a git-push from a working repository. Therefore it's nice to use the same access control (and email sending) that a receive-pack would perform. This patch tests for an executable update hook; if it is it is run with the ref being updated and the old and new hashes as normal. If the update hook returns an error code the update is aborted and the ref is never updated. The cvsserver returns "error 1" to the client to signal there was an EPERM error. Signed-off-by: Andy Parkins <> Signed-off-by: Junio C Hamano <>
2007-01-29[PATCH] Rename git-repo-config to git-config.Tom Prince
Signed-off-by: Tom Prince <> Signed-off-by: Junio C Hamano <>
2007-01-25New files in git weren't being downloaded during CVS updateAndy Parkins
If a repository was checked out via git-cvsserver and then later a new file is added to the git repository via some other method; a CVS update wasn't fetching the new file. It would be reported as a new file as A some/dir/newfile.c but would never appear in the directory. The problem seems to be that git-cvsserver was treating these two cases identically, as "A" type results. 1. New file in repository 2. New file locally In fact, traditionally, case 1 is treated as a "U" result, and case 2 only is treated as an "A" result. "A", should just report that the file is added locally and then skip that file during an update as there is (of course) nothing to send. In both these cases there is no working revision, so the checking for "is there no working revision" will return true. The test for case 2 needs refining to say "if there is no working revision and no upstream revision". This patch does just that, leaving case 1 to be handled by the normal "U" handler. I've also updated the log message to more accurately describe the operation. i.e. that "A" means that content is scheduled for addition; not that it actually has been added. Signed-off-by: Andy Parkins <> Signed-off-by: Junio C Hamano <>
2007-01-09cvsserver: fix revision number during file addsMartin Langhoff
With this patch, cvs add / cvs commit echoes back to the client the correct file version (1.1) so that the file in the checkout is recognised as up-to-date. Signed-off-by: Martin Langhoff <> Signed-off-by: Junio C Hamano <>
2007-01-09cvsserver: detect early of we are up to date and avoid costly rev-listMartin Langhoff
if the SHA1 of our head matches the last SHA1 seen in the DB, avoid further processing. [jc: an "Oops, please amend" patch rolled in] Signed-off-by: Martin Langhoff <> Signed-off-by: Junio C Hamano <>
2006-12-20git-cvsserver: fix breakage when calling git merge-fileEric Wong
In the same vein as 8336afa563fbeff35e531396273065161181f04c, this fixes the the RCS merge to git-merge-file conversion in commit e2b70087. Signed-off-by: Eric Wong <> Signed-off-by: Junio C Hamano <>
2006-12-13Merge branch 'master' into js/mergeJunio C Hamano
* master: (42 commits) git-svn: correctly handle packed-refs in refs/remotes/ add test case for recursive merge git-svn: correctly display fatal() error messages git-svn: allow dcommit to take an alternate head git-svn: enable logging of information not supported by git Clarify fetch error for missing objects. Move Fink and Ports check to after config file shortlog: fix segfault on empty authorname shortlog: remove "[PATCH]" prefix from shortlog output Make sure the empty tree exists when needed in merge-recursive. Don't use memcpy when source and dest. buffers may overlap no need to install manpages as executable Documentation: simpler shared repository creation shortlog: fix segfault on empty authorname Add branch.*.merge warning and documentation update Fix perl/ build. git-svn: use do_switch for --follow-parent if the SVN library supports it Fix documentation copy&paste typo git-svn: extra error check to ensure we open a file correctly Documentation: update git-clone man page with new behavior ...
2006-12-13Get rid of the dependency on RCS' merge programJohannes Schindelin
Now that we have git-merge-file, an RCS merge lookalike, we no longer need it. So long, merge, and thanks for all the fish! Signed-off-by: Johannes Schindelin <> Signed-off-by: Junio C Hamano <>
2006-12-07cvsserver: Avoid miscounting bytes in Perl v5.8.xMartin Langhoff
At some point between v5.6 and 5.8 Perl started to assume its input, output and filehandles are UTF-8. This breaks the counting of bytes for the CVS protocol, resulting in the client expecting less data than we actually send, and storing truncated files. Signed-off-by: Martin Langhoff <> Signed-off-by: Junio C Hamano <>
2006-11-12Merge branch 'maint'Junio C Hamano
* maint: git-cvsserver: read from git with -z to get non-ASCII pathnames.
2006-11-12git-cvsserver: read from git with -z to get non-ASCII pathnames.v1.4.3.5Junio C Hamano
Signed-off-by: Junio C Hamano <>
2006-10-23Use column indexes in git-cvsserver where necessary.Shawn Pearce
Tonight I found a git-cvsserver instance spending a lot of time in disk IO while trying to process operations against a Git repository with >30,000 objects contained in it. Blowing away my SQLLite database and rebuilding all tables with indexes on the attributes that git-cvsserver frequently runs queries against seems to have resolved the issue quite nicely. Since the indexes shouldn't hurt performance on small repositories and always helps on larger repositories we should just always create them when creating the revision storage tables. Signed-off-by: Shawn O. Pearce <> Signed-off-by: Junio C Hamano <>
2006-10-15cvsserver: fix "cvs diff" in a subdirectoryJohannes Schindelin
Signed-off-by: Johannes Schindelin <> Signed-off-by: Junio C Hamano <>
2006-10-15cvsserver: Show correct letters for modified, removed and added filesJohannes Schindelin
Earlier, cvsserver showed always an 'U', sometimes even without a space between the 'U' and the name. Now, the correct letter is shown, with a space. Signed-off-by: Johannes Schindelin <> Signed-off-by: Junio C Hamano <>
2006-07-26cvsserver: imitate git-update-ref when committingJohannes Schindelin
git-update-ref writes into the lockfile, and renames it afterwards. Like commit v1.3.0-rc3~22, it is not only cleaner, but also helps with shared setups: every developer can have a different primary group; what matters is that $GIT_DIR/refs/heads has to be writable by a group you are in. Signed-off-by: Johannes Schindelin <> Signed-off-by: Junio C Hamano <>
2006-07-26git-cvsserver: support multiline commit messagesJohannes Schindelin
Earlier, cvsserver barfed when you tried to check in files with a multiline commit message. That is what Argumentx is for... Argument: lines can be followed by several Argumentx: lines, which means they should be appended. Signed-off-by: Johannes Schindelin <> Signed-off-by: Junio C Hamano <>
2006-07-25cvsserver: avoid warning about active db handlesv1.4.2-rc2Johannes Schindelin
Turns out that DBD::SQLite does not favour preparing statements which are never executed. So, turn all 4 statements, which were prepared _always_, into methods, like the other 12 prepared statements. Signed-off-by: Johannes Schindelin <> Signed-off-by: Junio C Hamano <>
2006-07-25cvsserver: suppress warningsJohannes Schindelin
This patch defines $state->{prependdir} as the empty string, so that quite a few warnings are avoided. Signed-off-by: Johannes Schindelin <> Acked-by: Martin Langhoff <> Signed-off-by: Junio C Hamano <>
2006-07-09Assorted typo fixesPavel Roskin
Signed-off-by: Junio C Hamano <>
2006-05-07Change to allow subdir updates from EclipseMartyn Smith
(Now you can rightclick any directory and select team-update/team-commit) and it should work
2006-05-07Many fixes for most operations in Eclipse.Martyn Smith
* Implemented global -n option * Implemented "Questionable" * Fixed Directory method, I _believe_ it's now correct in both cmdline and Eclipse. * Directory method Now looks for localdir of "." and compares the repo dir, uses THIS as a basis for all directory level calculations. * Added extra parameter to filenamesplit() to force stripping of "prepended" directory name. This ensures commits/updates etc work from any directory in the source tree. * Modified argsfromdir() so it is "always" called. This means that when the client specifies a directory, the method can detect this and behave accordingly (this is currently only implemented for the '.' directory) * Fixed "commit" method to correctly work from in a subdir
2006-05-07Added logged warnings for CVS error returnsMartyn Smith
2006-05-03cvsserver: use git-rev-list instead of git-logMartin Langhoff
On 5/4/06, Linus Torvalds <> wrote: > No it wasn't. "git log --parents" was definitely supposed to still work. > > That said, I suspect a git-cvsserver kind of usage is better off using > "git-rev-list --parents HEAD" instead, which didn't break in the first > place.
2006-04-26git-cvsserver: typofixesJunio C Hamano
Signed-off-by: Junio C Hamano <>
2006-04-25Deprecate usage of git-var -l for getting config vars listPetr Baudis
This has been an unfortunate sideway in the git API evolution. We use git-repo-config for all the other .git/config interaction so let's also use git-repo-config -l for the variable listing. Signed-off-by: Petr Baudis <>
2006-03-04cvsserver: anonymous cvs via pserver supportMartin Langhoff
git-cvsserver now knows how to do the pserver auth chat when the user is anonymous. To get it to work, add a line to your inetd.conf like cvspserver stream tcp nowait nobody git-cvsserver pserver (On some inetd implementations you may have to put the pserver parameter twice.) Commits are blocked. Naively, git-cvsserver assumes non-malicious users. Please review the code before setting this up on an internet-accessible server. NOTE: the <nobody> user above will need write access to the .git directory to maintain the sqlite database. Updating of the sqlite database should be put in an update hook to avoid this problem, so that it is maintained by users with write access.