TighterSubversionIntegration: svn-wiki-backend-patch

diff -Naur trac_edgewall/trac/versioncontrol/api.py trac_teco/trac/versioncontrol/api.py
--- trac_edgewall/trac/versioncontrol/api.py    2005-09-30 10:33:35.000000000 +0200
+++ trac_teco/trac/versioncontrol/api.py        2005-10-01 13:24:03.000000000 +0200
@@ -146,6 +146,17 @@
         """
         raise NotImplementedError
 
+    def set_content(self, content, commitmsg=None):
+        """
+        Set the content of the node. Add the commitmsg to the logs. If Node is
+        of type DIRECTORY this method raise an Error.
+        
+        If the Node doesn't exist it's created. 
+
+        Returns the revision Number that tags the commit.
+        """
+        raise NotImplementedError
+
     def get_entries(self):
         """
         Generator that yields the immediate child entries of a directory, in no
@@ -233,7 +244,7 @@
     access to view certain parts of a repository.
     """
 
-    def assert_permission(self, path):
+    def assert_permission(self, path, perm='r'):
         if not self.has_permission(path):
             raise PermissionDenied, \
                   'Insufficient permissions to access %s' % path
@@ -243,7 +254,7 @@
             raise PermissionDenied, \
                   'Insufficient permissions to access changeset %s' % rev
 
-    def has_permission(self, path):
+    def has_permission(self, path, perm='r'):
         return 1
     
     def has_permission_for_changeset(self, rev):
diff -Naur trac_edgewall/trac/versioncontrol/svn_authz.py trac_teco/trac/versioncontrol/svn_authz.py
--- trac_edgewall/trac/versioncontrol/svn_authz.py      2005-09-21 15:01:32.000000000 +0200
+++ trac_teco/trac/versioncontrol/svn_authz.py  2005-10-01 13:24:03.000000000 +0200
@@ -75,13 +75,13 @@
                 return 1
         return 0
 
-    def has_permission(self, path):
+    def has_permission(self, path, perm='r'):
         if path is None:
             return 1
 
         for p in parent_iter(path):
             if self.module_name:
-                for perm in self.get_section(self.module_name + ':' + p):
+                for perm in self.get_section(self.module_name + ':' + p, perm):
                     if perm is not None:
                         return perm
             for perm in self.get_section(p):
@@ -90,15 +90,15 @@
 
         return 0
 
-    def get_section(self, section):
+    def get_section(self, section, perm='r'):
         if not self.conf_authz.has_section(section):
             return
 
-        yield self.get_permission(section, self.auth_name)
+        yield self.get_permission(section, self.auth_name, perm)
 
         group_perm = None
         for g in self.groups:
-            p = self.get_permission(section, '@' + g)
+            p = self.get_permission(section, '@' + g, perm)
             if p is not None:
                 group_perm = p
 
@@ -107,11 +107,11 @@
 
         yield group_perm
 
-        yield self.get_permission(section, '*')
+        yield self.get_permission(section, '*', perm)
 
-    def get_permission(self, section, subject):
+    def get_permission(self, section, subject, perm='r'):
         if self.conf_authz.has_option(section, subject):
-            return 'r' in self.conf_authz.get(section, subject)
+            return perm in self.conf_authz.get(section, subject)
         return None
 
     def has_permission_for_changeset(self, rev):
diff -Naur trac_edgewall/trac/versioncontrol/svn_fs.py trac_teco/trac/versioncontrol/svn_fs.py
--- trac_edgewall/trac/versioncontrol/svn_fs.py 2005-09-29 14:01:05.000000000 +0200
+++ trac_teco/trac/versioncontrol/svn_fs.py     2005-10-01 13:57:31.000000000 +0200
@@ -261,7 +261,10 @@
         rev = self.normalize_rev(rev)
 
         return SubversionNode(path, rev, self.authz, self.scope, self.fs_ptr,
-                              self.pool)
+                              self.repos, self.pool)
+
+    def delete_node(self, path, commitmsg):
+        return NotImplementedError
 
     def get_oldest_rev(self):
         rev = 0
@@ -352,10 +355,11 @@
 
 class SubversionNode(Node):
 
-    def __init__(self, path, rev, authz, scope, fs_ptr, pool=None):
+    def __init__(self, path, rev, authz, scope, fs_ptr, repos, pool=None):
+        self.repos = repos
         self.authz = authz
         self.scope = scope
-        if scope != '/':
+        if scope != '/' and path.find(scope) == -1:
             self.scoped_path = scope + path
         else:
             self.scoped_path = path
@@ -365,11 +369,17 @@
 
         self.root = fs.revision_root(fs_ptr, rev, self.pool())
         node_type = fs.check_path(self.root, self.scoped_path, self.pool())
-        if not node_type in _kindmap:
+        if node_type == core.svn_node_none:
+            self.created_rev = 0
+            self.created_path = self.scoped_path
+            self.rev = self.created_rev
+            node_type = core.svn_node_file
+        elif not node_type in _kindmap:
             raise TracError, "No node at %s in revision %s" % (path, rev)
-        self.created_rev = fs.node_created_rev(self.root, self.scoped_path,
+        else:
+            self.created_rev = fs.node_created_rev(self.root, self.scoped_path,
                                                self.pool())
-        self.created_path = fs.node_created_path(self.root, self.scoped_path,
+            self.created_path = fs.node_created_path(self.root, self.scoped_path,
                                                  self.pool())
         # 'created_path' differs from 'path' if the last operation is a copy,
         # and furthermore, 'path' might not exist at 'create_rev'
@@ -382,6 +392,29 @@
             return None
         return core.Stream(fs.file_contents(self.root, self.scoped_path,
                                             self.pool()))
+    def set_content(self,content,commitmsg="changed by trac",uname=""):
+        # this check is untested! 
+        self.authz.assert_permission(self.scoped_path, 'w')
+
+        # based on the putfile.py example of the subversion dist.
+        # open a transaction against HEAD.
+        rev = fs.youngest_rev(repos.fs(self.repos),self.pool())
+        txn = repos.fs_begin_txn_for_commit(self.repos, rev, uname,
+                                            commitmsg, self.pool())
+
+        root = fs.txn_root(txn,self.pool())
+        kind = fs.check_path(root,self.scoped_path,self.pool())
+
+        if kind == core.svn_node_none:
+            fs.make_file(root,self.scoped_path,self.pool())
+        elif not kind == core.svn_node_file:
+            raise TracError("Node is not a File.")
+        
+        handler, baton = fs.apply_textdelta(root,self.scoped_path, 
+                                            None, None, self.pool())
+
+        delta.svn_txdelta_send_string(content,handler,baton,self.pool())
+        return repos.fs_commit_txn(self.repos,txn,self.pool())
 
     def get_entries(self):
         if self.isfile:
@@ -393,7 +426,7 @@
             if not self.authz.has_permission(path):
                 continue
             yield SubversionNode(path, self._requested_rev, self.authz,
-                                 self.scope, self.fs_ptr, self.pool)
+                                 self.scope, self.fs_ptr, self.repos, self.pool)
 
     def get_history(self,limit=None):
         newer = None # 'newer' is the previously seen history tuple
diff -Naur trac_edgewall/trac/versioncontrol/tests/svn_fs.py trac_teco/trac/versioncontrol/tests/svn_fs.py
--- trac_edgewall/trac/versioncontrol/tests/svn_fs.py   2005-09-29 13:41:44.000000000 +0200
+++ trac_teco/trac/versioncontrol/tests/svn_fs.py       2005-10-01 12:06:11.000000000 +0200
@@ -166,6 +166,34 @@
         self.assertEqual('text/plain', node.content_type)
         self.assertEqual('A test.\n', node.get_content().read())
 
+    def test_set_file_content(self):
+        node = self.repos.get_node('/trunk/README.txt')
+        node.set_content('This is the test Content\n', 'change.')
+
+        # reload the repository for the newly commited change. 
+        self.repos = SubversionRepository(REPOS_PATH, None,
+                                          logger_factory('test'))
+
+        node = self.repos.get_node('/trunk/README.txt')
+        chgset = self.repos.get_changeset(self.repos.get_youngest_rev())
+
+        self.assertEqual('This is the test Content\n', 
+            node.get_content().read())
+        self.assertEqual('change.', chgset.message )
+
+    def test_delete_node(self):
+        node = self.repos.delete_node('/trunk/README.txt', "delete.")
+        
+        self.repos = SubversionRepository(REPOS_PATH, None,
+                                          logger_factory('test'))
+
+        node = self.repos.get_node('/trunk/README.txt')
+        chgset = self.repos.get_changeset(self.repos.get_youngest_rev())
+
+        self.assertNotEqual(Node.DIRECTORY, node.kind)
+        self.assertNotEqual(Node.FILE, node.kind)
+        self.assertEqual('delete.', chgset.message )
+
     def test_get_dir_properties(self):
         f = self.repos.get_node('/trunk')
         props = f.get_properties()
diff -Naur trac_edgewall/trac/wiki/api.py trac_teco/trac/wiki/api.py
--- trac_edgewall/trac/wiki/api.py      2005-09-29 14:20:29.000000000 +0200
+++ trac_teco/trac/wiki/api.py  2005-10-01 12:06:11.000000000 +0200
@@ -28,6 +28,7 @@
 from trac.core import *
 from trac.util import to_utf8, TRUE
 
+from trac.wiki.model_svn import WikiPage
 
 class IWikiChangeListener(Interface):
     """Extension point interface for components that should get notified about
