[Erp5-report] r7240 - /erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri May 12 11:41:50 CEST 2006
Author: chris
Date: Fri May 12 11:41:46 2006
New Revision: 7240
URL: http://svn.erp5.org?rev=7240&view=rev
Log:
- code cleanup + little optimization
Modified:
erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py
Modified: erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py?rev=7240&r1=7239&r2=7240&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py (original)
+++ erp5/trunk/products/ERP5Subversion/Tool/SubversionTool.py Fri May 12 11:41:46 2006
@@ -518,6 +518,7 @@
if os.path.exists(tmp_path):
head = "<b>"+tmp_path+"</b> (svn temporary file)<hr>"
text = commands.getoutput('enscript -B --color --line-numbers --highlight=html --language=html -o - %s'%tmp_path)
+ # remove heading & trailing useless stuff
text = head + os.linesep.join(text.split(os.linesep)[10:-4])
else : # does not exist
text = "<b>"+file_path+"</b><hr>"
@@ -574,9 +575,9 @@
wc_list = self.getPortalObject().portal_preferences.default_site_preference.getPreferredSubversionWorkingCopyList()
if not wc_list:
raise SubversionPreferencesError, 'Please set at least one Subversion Working Copy in preferences first.'
- bt_name = bt.getTitle()
if len(wc_list) == 0 :
raise SubversionPreferencesError, 'Please set at least one Subversion Working Copy in preferences first.'
+ bt_name = bt.getTitle()
for wc in wc_list:
if bt_name in os.listdir(wc) :
wc_path = os.path.join(wc, bt_name)
@@ -593,7 +594,7 @@
"""
path = self.getSubversionPath(bt)
client = self._getClient()
- # Revert first to import a "pure" BT after update
+ # Revert local changes in working copy first to import a "pure" BT after update
self.revert(path=path, recurse=True)
# Update from SVN
client.update(path)
More information about the Erp5-report
mailing list