1 files changed, 125 insertions, 0 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Svn2.py b/src/lib/Bcfg2/Server/Plugins/Svn2.py
new file mode 100644
index 000000000..8d79348f8
--- /dev/null
+++ b/src/lib/Bcfg2/Server/Plugins/Svn2.py
@@ -0,0 +1,125 @@
+try:
+    import pysvn
+    missing = False
+except:
+    missing = True
+import Bcfg2.Server.Plugin
+
+class Svn2(Bcfg2.Server.Plugin.Plugin,
+           Bcfg2.Server.Plugin.Version):
+    """Svn is a version plugin for dealing with Bcfg2 repos."""
+    name = 'Svn2'
+    __author__ = 'bcfg-dev@mcs.anl.gov'
+
+    conflicts = ['Svn']
+    experimental = True
+    __rmi__ = Bcfg2.Server.Plugin.Plugin.__rmi__ + ['Update','Commit']
+
+    def __init__(self, core, datastore):
+        Bcfg2.Server.Plugin.Plugin.__init__(self, core, datastore)
+
+        if missing:
+            self.logger.error("Svn2: Missing PySvn")
+            raise Bcfg2.Server.Plugin.PluginInitError
+
+        self.client = pysvn.Client()
+
+        self.core = core
+        self.datastore = datastore
+        self.svn_root = None
+        self.revision = None
+
+        # Read revision from bcfg2 repo
+        revision = self.get_revision()
+        if not self.revision:
+            raise Bcfg2.Server.Plugin.PluginInitError
+
+        self.logger.debug("Initialized svn plugin with svn root %s at revision %s"
+            % (self.svn_root, revision))
+
+    def get_revision(self):
+        """Read svn revision information for the Bcfg2 repository."""
+        try:
+            info = self.client.info(self.datastore)
+            self.revision = info.revision
+            self.svn_root = info.url
+            return str(self.revision.number)
+        except:
+            self.logger.error("Svn2: Failed to get revision", exc_info=1)
+            self.revision = None
+        return str(-1)
+
+    def commit_data(self, file_list, comment=None):
+        """Commit changes into the repository"""
+        if not comment:
+            comment = 'Svn2: autocommit'
+
+        # First try to update
+        if not self.Update():
+            self.logger.error("Failed to update svn repository, refusing to commit changes")
+            return
+
+        #FIXME - look for conflicts?
+
+        for fname in file_list:
+            stat = self.client.status(fname)
+            self.client.add([f.path for f in stat \
+                    if f.text_status == pysvn.wc_status_kind.unversioned])
+        try:
+            self.revision = self.client.checkin([self.datastore], comment,
+                    recurse=True)
+            self.revision = self.client.update(self.datastore, recurse=True)[0]
+            self.logger.info("Svn2: Commited changes. At %s" %
+                             self.revision.number)
+        except Exception, err:
+            # try to be smart about the error we got back
+            details = None
+            if "callback_ssl_server_trust_prompt" in str(err):
+                details = "SVN server certificate is not trusted"
+            elif "callback_get_login" in str(err):
+                details = "SVN credentials not cached"
+
+            if details is None:
+                self.logger.error("Svn2: Failed to commit changes",
+                                  exc_info=1)
+            else:
+                self.logger.error("Svn2: Failed to commit changes: %s" %
+                                  details)
+
+    def Update(self):
+        '''Svn2.Update() => True|False\nUpdate svn working copy\n'''
+        try:
+            old_revision = self.revision.number
+            self.revision = self.client.update(self.datastore, recurse=True)[0]
+        except Exception, err:
+            # try to be smart about the error we got back
+            details = None
+            if "callback_ssl_server_trust_prompt" in str(err):
+                details = "SVN server certificate is not trusted"
+            elif "callback_get_login" in str(err):
+                details = "SVN credentials not cached"
+
+            if details is None:
+                self.logger.error("Svn2: Failed to update server repository",
+                                  exc_info=1)
+            else:
+                self.logger.error("Svn2: Failed to update server repository: %s" %
+                                  details)
+            return False
+
+        if old_revision == self.revision.number:
+            self.logger.debug("repository is current")
+        else:
+            self.logger.info("Updated %s from revision %s to %s" % \
+                (self.datastore, old_revision, self.revision.number))
+        return True
+
+    def Commit(self):
+        """Svn2.Commit() => True|False\nCommit svn repository\n"""
+        try:
+            self.commit_changes([])
+            return True
+        except:
+            return False
+
+