@@ -97,8 +98,9 @@
                 cursor = db.cursor()
                 cursor.execute("SELECT DISTINCT name FROM wiki")
                 self._index = {}
-                for (name,) in cursor:
-                    self._index[name] = True
+                for page in WikiPage.select(self.env):
+                    self._index[page.name] = True
+
                 self._last_index_update = now
         finally:
             self._index_lock.release()
diff -Naur trac_edgewall/trac/wiki/macros.py trac_teco/trac/wiki/macros.py
--- trac_edgewall/trac/wiki/macros.py   2005-09-29 22:22:21.000000000 +0200
+++ trac_teco/trac/wiki/macros.py       2005-10-01 12:06:11.000000000 +0200
@@ -30,7 +30,7 @@
 from trac.util import escape, format_date
 from trac.env import IEnvironmentSetupParticipant
 from trac.wiki.api import IWikiMacroProvider, WikiSystem
-from trac.wiki.model import WikiPage
+from trac.wiki.model_svn import WikiPage
 
 
 class TitleIndexMacro(Component):
@@ -303,7 +303,7 @@
             else:
                 raise Exception("%s module can't have attachments" % parts[0])
         elif len(parts) == 2:
-            from trac.versioncontrol.web_ui import BrowserModule
+            from trac.versioncontrol.web_ui.browser import BrowserModule
             try:
                 browser_links = [link for link,_ in 
                                  BrowserModule(self.env).get_link_resolvers()]
