From 80533b3bc8b046eff4c56c26a70a6cd3c097c9b1 Mon Sep 17 00:00:00 2001
From: Christophe Dumez <christophe@nexedi.com>
Date: Fri, 12 May 2006 09:41:46 +0000
Subject: [PATCH] - code cleanup + little optimization
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@7240 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
product/ERP5Subversion/Tool/SubversionTool.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/product/ERP5Subversion/Tool/SubversionTool.py b/product/ERP5Subversion/Tool/SubversionTool.py
index 951cf4c4f9..07b81284e7 100644
--- a/product/ERP5Subversion/Tool/SubversionTool.py
+++ b/product/ERP5Subversion/Tool/SubversionTool.py
@@ -518,6 +518,7 @@ class SubversionTool(BaseTool, UniqueObject, Folder):
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 @@ class SubversionTool(BaseTool, UniqueObject, Folder):
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 @@ class SubversionTool(BaseTool, UniqueObject, Folder):
"""
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)
--
2.30.9