[Erp5-report] r7229 - in /erp5/trunk/products/ERP5Subversion: ./ Tool/

[nobody at svn.erp5.org]

Author: chris
Date: Fri May 12 10:16:56 2006
New Revision: 7229

URL: http://svn.erp5.org?rev=7229&view=rev
Log:
- improved svn switch a little (canonicalize url)
- improved diff reponse speed thanks to activities

Modified:
    erp5/trunk/products/ERP5Subversion/SubversionClient.py
    erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py

Modified: erp5/trunk/products/ERP5Subversion/SubversionClient.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Subversion/SubversionClient.py?rev=7229&r1=7228&r2=7229&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Subversion/SubversionClient.py (original)
+++ erp5/trunk/products/ERP5Subversion/SubversionClient.py Fri May 12 10:16:56 2006
@@ -242,6 +242,12 @@
       # Since plain Python classes are not convenient in Zope, convert the objects.
       return [Status(x) for x in self.client.status(path, **kw)]
     
+    def removeAllInList(self, list):
+      """Remove all files and folders in list
+      """
+      for file in list:
+        removeAll(file)
+      
     def diff(self, path, revision1, revision2):
       tmp = mktemp()
       os.makedirs(tmp)
@@ -250,7 +256,7 @@
       else:
         diff = self.client.diff(tmp_path=tmp, url_or_path=path, recurse=False, revision1=pysvn.Revision(pysvn.opt_revision_kind.number,revision1), revision2=pysvn.Revision(pysvn.opt_revision_kind.number,revision2))
       # clean up temp dir
-      removeAll(tmp)
+      self.activate().removeAllInList([tmp,])
       return diff
     
     def revert(self, path, recurse=False):

Modified: erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py?rev=7229&r1=7228&r2=7229&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py (original)
+++ erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py Fri May 12 10:16:56 2006
@@ -633,8 +633,10 @@
     """
     path = self.getSubversionPath(bt)
     client = self._getClient()
+    if url[-1] == '/' :
+      url = url[:-1]
     # Update from SVN
-    client.switch(path, url)
+    client.switch(path=path, url=url)
   
   security.declareProtected('Import/Export objects', 'add')
   # path can be a list or not (relative or absolute)