From: Damien Diederen <dash@foobox.net>
Date: Thu, 27 Mar 2008 22:17:26 +0000 (+0100)
Subject: cvsserver: Respond to the 'editors' and 'watchers' commands
X-Git-Tag: v1.5.5-rc3~6^2~6
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=38bcd31a5879847d259a75fbcab9a7977ff63f1e;p=git.git

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>
---

diff --git a/git-cvsserver.perl b/git-cvsserver.perl
index 7f632af20..2fe0a8a3c 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