[Erp5-report] r6845 - in /erp5/trunk/bt5/erp5_forge: SkinTemplateItem/portal_skins/erp5_svn...
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri Apr 21 15:39:13 CEST 2006
Author: chris
Date: Fri Apr 21 15:39:08 2006
New Revision: 6845
URL: http://svn.erp5.org?rev=6845&view=rev
Log:
- Added support for several working copies (usefull for bt in products)
- BIG code cleanup & optimisation
Note: Code has changed a lot and new bugs might have appeared although I tested a lot
Added:
erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/Preference_viewSubversion/my_preferred_subversion_working_copy_list.xml
Modified:
erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnCleanup.xml
erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnCommit.xml
erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnDiff.xml
erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnInfo.xml
erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnListUnversioned.xml
erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnLog.xml
erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnLs.xml
erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnMultiDiff.xml
erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnRevert.xml
erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnUpdate.xml
erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnInfosFile.xml
erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/Preference_viewSubversion.xml
erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/tree.xml.xml
erp5/trunk/bt5/erp5_forge/bt/change_log
erp5/trunk/bt5/erp5_forge/bt/version
Modified: erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnCleanup.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnCleanup.xml?rev=6845&r1=6844&r2=6845&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnCleanup.xml (original)
+++ erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnCleanup.xml Fri Apr 21 15:39:08 2006
@@ -66,7 +66,7 @@
</item>
<item>
<key> <string>_body</string> </key>
- <value> <string>context.getPortalObject()["portal_subversion"].cleanup()\n
+ <value> <string>context.getPortalObject()["portal_subversion"].cleanup(context)\n
\n
context.REQUEST.set(\'portal_status_message\', \'Subversion locks removed successfully!\')\n
return context.BusinessTemplate_viewSvnStatus()\n
Modified: erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnCommit.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnCommit.xml?rev=6845&r1=6844&r2=6845&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnCommit.xml (original)
+++ erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnCommit.xml Fri Apr 21 15:39:08 2006
@@ -88,12 +88,6 @@
else:\n
commit_recurs = removed\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
-if svn_path[-1]!=\'/\':\n
- svn_path+=\'/\'\n
-\n
if \'changelog\' not in context.REQUEST.keys() :\n
context.REQUEST.set(\'portal_status_message\', \'Please set a changelog message...\')\n
return context.asContext(added=added, modified=modified, removed=removed ,checked=checked).BusinessTemplate_viewSvnChangelog()\n
@@ -104,12 +98,9 @@
\n
try:\n
if commit_non_recurs != \'none\' and commit_non_recurs != \'\':\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
+ context.getPortalObject()["portal_subversion"].checkin(path=commit_non_recurs, bt=context, recurse=False, log_message=changelog)\n
if commit_recurs != \'none\' and commit_recurs != \'\':\n
- for relative_path in commit_recurs:\n
- relative_path = svn_path+relative_path\n
- context.getPortalObject()["portal_subversion"].checkin(path=commit_recurs, recurse=True, log_message=changelog)\n
+ context.getPortalObject()["portal_subversion"].checkin(path=commit_recurs, bt=context, recurse=True, log_message=changelog)\n
except SubversionSSLTrustError, error:\n
context.REQUEST.set(\'portal_status_message\', \'SSL Certificate was not recognized\')\n
return context.asContext(added=added, modified=modified, removed=removed, trust_dict = error.getTrustDict(), caller=\'commit\', changelog=changelog).BusinessTemplate_viewSvnSSLTrust()\n
@@ -174,11 +165,6 @@
<string>None</string>
<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>
<string>True</string>
<string>error</string>
Modified: erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnDiff.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnDiff.xml?rev=6845&r1=6844&r2=6845&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnDiff.xml (original)
+++ erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnDiff.xml Fri Apr 21 15:39:08 2006
@@ -68,12 +68,6 @@
<key> <string>_body</string> </key>
<value> <string encoding="cdata"><![CDATA[
-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
-\n
#params modified,added,removed\n
modified=context.REQUEST["modified"]\n
added=context.REQUEST["added"]\n
@@ -86,21 +80,21 @@
\n
if modified != \'none\':\n
for f in tab_Modified:\n
- f = svn_path+f \n
+ f = context.getPortalObject()["portal_subversion"].relativeToAbsolute(f, context) \n
print "<b><font color=\'black\'>Index: <a href=\'BusinessTemplate_viewSvnShowFile?file="+f+"\'>"+f+"</a> <a href=\'"+context.getPortalObject()["portal_subversion"].editPath(context, f)+"\'><img src=\'imgs/edit.png\' border=\'0\'></a><br>"\n
print \'<hr></font></b>\'\n
- print context.getPortalObject()["portal_subversion"].diffHTML(f)\n
+ print context.getPortalObject()["portal_subversion"].diffHTML(f, context)\n
\n
if added != \'none\':\n
for f in tab_Added:\n
- f = svn_path+f\n
+ f = context.getPortalObject()["portal_subversion"].relativeToAbsolute(f, context) \n
print "<b><font color=\'black\'>Index: <a href=\'BusinessTemplate_viewSvnShowFile?file="+f+"\'>"+f+"</a> <a href=\'"+context.getPortalObject()["portal_subversion"].editPath(context, f)+"\'><img src=\'imgs/edit.png\' border=\'0\'></a><br>"\n
print \'<hr></font></b>\'\n
print "<font color=\'green\'>File Added</font><br><br>"\n
\n
if removed != \'none\':\n
for f in tab_Removed:\n
- f = svn_path+f\n
+ f = context.getPortalObject()["portal_subversion"].relativeToAbsolute(f, context) \n
print "<b><font color=\'black\'>Index: <a href=\'BusinessTemplate_viewSvnShowFile?file="+f+"\'>"+f+"</a> <a href=\'"+context.getPortalObject()["portal_subversion"].editPath(context, f)+"\'><img src=\'imgs/edit.png\' border=\'0\'></a><br>"\n
print \'<hr></font></b>\'\n
print "<font color=\'red\'>File Removed</font><br><br>"\n
@@ -151,10 +145,9 @@
<tuple>
<string>_print_</string>
<string>_print</string>
+ <string>_getitem_</string>
<string>_getattr_</string>
<string>context</string>
- <string>svn_path</string>
- <string>_getitem_</string>
<string>modified</string>
<string>added</string>
<string>removed</string>
Modified: erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnInfo.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnInfo.xml?rev=6845&r1=6844&r2=6845&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnInfo.xml (original)
+++ erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnInfo.xml Fri Apr 21 15:39:08 2006
@@ -69,7 +69,7 @@
<value> <string>from Products.ERP5Subversion.SubversionClient import SubversionSSLTrustError, SubversionLoginError\n
\n
try:\n
- entry_dict = context.getPortalObject()["portal_subversion"].info()\n
+ entry_dict = context.getPortalObject()["portal_subversion"].info(context)\n
except SubversionSSLTrustError, error:\n
context.REQUEST.set(\'portal_status_message\', \'SSL Certificate was not recognized\')\n
return context.asContext(trust_dict = error.getTrustDict(), caller=\'info\').BusinessTemplate_viewSvnSSLTrust()\n
Modified: erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnListUnversioned.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnListUnversioned.xml?rev=6845&r1=6844&r2=6845&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnListUnversioned.xml (original)
+++ erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnListUnversioned.xml Fri Apr 21 15:39:08 2006
@@ -68,12 +68,7 @@
<key> <string>_body</string> </key>
<value> <string>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
-working_copy = svn_path + context.getTitle()\n
+working_copy = context.getPortalObject()["portal_subversion"].getSubversionPath(context)\n
\n
try:\n
unversioned_list = context.getPortalObject()["portal_subversion"].unversionedFiles(working_copy)\n
@@ -141,9 +136,8 @@
<string>Products.ERP5Type.Document</string>
<string>newTempBase</string>
<string>_getattr_</string>
+ <string>_getitem_</string>
<string>context</string>
- <string>svn_path</string>
- <string>_getitem_</string>
<string>working_copy</string>
<string>unversioned_list</string>
<string>error</string>
Modified: erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnLog.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnLog.xml?rev=6845&r1=6844&r2=6845&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnLog.xml (original)
+++ erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnLog.xml Fri Apr 21 15:39:08 2006
@@ -70,14 +70,9 @@
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
+\n
try:\n
- log_list = context.getPortalObject()["portal_subversion"].log(file)\n
+ log_list = context.getPortalObject()["portal_subversion"].log(file, context)\n
except SubversionSSLTrustError, error:\n
context.REQUEST.set(\'portal_status_message\', \'SSL Certificate was not recognized\')\n
return context.asContext(trust_dict = error.getTrustDict(), caller=\'log\').BusinessTemplate_viewSvnSSLTrust()\n
@@ -147,9 +142,8 @@
<string>Products.ERP5Type.Document</string>
<string>newTempBase</string>
<string>_getattr_</string>
+ <string>_getitem_</string>
<string>context</string>
- <string>svn_path</string>
- <string>_getitem_</string>
<string>log_list</string>
<string>error</string>
<string>error1</string>
Modified: erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnLs.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnLs.xml?rev=6845&r1=6844&r2=6845&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnLs.xml (original)
+++ erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnLs.xml Fri Apr 21 15:39:08 2006
@@ -67,15 +67,9 @@
<item>
<key> <string>_body</string> </key>
<value> <string>from Products.ERP5Subversion.SubversionClient import SubversionSSLTrustError, SubversionLoginError\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
\n
try:\n
- infos_list = context.getPortalObject()["portal_subversion"].ls(file)\n
+ infos_list = context.getPortalObject()["portal_subversion"].ls(file, context)\n
except SubversionSSLTrustError, error:\n
context.REQUEST.set(\'portal_status_message\', \'SSL Certificate was not recognized\')\n
return context.asContext(trust_dict = error.getTrustDict(), caller=\'ls\').BusinessTemplate_viewSvnSSLTrust()\n
@@ -131,9 +125,8 @@
<string>SubversionSSLTrustError</string>
<string>SubversionLoginError</string>
<string>_getattr_</string>
+ <string>_getitem_</string>
<string>context</string>
- <string>svn_path</string>
- <string>_getitem_</string>
<string>infos_list</string>
<string>error</string>
<string>error1</string>
Modified: erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnMultiDiff.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnMultiDiff.xml?rev=6845&r1=6844&r2=6845&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnMultiDiff.xml (original)
+++ erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnMultiDiff.xml Fri Apr 21 15:39:08 2006
@@ -82,16 +82,9 @@
\n
revisions_list.sort()\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
-if svn_path[-1]!=\'/\':\n
- svn_path += \'/\'\n
-file = svn_path + file\n
-\n
-diff = "<b><font color=\'black\'>Index: <a href=\'BusinessTemplate_viewSvnShowFile?file="+file+"\'>"+file+"</a> <a href=\'"+context.getPortalObject()["portal_subversion"].editPath(context, file)+"\'><img src=\'imgs/edit.png\' border=\'0\'></a><br>"\n
+diff = "<b><font color=\'black\'>Index: <a href=\'BusinessTemplate_viewSvnShowFile?file="+context.getPortalObject()["portal_subversion"].relativeToAbsolute(file)+"\'>"+context.getPortalObject()["portal_subversion"].relativeToAbsolute(file)+"</a> <a href=\'"+context.getPortalObject()["portal_subversion"].editPath(context, file)+"\'><img src=\'imgs/edit.png\' border=\'0\'></a><br>"\n
diff += \'<hr></b>\'\n
-diff += context.getPortalObject()["portal_subversion"].diffHTML(file, revision1=revisions_list[0], revision2=revisions_list[1])\n
+diff += context.getPortalObject()["portal_subversion"].diffHTML(file, context, revision1=revisions_list[0], revision2=revisions_list[1])\n
diff += \'</font>\'\n
return context.asContext(diff=diff).BusinessTemplate_viewSvnMultiDiff()\n
@@ -143,7 +136,6 @@
<string>file</string>
<string>revisions_list</string>
<string>len</string>
- <string>svn_path</string>
<string>diff</string>
</tuple>
</value>
Modified: erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnRevert.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnRevert.xml?rev=6845&r1=6844&r2=6845&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnRevert.xml (original)
+++ erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnRevert.xml Fri Apr 21 15:39:08 2006
@@ -71,15 +71,8 @@
else:\n
to_revert = files\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
-if svn_path[-1]!=\'/\':\n
- svn_path+=\'/\'\n
-\n
-if to_revert != \'none\' :\n
- to_revert = [svn_path + relative_path for relative_path in to_revert]\n
- context.getPortalObject()["portal_subversion"].revert(path=to_revert)\n
+if to_revert != \'none\' and to_revert != \'\':\n
+ context.getPortalObject()["portal_subversion"].revert(path=to_revert, bt=context)\n
\n
context.REQUEST.set(\'portal_status_message\', \'Changes reverted successfully!\')\n
return context.BusinessTemplate_viewSvnStatus()\n
@@ -126,13 +119,8 @@
<string>files</string>
<string>_getattr_</string>
<string>to_revert</string>
+ <string>_getitem_</string>
<string>context</string>
- <string>svn_path</string>
- <string>_getitem_</string>
- <string>append</string>
- <string>$append0</string>
- <string>_getiter_</string>
- <string>relative_path</string>
</tuple>
</value>
</item>
Modified: erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnUpdate.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnUpdate.xml?rev=6845&r1=6844&r2=6845&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnUpdate.xml (original)
+++ erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_doSvnUpdate.xml Fri Apr 21 15:39:08 2006
@@ -67,13 +67,7 @@
<item>
<key> <string>_body</string> </key>
<value> <string>from Products.ERP5Subversion.SubversionClient import SubversionSSLTrustError, SubversionLoginError\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
-if svn_path[-1]!=\'/\':\n
- svn_path+=\'/\'\n
-svn_path += context.getTitle()\n
+svn_path = context.getPortalObject()["portal_subversion"].getSubversionPath(context)\n
\n
try:\n
context.getPortalObject()["portal_subversion"].update(svn_path)\n
@@ -130,9 +124,9 @@
<string>SubversionSSLTrustError</string>
<string>SubversionLoginError</string>
<string>_getattr_</string>
+ <string>_getitem_</string>
<string>context</string>
<string>svn_path</string>
- <string>_getitem_</string>
<string>error</string>
<string>error1</string>
</tuple>
Modified: erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnInfosFile.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnInfosFile.xml?rev=6845&r1=6844&r2=6845&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnInfosFile.xml (original)
+++ erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnInfosFile.xml Fri Apr 21 15:39:08 2006
@@ -59,7 +59,7 @@
infos_dict context/infos_dict">\n
\n
<font color=\'black\'>\n
-<br><a tal:attributes="href python:\'BusinessTemplate_viewSvnShowFile?file=\'+str(path)"><b tal:content="path"></b></a>\n
+<br><a tal:attributes="href python:\'BusinessTemplate_viewSvnShowFile?file=\'+str(path)"><b tal:content="python:context.getPortalObject()[\'portal_subversion\'].relativeToAbsolute(path,context)"></b></a>\n
<a tal:attributes="href context/edit_path"><img src=\'imgs/edit.png\' border=\'0\'></a><hr><br>\n
<span tal:condition="infos_dict">\n
<table width=60%% border=1>\n
Modified: erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/Preference_viewSubversion.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/Preference_viewSubversion.xml?rev=6845&r1=6844&r2=6845&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/Preference_viewSubversion.xml (original)
+++ erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/Preference_viewSubversion.xml Fri Apr 21 15:39:08 2006
@@ -74,8 +74,7 @@
<value>
<list>
<string>my_preferred_subversion_user_name</string>
- <string>my_preferred_subversion_working_copy</string>
- <string>my_preferred_bootstrap_working_copy</string>
+ <string>my_preferred_subversion_working_copy_list</string>
</list>
</value>
</item>
Added: erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/Preference_viewSubversion/my_preferred_subversion_working_copy_list.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/Preference_viewSubversion/my_preferred_subversion_working_copy_list.xml?rev=6845&view=auto
==============================================================================
--- erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/Preference_viewSubversion/my_preferred_subversion_working_copy_list.xml (added)
+++ erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/Preference_viewSubversion/my_preferred_subversion_working_copy_list.xml Fri Apr 21 15:39:08 2006
@@ -1,0 +1,303 @@
+<?xml version="1.0"?>
+<ZopeData>
+ <record id="1" aka="AAAAAAAAAAE=">
+ <pickle>
+ <tuple>
+ <tuple>
+ <string>Products.Formulator.StandardFields</string>
+ <string>LinesField</string>
+ </tuple>
+ <none/>
+ </tuple>
+ </pickle>
+ <pickle>
+ <dictionary>
+ <item>
+ <key> <string>id</string> </key>
+ <value> <string>my_preferred_subversion_working_copy_list</string> </value>
+ </item>
+ <item>
+ <key> <string>message_values</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>external_validator_failed</string> </key>
+ <value> <string>The input failed the external validator.</string> </value>
+ </item>
+ <item>
+ <key> <string>line_too_long</string> </key>
+ <value> <string>A line was too long.</string> </value>
+ </item>
+ <item>
+ <key> <string>required_not_found</string> </key>
+ <value> <string>Input is required but no input given.</string> </value>
+ </item>
+ <item>
+ <key> <string>too_long</string> </key>
+ <value> <string>You entered too many characters.</string> </value>
+ </item>
+ <item>
+ <key> <string>too_many_lines</string> </key>
+ <value> <string>You entered too many lines.</string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>overrides</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>alternate_name</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>css_class</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>default</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>editable</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>enabled</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>external_validator</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>extra</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>height</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>hidden</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>max_length</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>max_linelength</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>max_lines</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>required</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>unicode</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>view_separator</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>whitespace_preserve</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>width</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>tales</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>alternate_name</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>css_class</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>default</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>editable</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>enabled</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>external_validator</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>extra</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>height</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>hidden</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>max_length</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>max_linelength</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>max_lines</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>required</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>unicode</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>view_separator</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>whitespace_preserve</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>width</string> </key>
+ <value> <string></string> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ <item>
+ <key> <string>values</string> </key>
+ <value>
+ <dictionary>
+ <item>
+ <key> <string>alternate_name</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>css_class</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>default</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>description</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>editable</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ <item>
+ <key> <string>enabled</string> </key>
+ <value> <int>1</int> </value>
+ </item>
+ <item>
+ <key> <string>external_validator</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>extra</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>height</string> </key>
+ <value> <int>5</int> </value>
+ </item>
+ <item>
+ <key> <string>hidden</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>max_length</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>max_linelength</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>max_lines</string> </key>
+ <value> <string></string> </value>
+ </item>
+ <item>
+ <key> <string>required</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>title</string> </key>
+ <value> <string>my_preferred_subversion_working_copy_list</string> </value>
+ </item>
+ <item>
+ <key> <string>unicode</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>view_separator</string> </key>
+ <value> <string encoding="cdata"><![CDATA[
+
+<br />\n
+
+
+]]></string> </value>
+ </item>
+ <item>
+ <key> <string>whitespace_preserve</string> </key>
+ <value> <int>0</int> </value>
+ </item>
+ <item>
+ <key> <string>width</string> </key>
+ <value> <int>40</int> </value>
+ </item>
+ </dictionary>
+ </value>
+ </item>
+ </dictionary>
+ </pickle>
+ </record>
+</ZopeData>
Modified: erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/tree.xml.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/tree.xml.xml?rev=6845&r1=6844&r2=6845&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/tree.xml.xml (original)
+++ erp5/trunk/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/tree.xml.xml Fri Apr 21 15:39:08 2006
@@ -70,20 +70,14 @@
context.getPortalObject().portal_subversion.extractBT(context)\n
\n
-bt_name = context.getPortalObject()["portal_templates"][context.getId()].getTitle()\n
context.REQUEST.RESPONSE.setHeader(\'Content-Type\', \'text/xml;; charset=utf-8\')\n
-path = context.getPortalObject().portal_preferences.getPreferredSubversionWorkingCopy()\n
-if not path :\n
- raise "Error: Please set Subversion working path in preferences"\n
-if path[-1] != \'/\':\n
- path += \'/\'\n
-path+=bt_name\n
-root = context.getPortalObject().portal_subversion.getModifiedTree(path)\n
+\n
+root = context.getPortalObject().portal_subversion.getModifiedTree(context)\n
if not root:\n
return \'\'\'<?xml version=\'1.0\' encoding=\'iso-8859-1\'?>\n
<tree id=\'0\'></tree>\'\'\'\n
\n
-return context.getPortalObject().portal_subversion.treeToXML(root).strip()\n
+return context.getPortalObject().portal_subversion.treeToXML(root, context).strip()\n
]]></string> </value>
@@ -128,9 +122,6 @@
<tuple>
<string>_getattr_</string>
<string>context</string>
- <string>_getitem_</string>
- <string>bt_name</string>
- <string>path</string>
<string>root</string>
</tuple>
</value>
Modified: erp5/trunk/bt5/erp5_forge/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/bt/change_log?rev=6845&r1=6844&r2=6845&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/bt/change_log (original)
+++ erp5/trunk/bt5/erp5_forge/bt/change_log Fri Apr 21 15:39:08 2006
@@ -1,3 +1,7 @@
+2006-04-21 chris
+* added subversion support for several
+working copies
+
2006-04-10 chris
* added Subversion Tool integration
Modified: erp5/trunk/bt5/erp5_forge/bt/version
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_forge/bt/version?rev=6845&r1=6844&r2=6845&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_forge/bt/version (original)
+++ erp5/trunk/bt5/erp5_forge/bt/version Fri Apr 21 15:39:08 2006
@@ -1,1 +1,1 @@
-0.2
+0.3
More information about the Erp5-report
mailing list