Rev 1990: Fix svn-serve. in file:///data/jelmer/bzr-svn/0.5/

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 1990
revision-id: jelmer at samba.org-20081116222834-o4a41viels44a6gf
parent: jelmer at samba.org-20081116221638-x3kyt3f6fdzvhsio
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.5
timestamp: Sun 2008-11-16 23:28:34 +0100
message:
  Fix svn-serve.
modified:
  __init__.py                    __init__.py-20051008155114-eae558e6cf149e1d
  server.py                      server.py-20081006150454-t45tvwmbhpesdh7d-1
=== modified file '__init__.py'
--- a/__init__.py	2008-11-12 16:52:25 +0000
+++ b/__init__.py	2008-11-16 22:28:34 +0000
@@ -551,7 +551,7 @@
     ]
 
     def run(self, inet=None, port=None, directory=None):
-        from subvertpy.server import SVNServer, TCPSVNServer
+        from subvertpy.ra_svn import SVNServer, TCPSVNServer
         from bzrlib.plugins.svn.server import BzrServerBackend
         from bzrlib.trace import warning
 

=== modified file 'server.py'
--- a/server.py	2008-11-12 10:57:24 +0000
+++ b/server.py	2008-11-16 22:28:34 +0000
@@ -15,6 +15,7 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 """Subversion server implementation."""
 
+from bzrlib import urlutils
 from bzrlib.branch import Branch
 from bzrlib.inventory import Inventory
 
@@ -146,16 +147,17 @@
             revnum = self.get_latest_revnum()
         branch_path, revid = self._get_revid(revnum)
         inv = self.branch.repository.get_inventory(revid)
-        id = inv.path2id(path[len(branch_path)].strip("/"))
+        id = inv.path2id(path[len(branch_path):].strip("/"))
         if id is None:
             return None
         ie = inv[id]
         ret = { "name": urlutils.basename(path) }
         if ie.kind == "directory":
             ret["kind"] = subvertpy.NODE_DIR
+            ret["size"] = 0
         else:
             ret["kind"] = NODE_FILE
-        ret["size"] = ie.text_size
+            ret["size"] = ie.text_size
         ret["has-props"] = True
         ret["created-rev"] = 0 # FIXME
         ret["created-date"] = "" # FIXME