diff -Naur trac_edgewall/trac/wiki/model.py trac_teco/trac/wiki/model.py
--- trac_edgewall/trac/wiki/model.py    2005-09-17 18:50:25.000000000 +0200
+++ trac_teco/trac/wiki/model.py        2005-10-01 12:06:11.000000000 +0200
@@ -146,3 +146,16 @@
                        "ORDER BY version DESC", (self.name, self.version))
         for version,time,author,comment,ipnr in cursor:
             yield version,time,author,comment,ipnr
+
+    def select(cls, env, db=None):
+        if not db:
+            db = env.get_db_cnx()
+
+        cursor = db.cursor()
+        cursor.execute("SELECT DISTINCT name FROM wiki")
+        for (name,) in cursor:
+            yield WikiPage(env,name)
+
+    select = classmethod(select)
+
+
diff -Naur trac_edgewall/trac/wiki/model_svn.py trac_teco/trac/wiki/model_svn.py
--- trac_edgewall/trac/wiki/model_svn.py        1970-01-01 01:00:00.000000000 +0100
+++ trac_teco/trac/wiki/model_svn.py    2005-10-01 13:39:18.000000000 +0200
@@ -0,0 +1,121 @@
+# -*- coding: iso8859-1 -*-
+#
+# Copyright (C) 2003-2005 Edgewall Software
+# Copyright (C) 2005 Philipp Scholl <pscholl@bawue.de>
+# All rights reserved.
+#
+# This software is licensed as described in the file COPYING, which
+# you should have received as part of this distribution. The terms
+# are also available at http://trac.edgewall.com/license.html.
+#
+# This software consists of voluntary contributions made by many
+# individuals. For the exact contribution history, see the revision
+# history and logs, available at http://projects.edgewall.com/trac/.
+#
+# Author: Philipp Scholl <pscholl@bawue.de>
+
+from __future__ import generators
+import time
+
+from trac.core import *
+#from trac.wiki.api import WikiSystem
+from trac.versioncontrol.api import Node
+
+
+class WikiPage(object):
+    """Represents a wiki page (new or existing)."""
+
+    def __init__(self, env, name=None, version=None, db=None):
+        self.env = env
+        self.root = env.config.get( 'wiki', 'svn_root' )
+        if not env.get_repository().get_node(self.root).kind in (Node.DIRECTORY, Node.FILE):
+            raise TracError( "wiki root couldn't be found!" )
+        if self.root[:-1] != '/': self.root += '/'
+        self.name = name
+
+        if name:
+            self._fetch(name, version, db)
+        else:
+            self.version = 0
+            self.text = ''
+            self.readonly = 0
+        self.old_text = self.text
+        self.old_readonly = self.readonly
+
+    def _fetch(self, name, version=None, db=None):
+        repos = self.env.get_repository()
+        try:
+            if version:
+                node = repos.get_node(self.root+name,version)
+                self.text = node.get_content().read()
+                self.version = version
+                self.readonly = 0
+            else:
+                node = repos.get_node(self.root+name)
+                self.text = node.get_content().read()
+                history = node.get_history()
+                self.version = 0
+                for path, rev, chg in history:
+                    if self.version < rev: self.version = rev
+                self.readonly = 0
+        except Exception:
+            self.version = 0
+            self.text = ''
+            self.readonly = 0
+        except:
+            repos.close()
+
+    exists = property(fget=lambda self: self.version > 0)
+
+    def delete(self, version=None, db=None):
+        assert self.exists, 'Cannot delete non-existent page'
+        if version:
+            raise NotImplementedError( "deletion of versions not supported in \
+            wiki_svn" )
+        repos = self.env.get_repository()
+        repos.delete_node(self.root+self.name)
+
+    def save(self, author, comment, remote_addr, t=None, db=None):
+        repos = self.env.get_repository()
+        
+        # make sure that noone can escape the wiki root.
+        if self.name.find( "..") != -1:
+            raise TracError( ".. not allowed in wiki names." )
+
+        node = repos.get_node(self.root+self.name)
+
+        commitmsg  = self.name+" edited by "+author+" from "+remote_addr+"\n"
+        commitmsg += comment
+        self.version = node.set_content(self.text, commitmsg, author)
+
+        if t is None:
+            t = time.time()
+            
+#        for listener in WikiSystem(self.env).change_listeners:
+#            if self.version == repos.get_youngest_rev():
+#                listener.wiki_page_added(self)
+#            else:
+#                listener.wiki_page_changed(self, self.version, t, author,
+#                                           comment, remote_addr)
+
+    def get_history(self, db=None):
+        repos = self.env.get_repository()
+
+        history = repos.get_path_history(self.root+self.name)
+
+        for path, rev, kind in history:
+            chgset = repos.get_changeset(rev)
+            yield rev,chgset.date,chgset.author,chgset.message,"missing"
+
+    def select(cls, env, db=None):
+        if not 'get_repository' in dir(env):
+            return
+        repos = env.get_repository()
+        dnode = repos.get_node( env.config.get('wiki', 'svn_root') )
+        
+        for node in dnode.get_entries():
+            yield WikiPage(env,node.get_name())
+
+    select = classmethod(select)
+
+
diff -Naur trac_edgewall/trac/wiki/web_ui.py trac_teco/trac/wiki/web_ui.py
--- trac_edgewall/trac/wiki/web_ui.py   2005-09-22 10:28:10.000000000 +0200
+++ trac_teco/trac/wiki/web_ui.py       2005-10-01 12:06:11.000000000 +0200
@@ -1,7 +1,7 @@
 # -*- coding: iso8859-1 -*-
 #
 # Copyright (C) 2003-2005 Edgewall Software
-# Copyright (C) 2003-2005 Jonas Borgstr�jonas@edgewall.com>
+# Copyright (C) 2003-2005 Jonas Borgstr� <jonas@edgewall.com>
 # Copyright (C) 2004-2005 Christopher Lenz <cmlenz@gmx.de>
 # All rights reserved.
 #
@@ -13,7 +13,7 @@
 # individuals. For the exact contribution history, see the revision
 # history and logs, available at http://projects.edgewall.com/trac/.
 #
-# Author: Jonas Borgstr�jonas@edgewall.com>
+# Author: Jonas Borgstr� <jonas@edgewall.com>
 #         Christopher Lenz <cmlenz@gmx.de>
 
 from __future__ import generators
@@ -30,7 +30,7 @@
 from trac.versioncontrol.diff import get_diff_options, hdf_diff
 from trac.web.chrome import add_link, add_stylesheet, INavigationContributor
 from trac.web import IRequestHandler
-from trac.wiki.model import WikiPage
+from trac.wiki.model_svn import WikiPage
 from trac.wiki.formatter import wiki_to_html, wiki_to_oneliner