Rev 1936: Be a bit less verbose. in file:///data/jelmer/bzr-svn/trunk/

Jelmer Vernooij jelmer at samba.org
Mon Oct 6 17:49:51 BST 2008


At file:///data/jelmer/bzr-svn/trunk/

------------------------------------------------------------
revno: 1936
revision-id: jelmer at samba.org-20081006164949-0q3xby1ymbh2xyal
parent: jelmer at samba.org-20081006163629-o75p6xhb08efw9t6
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Mon 2008-10-06 18:49:49 +0200
message:
  Be a bit less verbose.
modified:
  subvertpy/subvertpy/__init__.py core.pyx-20080313210413-17k59slolpfe5kdq-1
  subvertpy/subvertpy/server.py  server.py-20081006143330-f9p0l7eih6izgoct-1
=== modified file 'subvertpy/subvertpy/__init__.py'
--- a/subvertpy/subvertpy/__init__.py	2008-10-03 15:32:17 +0000
+++ b/subvertpy/subvertpy/__init__.py	2008-10-06 16:49:49 +0000
@@ -26,6 +26,7 @@
 
 ERR_UNKNOWN_HOSTNAME = 670002
 ERR_UNKNOWN_HOSTNAME = 670002
+ERR_RA_SVN_UNKNOWN_CMD = 210001
 ERR_RA_SVN_CONNECTION_CLOSED = 210002
 ERR_WC_LOCKED = 155004
 ERR_RA_NOT_AUTHORIZED = 170001

=== modified file 'subvertpy/subvertpy/server.py'
--- a/subvertpy/subvertpy/server.py	2008-10-06 16:36:29 +0000
+++ b/subvertpy/subvertpy/server.py	2008-10-06 16:49:49 +0000
@@ -18,7 +18,7 @@
 import os
 import time
 
-from subvertpy import NODE_NONE, NODE_FILE, NODE_DIR
+from subvertpy import NODE_NONE, NODE_FILE, NODE_DIR, ERR_RA_SVN_UNKNOWN_CMD
 from subvertpy.marshall import marshall, unmarshall, literal, MarshallError
 
 
@@ -69,14 +69,15 @@
         self.send_msg([literal("success"), list(contents)])
 
     def send_unknown(self, cmd):
-        self.send_failure([210001, "Unknown command '%s'" % cmd, __file__, \
-                          52])
+        self.send_failure([ERR_RA_SVN_UNKNOWN_CMD, 
+            "Unknown command '%s'" % cmd, __file__, 52])
 
     def get_latest_rev(self):
         self.send_success([], "")
         self.send_success(self.repo_backend.get_latest_revnum())
 
     def check_path(self, path, revnum):
+        # TODO: Proper implementation
         return NODE_DIR
 
     def log(self, target_path, start_rev, end_rev, changed_paths, 
@@ -188,6 +189,7 @@
         while not self._stop:
             ( cmd, args ) = self.recv_msg()
             if not self.commands.has_key(cmd):
+                self.mutter("client used unknown command %r" % cmd)
                 self.send_unknown(cmd)
                 return
             else:
@@ -202,13 +204,11 @@
             try:
                 self.inbuffer += self.recv_fn()
                 (self.inbuffer, ret) = unmarshall(self.inbuffer)
-                self.mutter('in: %r' % ret)
                 return ret
             except MarshallError, e:
                 self.mutter('ERROR: %r' % e)
 
     def send_msg(self, data):
-        self.mutter('out: %r' % data)
         self.send_fn(marshall(data))
 
     def mutter(self, text):




More information about the bazaar-commits mailing list