summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Damien Diederen <dash@foobox.net>2008-03-27 23:17:26 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-03-27 16:05:27 -0700
commit38bcd31a5879847d259a75fbcab9a7977ff63f1e (patch)
tree1b26595d20463ba1f2ef2e641c39b0e34334d9ea
parentUpdate draft release notes for 1.5.5 (diff)
downloadtgif-38bcd31a5879847d259a75fbcab9a7977ff63f1e.tar.xz
cvsserver: Respond to the 'editors' and 'watchers' commands
These commands list users editing and watching locked files. This trivial implementation always returns an empty response, since git-cvsserver does not implement file locking. Without this, TkCVS hangs at startup, waiting forever for a response. Signed-off-by: Damien Diederen <dash@foobox.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xgit-cvsserver.perl9
1 files changed, 7 insertions, 2 deletions
diff --git a/git-cvsserver.perl b/git-cvsserver.perl
index 7f632af20d..2fe0a8a3cb 100755
--- a/git-cvsserver.perl
+++ b/git-cvsserver.perl
@@ -73,8 +73,8 @@ my $methods = {
'status' => \&req_status,
'admin' => \&req_CATCHALL,
'history' => \&req_CATCHALL,
- 'watchers' => \&req_CATCHALL,
- 'editors' => \&req_CATCHALL,
+ 'watchers' => \&req_EMPTY,
+ 'editors' => \&req_EMPTY,
'annotate' => \&req_annotate,
'Global_option' => \&req_Globaloption,
#'annotate' => \&req_CATCHALL,
@@ -199,6 +199,11 @@ sub req_CATCHALL
$log->warn("Unhandled command : req_$cmd : $data");
}
+# This method invariably succeeds with an empty response.
+sub req_EMPTY
+{
+ print "ok\n";
+}
# Root pathname \n
# Response expected: no. Tell the server which CVSROOT to use. Note that