[Erp5-report] r6558 - /erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/

nobody at svn.erp5.org nobody at svn.erp5.org
Wed Apr 12 16:05:15 CEST 2006


Author: chris
Date: Wed Apr 12 16:05:06 2006
New Revision: 6558

URL: http://svn.erp5.org?rev=6558&view=rev
Log:
fixed relative path to absolute path translation (forgotten at some places)

Modified:
    erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/svn_commit.xml
    erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/svn_log.xml
    erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/svn_revert.xml

Modified: erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/svn_commit.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/svn_commit.xml?rev=6558&r1=6557&r2=6558&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/svn_commit.xml (original)
+++ erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/svn_commit.xml Wed Apr 12 16:05:06 2006
@@ -99,8 +99,7 @@
 \n
 try:\n
   if commit_non_recurs != \'none\' and commit_non_recurs != \'\':\n
-    for relative_path in commit_non_recurs:\n
-      relative_path = svn_path+relative_path\n
+    commit_non_recurs = [svn_path + relative_path for relative_path in commit_non_recurs]\n
     context.getPortalObject()["portal_subversion"].checkin(path=commit_non_recurs, recurse=False, log_message=changelog)\n
   if commit_recurs != \'none\' and commit_recurs != \'\':\n
     for relative_path in commit_recurs:\n
@@ -171,6 +170,8 @@
                             <string>commit_non_recurs</string>
                             <string>commit_recurs</string>
                             <string>svn_path</string>
+                            <string>append</string>
+                            <string>$append0</string>
                             <string>_getiter_</string>
                             <string>relative_path</string>
                             <string>False</string>

Modified: erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/svn_log.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/svn_log.xml?rev=6558&r1=6557&r2=6558&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/svn_log.xml (original)
+++ erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/svn_log.xml Wed Apr 12 16:05:06 2006
@@ -70,6 +70,12 @@
 
 from Products.ERP5Subversion.SubversionClient import SubversionSSLTrustError, SubversionLoginError\n
 from Products.ERP5Type.Document import newTempBase\n
+svn_path = context.getPortalObject().portal_preferences.getPreference(\'subversion_working_copy\')\n
+if not svn_path :\n
+  raise "Error: Please set Subversion working path in preferences"\n
+if svn_path[-1]!=\'/\':\n
+  svn_path+=\'/\'\n
+file = svn_path + file\n
 try:\n
   log_list = context.getPortalObject()["portal_subversion"].log(file)\n
 except SubversionSSLTrustError, error:\n
@@ -137,8 +143,9 @@
                             <string>Products.ERP5Type.Document</string>
                             <string>newTempBase</string>
                             <string>_getattr_</string>
+                            <string>context</string>
+                            <string>svn_path</string>
                             <string>_getitem_</string>
-                            <string>context</string>
                             <string>log_list</string>
                             <string>error</string>
                             <string>error1</string>

Modified: erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/svn_revert.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/svn_revert.xml?rev=6558&r1=6557&r2=6558&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/svn_revert.xml (original)
+++ erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/svn_revert.xml Wed Apr 12 16:05:06 2006
@@ -67,6 +67,7 @@
         <item>
             <key> <string>_body</string> </key>
             <value> <string>to_revert = files.split(\',\')\n
+\n
 svn_path = context.getPortalObject().portal_preferences.getPreference(\'subversion_working_copy\')\n
 if not svn_path :\n
   raise "Error: Please set Subversion working path in preferences"\n
@@ -74,8 +75,7 @@
   svn_path+=\'/\'\n
 \n
 if to_revert != \'none\' :\n
-  for relative_path in to_revert:\n
-    relative_path = svn_path + relative_path\n
+  to_revert = [svn_path + relative_path for relative_path in to_revert]\n
   context.getPortalObject()["portal_subversion"].revert(path=to_revert)\n
 \n
 context.REQUEST.set(\'portal_status_message\', \'Changes reverted successfully!\')\n
@@ -126,6 +126,8 @@
                             <string>context</string>
                             <string>svn_path</string>
                             <string>_getitem_</string>
+                            <string>append</string>
+                            <string>$append0</string>
                             <string>_getiter_</string>
                             <string>relative_path</string>
                           </tuple>




More information about the Erp5-report mailing list