- cleanup

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@6486 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ERP5Subversion/SubversionClient.py

@@ -113,7 +113,6 @@ try:
       user, password = self.client.getLogin(realm)
       if not username or not password:
         self.client.setException(SubversionLoginError(realm))
-        #raise SubversionLoginError(realm)
         return False, '', '', False
       return True, user, password, False
   
@@ -124,13 +123,10 @@ try:
   
   class SSLServerTrustPromptCallback(Callback):
     def __call__(self, trust_dict):
-      LOG('SubversionTool', WARNING, 'SSL Trust.')
       trust, permanent = self.client.trustSSLServer(trust_dict)
       if not trust:
-        LOG('SubversionTool', WARNING, 'No Trust.')
         self.client.setException(SubversionSSLTrustError(trust_dict))
         return False, 0, False
-      LOG('SubversionTool', WARNING, 'Has Trust.')
       # XXX SSL server certificate failure bits are not defined in pysvn.
       # 0x8 means that the CA is unknown.
       return True, 0x8, permanent

product/ERP5Subversion/Tool/SubversionTool.py

@@ -187,8 +187,8 @@ class CodeBlock:
     # Getting modifications lines
     tmp = re.search('^@@ -\d+', self.header)
     self.old_line = tmp.string[tmp.start():tmp.end()][4:]
-    tmp = re.search('\+\d+,', self.header)
-    self.new_line = tmp.string[tmp.start():tmp.end()][1:-1]
+    tmp = re.search('\+\d+', self.header)
+    self.new_line = tmp.string[tmp.start():tmp.end()][1:]
     # Splitting modifications in SubCodeBlocks
     in_modif = False
     self.children = []
@@ -598,8 +598,6 @@ class SubversionTool(UniqueObject, Folder):
     svn_path += bt.getTitle()+'/'
     if path[-1]!='/':
       path+='/'
-    # update working copy from repository
-    self.update(svn_path)
     # svn del deleted files
     self.deleteOldFiles(svn_path, path)
     # add new files and copy