Changeset 221 for trunk/lingosource/castlib1/svn_Utilities.ls

Timestamp:

12/21/08 17:39:56 (3 years ago)

Author:

alex

Message:

added automatic deletion of members from subversion repository

File:

• trunk/lingosource/castlib1/svn_Utilities.ls (modified) (48 diffs)

trunk/lingosource/castlib1/svn_Utilities.ls

@@ -356 +356 @@
             bbeditBinary = mFindUnixAppInPath(me, "bbedit")
             if length(bbeditBinary) > 0 then
-              mDoShellCmd(me, bbeditBinary && QUOTE & baUnixName(thePath) & QUOTE)
+              mDoShellCmd(me, bbeditBinary && QUOTE & mConvertHFS2Unix(me, thePath) & QUOTE)
               exit
             end if
@@ -541 +541 @@
   DirectImageInstance = 0
   if skipIcons <> 1 then
-    if mCheckForXtra(me, "DirectImage") = 1 then
-      if the platform contains "mac" then
-        DirectImageInstance = new(xtra "DirectImage", 234521832)
-      else
-        DirectImageInstance = new(xtra "DirectImage", 228285877)
-      end if
-    else if mCheckForXtra(me, "SharpExport") = 1 then
+    if mCheckForXtra(me, "SharpExport") = 1 then
       SharpExportInst = new(xtra "SharpExport")
     else
@@ -557 +551 @@
   isMac = (the platform contains "mac") -- we need the differentiation because of the dreaded 31 char limit
   
+  -----------------------
+  resetUNames = 0
+  if isMac then
+    if baSysFolder("prefs") starts "/" then
+      baReturnUnixNames(0)
+      resetUNames = 1
+    end if
+  end if
+  -----------------------
+  
   doit = 0
   
-  
   statusSwitched = mSwitchToStatusMode(me, 1)
   
   repeat with m = firstCastNum to lastCastNum
+    
+    listOfAllFiles = ["memberinfo"]
     
     thisFolder = theFolder & "castlib" & m
@@ -680 +685 @@
             
             if memref <> member(theDefaultName, m) then
-              put "Member" && memref && "is duplicate. Member with duplicate names are not supported"
+              put "Member" && memref && "is duplicate. Member with duplicate names are not supported. (Can't have the same file twice in one folder.)"
               next repeat
             end if
@@ -743 +748 @@
             snam = baShortFileName(thisFolder & origname & ext)
             if length(snam) > 0 then
+              -- alterText = mGetTextFromFile(me, thisFolder & origname & ext)
+              alterText = mGetTextFromFile(me, snam)
+            else
               alterText = mGetTextFromFile(me, thisFolder & origname & ext)
             end if
@@ -749 +757 @@
           end if
           
+          listOfAllFiles.add(mLowerCase(me, origname))
+          
           if alterText <> scrText then
             
@@ -758 +768 @@
               
               mSaveToTextFile me, scrText, thisFolder & theDefaultName & ext
+              
+              
               
               bmexp = 0
@@ -826 +838 @@
     
     
+    -----------------------
+    if isMac then baReturnUnixNames(1)
+    -----------------------
+    
+    flist = baFileList(thisFolder, "*.*")
+    
+    
+    --    put "flist =" && flist
+    --    put "listOfAllFiles =" && listOfAllFiles
+    repeat with thisFile in flist
+      split = mSplitPath(me, thisFile)
+      if listOfAllFiles.getPos(mLowerCase(me, split[#basename])) < 1 then
+        if isMac then
+          erg = baDeleteFile(mConvertHFS2Unix(me, thisFolder & thisFile))
+        else
+          erg = baDeleteFile(thisFolder & thisFile)
+        end if
+        if erg = 1 then
+          put "Deleted file" && thisFolder & thisFile
+        else
+          put "Unable to delete file" && thisFolder & thisFile
+        end if
+      end if
+    end repeat
+    
+    -----------------------
+    if isMac then baReturnUnixNames(0)
+    -----------------------
+    
+    
   end repeat
+  
+  if resetUNames = 1 then baReturnUnixNames(1)
   
   DirectImageInstance = 0
@@ -1557 +1601 @@
 -- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 
-on mSVN_Update_Working_Copy_ScriptText me, chooseNewPath
+on mSVN_Update_Working_Copy_ScriptText me, revisionNumber, chooseNewPath, selectionList, dontShowAlert
   
   workingCopies = value(getPref("svn_workingCopies_paths.txt"))
@@ -1569 +1613 @@
   
   if the platform contains "mac" then
-    svnBinary = baUnixName(svnBinary)
-    workingFolder = baUnixName(workingFolder)
+    svnBinary = mConvertHFS2Unix(me, svnBinary)
+    workingFolder = mConvertHFS2Unix(me, workingFolder)
   else
     if the last char of workingFolder = the last char of the applicationpath then delete the last char of workingFolder
@@ -1578 +1622 @@
   mDisplayWaitStatusText me, "Updating folder:" && workingFolder
   
-  theresult = mDoShellCmd(me, svnBinary && "update" && QUOTE & workingFolder & QUOTE, RETURN, 0, 1)
+  
+  revisionNumber = getValidRevNumber(me, revisionNumber)
+  
+  castlibList = getCastlibList(me, selectionList)
+  
+  if count(castlibList) < 1 then
+    theresult = mDoShellCmd(me, svnBinary && "update" && QUOTE & workingFolder & QUOTE, RETURN, 0, 1)
+    
+  else
+    
+    theresult = []
+    repeat with num in castlibList
+      
+      if the platform contains "mac" then thePath = workingFolder & "castlib" & num & "/"
+      else thePath = workingFolder & "castlib" & num & the last char of the moviepath
+      
+      ret = mDoShellCmd(me, svnBinary && "update" && "-r" && revisionNumber && QUOTE & thePath & QUOTE, RETURN, 0, 1)
+      if count(ret) > 0 then theresult.add(ret[1])
+      
+    end repeat
+    
+  end if
   
   if statusSwitched = 1 then statusSwitched = mSwitchToStatusMode(me, 0)
   
   if count(theresult) > 0 then
-    put theresult[1]
-    alert "Done, see the results of the svn operation in the message window."
+    repeat with n = 1 to count(theresult)
+      put theresult[n]
+    end repeat
+    if dontShowAlert <> 1 then
+      alert "Done, see the results of the svn operation in the message window."
+    end if
   else
-    alert "svn application did not respond, something seems to have failed. :-("
+    if dontShowAlert <> 1 then
+      alert "svn application did not respond, something seems to have failed. :-("
+    end if
   end if
   
@@ -1593 +1664 @@
 end
 
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+on getValidRevNumber me, revisionNumber
+  if integerP(integer(revisionNumber)) then return string(revisionNumber)
+  
+  revisionNumber = string(revisionNumber)
+  if length(revisionNumber) < 1 then
+    revisionNumber = "HEAD"
+  else
+    if char 1 of revisionNumber = "'" then delete char 1 of revisionNumber
+    if the last char of revisionNumber = "'" then delete the last char of revisionNumber
+  end if
+  
+  return QUOTE & revisionNumber & QUOTE
+end
 
 -- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -1611 +1697 @@
   if the platform contains "mac" then
     isMac = 1
-    svnBinary = baUnixName(svnBinary)
+    svnBinary = mConvertHFS2Unix(me, svnBinary)
     
   else
@@ -1737 +1823 @@
               
               if isMac = 1 then
-                ufpath =  baUnixName(fpath)
+                ufpath =  mConvertHFS2Unix(me, fpath)
               else
                 ufpath =  fpath
@@ -1797 +1883 @@
     
     if isMac = 1 then
-      workingFolder = baUnixName(workingFolder)
+      workingFolder = mConvertHFS2Unix(me, workingFolder)
     else
       if the last char of workingFolder = the last char of the applicationpath then delete the last char of workingFolder
@@ -1898 +1984 @@
   
   
-  castlibList = 0
-  selectionList = string(selectionList)
-  if length(selectionList) > 0 then
-    if char 1 of selectionList <> "[" then put "[" before selectionList
-    if the last char of selectionList <> "]" then put "]" after selectionList
-    selectionList = value(selectionList)
-    if listP(selectionList) then
-      clnum = the number of castlibs + 1
-      castlibList = []
-      selectionListCnt = count(selectionList)
-      repeat with n = 1 to selectionListCnt
-        int = integer(selectionList[n])
-        if integerP(int) then
-          if clnum > int then
-            if castlibList.getPos(int) < 1 then castlibList.add(int)
-          end if
-        end if
-      end repeat
-    end if
-  end if
-  
-  if castlibList = 0 then
-    castlibList = []
-    actCL = the activecastlib
-    castlibList.add(actCL)
-  end if
-  
+  castlibList = getCastlibList(me, selectionList, the activecastlib)
   
   mpname = the moviepath & the moviename
@@ -1989 +2049 @@
     -------------------- get version number:
     if the platform contains "mac" then
-      svnBin = baUnixName(svnBinary)
-      workFolder = baUnixName(workingFolder)
+      svnBin = mConvertHFS2Unix(me, svnBinary)
+      workFolder = mConvertHFS2Unix(me, workingFolder)
     else
       workFolder = workingFolder
@@ -2092 +2152 @@
         offs = offset(mp, fname)
         if offs <> 1 then
-          alert "Castlib" && castlib(actCL) && "is not within your current moviepath. This is not supported."
+          alert "Castlib" && castlib(cl) && "is not within your current moviepath. This is not supported."
           if statusSwitched = 1 then statusSwitched = mSwitchToStatusMode(me, 0)
           return 0
@@ -2104 +2164 @@
         delete the last item of newpathDir
         if baFolderExists(newpathDir) <> 1 then baCreateFolder(newpathDir)
-        baCopyFileProgress(fname, newpath, "Always", "Copying castlib " & actCL & " to working folder", "", 33)
+        baCopyFileProgress(fname, newpath, "Always", "Copying castlib " & cl & " to working folder", "", 33)
         
         castlibList[r] = [cl, fname, newpath, newpathDir]
@@ -2137 +2197 @@
   ---------------------------------------
   if the platform contains "mac" then
-    svnBinary = baUnixName(svnBinary)
-    workingFolder = baUnixName(workingFolder)
+    svnBinary = mConvertHFS2Unix(me, svnBinary)
+    workingFolder = mConvertHFS2Unix(me, workingFolder)
     
     castlibListCnt = count(castlibList)
     repeat with r = 1 to castlibListCnt
-      castlibList[r][3] = baUnixName(castlibList[r][3])
+      castlibList[r][3] = mConvertHFS2Unix(me, castlibList[r][3])
     end repeat
     
@@ -2272 +2332 @@
     -------------------- get version number:
     if the platform contains "mac" then
-      svnBin = baUnixName(svnBinary)
-      workFolder = baUnixName(workingFolder)
+      svnBin = mConvertHFS2Unix(me, svnBinary)
+      workFolder = mConvertHFS2Unix(me, workingFolder)
     else
       workFolder = workingFolder
@@ -2388 +2448 @@
   ---------------------------------------
   if the platform contains "mac" then
-    svnBinary = baUnixName(svnBinary)
-    workingFolder = baUnixName(workingFolder)
+    svnBinary = mConvertHFS2Unix(me, svnBinary)
+    workingFolder = mConvertHFS2Unix(me, workingFolder)
   else
     if the last char of workingFolder = the last char of the applicationpath then delete the last char of workingFolder
@@ -2486 +2546 @@
 -- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 
-on mSVN_Update_SelectedCastlib me, chooseNewPath, onlyUpdate_SVN_WorkingFolder, selectionList, revisionNumber, dontShowAlert
-  
-  actCL = the activecastlib
-  castlibList = [actCL]
+on mSVN_Update_SelectedCastlib_and_source me, chooseNewPath, onlyUpdate_SVN_WorkingFolder, selectionList, revisionNumber, dontShowAlert
+  mSVN_Update_Working_Copy_ScriptText me, revisionNumber, void, selectionList, 1
+  mSVN_Update_SelectedCastlib me, chooseNewPath, onlyUpdate_SVN_WorkingFolder, selectionList, revisionNumber, dontShowAlert
+end
+
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+on getCastlibList me, selectionList, defaultCLNum
+  
+  castlibList = 0
   
   selectionList = string(selectionList)
   if length(selectionList) > 0 then
+    
+    offs = offset("'", selectionList)
+    repeat while offs > 0
+      put QUOTE into char offs of selectionList
+      offs = offset("'", selectionList)
+    end repeat
     
     if char 1 of selectionList <> "[" then put "[" before selectionList
@@ -2503 +2575 @@
       selectionListCnt = count(selectionList)
       repeat with n = 1 to selectionListCnt
-        int = integer(selectionList[n])
-        if integerP(int) then
-          if clnum > int then
-            if castlibList.getPos(int) < 1 then castlibList.add(int)
+        
+        cl = castlib(selectionList[n])
+        if ilk(cl) = #castlib then
+          int = cl.number
+          if castlibList.getPos(int) < 1 then
+            castlibList.add(int)
+          end if
+        else
+          int = integer(selectionList[n])
+          if integerP(int) then
+            if clnum > int then
+              if castlibList.getPos(int) < 1 then castlibList.add(int)
+            end if
           end if
         end if
@@ -2512 +2593 @@
     end if
   end if
+  
+  if not(listP(castlibList)) then castlibList = []
+  
+  if count(castlibList) < 1 then
+    if ilk(defaultCLNum) = #integer then
+      castlibList.add(defaultCLNum)
+    else if listP(defaultCLNum) then
+      castlibList = defaultCLNum
+    end if
+  end if
+  
+  return castlibList
+end
+
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+on mSVN_Update_SelectedCastlib me, chooseNewPath, onlyUpdate_SVN_WorkingFolder, selectionList, revisionNumber, dontShowAlert
+  
+  castlibList = getCastlibList(me, selectionList, the activecastlib)
   
   if count(castlibList) < 1 then
@@ -2568 +2668 @@
         
         if isMac then
-          castlibPathList.add([#newpath:newpath, #newpathUnix: baUnixName(newpath), #fname:fname])
+          castlibPathList.add([#newpath:newpath, #newpathUnix: mConvertHFS2Unix(me, newpath), #fname:fname])
         else
           castlibPathList.add([#newpath:newpath, #newpathUnix: newpath, #fname:fname])
@@ -2590 +2690 @@
       newpath = fname
       if isMac then
-        castlibPathList.add([#newpath:newpath, #newpathUnix: baUnixName(newpath), #fname:fname])
+        castlibPathList.add([#newpath:newpath, #newpathUnix: mConvertHFS2Unix(me, newpath), #fname:fname])
       else
         castlibPathList.add([#newpath:newpath, #newpathUnix: newpath, #fname:fname])
@@ -2622 +2722 @@
   
   if the platform contains "mac" then
-    svnBinary = baUnixName(svnBinary)
-    workingFolderUnix = baUnixName(workingFolder)
+    svnBinary = mConvertHFS2Unix(me, svnBinary)
+    workingFolderUnix = mConvertHFS2Unix(me, workingFolder)
     -- newpathUnix = baUnixName(newpath)
   else
@@ -2634 +2734 @@
   mDisplayWaitStatusText me, "SVN update..." -- && newpathUnix
   
-  if integerP(integer(revisionNumber)) then
-    revisionNumber = string(revisionNumber)
-  else
-    revisionNumber = string(revisionNumber)
-    if length(revisionNumber) < 1 then
-      revisionNumber = "HEAD"
-    else
-      if char 1 of revisionNumber = "'" then delete char 1 of revisionNumber
-      if the last char of revisionNumber = "'" then delete the last char of revisionNumber
-    end if
-    revisionNumber = QUOTE & revisionNumber & QUOTE
-  end if
-  
+  
+  revisionNumber = getValidRevNumber(me, revisionNumber)
   
   repeat with castlibPaths in castlibPathList
@@ -2727 +2816 @@
   
   
+  oldmoviepath = the moviepath
+  oldmovie = oldmoviepath & the moviename
+  
+  
   if the platform contains "mac" then
-    svnBinary = baUnixName(svnBinary)
-    workingFolderUnix = baUnixName(workingFolder)
+    
+    if the platform contains "mac" then
+      if not(interface(xtra "budapi") contains "baUnixName") then
+        alert "Please update your copy of the buddyApi xtra to the latest version, baUnixName() is missing."
+        exit
+      end if
+    end if
+    
+    
+    svnBinary = mConvertHFS2Unix(me, svnBinary)
+    workingFolderUnix = mConvertHFS2Unix(me, workingFolder)
+    targetPath = mConvertHFS2Unix(me, oldmoviepath)
+    
+    theDelim = "/"
+    if the last char of targetPath = theDelim then delete the last char of targetPath
+    if the last char of workingFolderUnix = theDelim then delete the last char of workingFolderUnix
+    
   else
     workingFolderUnix = workingFolder
-    if the last char of workingFolderUnix = the last char of the applicationpath then delete the last char of workingFolderUnix
-  end if
-  
-  oldmoviepath = the moviepath
-  oldmovie = oldmoviepath & the moviename
+    targetPath = oldmoviepath
+    theDelim = the last char of the applicationpath
+    if the last char of workingFolderUnix = theDelim then delete the last char of workingFolderUnix
+    if the last char of targetPath = theDelim then delete the last char of targetPath
+  end if
+  
   
   
@@ -2758 +2867 @@
   mDisplayWaitStatusText me, "SVN update:" && workingFolderUnix
   
-  if integerP(integer(revisionNumber)) then
-    revisionNumber = string(revisionNumber)
-  else
-    revisionNumber = string(revisionNumber)
-    if length(revisionNumber) < 1 then
-      revisionNumber = "HEAD"
-    else
-      if char 1 of revisionNumber = "'" then delete char 1 of revisionNumber
-      if the last char of revisionNumber = "'" then delete the last char of revisionNumber
-    end if
-    revisionNumber = QUOTE & revisionNumber & QUOTE
-  end if
+  revisionNumber = getValidRevNumber(me, revisionNumber)
   
   theresult = mDoShellCmd(me, svnBinary && "update" && "-r" && revisionNumber && QUOTE & workingFolderUnix & QUOTE, RETURN, 0, 1)
@@ -2788 +2886 @@
         
         put "Copy files from " & workingFolder & " to " & oldmoviepath
-        mCopyAllFiles(me, workingFolder, oldmoviepath)
+        
+        --        mCopyAllFiles(me, workingFolder, oldmoviepath, theresult)
+        
+        mCopyAllFiles(me, workingFolder, oldmoviepath, theresult, workingFolderUnix, targetPath)
         
         ----------------------------------
@@ -2799 +2900 @@
     
     if doReturnToOldMovie = 1 then
-     --  put RETURN & "go to movie" && oldmovie & RETURN
+      --  put RETURN & "go to movie" && oldmovie & RETURN
       go to movie oldmovie
     end if
@@ -2822 +2923 @@
 -- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 
-on mCopyAllFiles me, fromFolder, toFolder
-  
-  flist = baFolderList(fromFolder)
-  flistCnt = count(flist)
-  repeat with n = flistCnt down to 1
-    thisFolder = flist[n]
-    if thisFolder starts ".svn" then next repeat
-    if not(baFolderExists(toFolder & thisFolder)) then
-      put "Attempting to create folder:" && toFolder & thisFolder
-      erg = baCreateFolder(toFolder & thisFolder)
-      
-      if erg = 0 then put "successfully created folder"
-      else put "Unable to create folder."
-      
-    else
-      erg = 1
-    end if
-    
-    if erg = 1 then
-      mCopyAllFiles me, fromFolder & thisFolder & the last char of toFolder, toFolder & thisFolder & the last char of toFolder
-    else
-      alert "Unable to create folder (" & thisFolder & "). Error:" && erg
-    end if
-    
-  end repeat
-  
-  flist = baFileList(fromFolder, "*.*")
-  flistCnt = count(flist)
-  repeat with n = 1 to flistCnt
-    thisFile = flist[n]
-    if thisFile starts ".svn" then next repeat
-    -- we get ourselves only dir and cast files:
-    len = length(thisFile)
-    ext = thisFile.char[len-3 .. len]
-    if ext = ".dir" or ext = ".cst" then
-      erg = baCopyFileProgress(fromFolder & thisFile, toFolder & thisFile, "Always", "Replacing movie with the version of the working folder", "", 33)
-      if erg <> 0 then
-        alert "An error occurred during copying the file (" & thisFile & "). Error:" && erg
+on mCopyAllFiles me, fromFolder, toFolder, listOfChangedFiles, fromFolderUnix, toFolderUnix
+  
+  if the platform contains "mac" then
+    if not(interface(xtra "budapi") contains "baReturnUnixNames") then
+      alert "Please update your copy of the buddyApi xtra to the latest version, baReturnUnixNames() is missing."
+      listOfChangedFiles = 0
+    end if
+  end if
+  
+  if listP(listOfChangedFiles) then -- we have a list with status messages from svn for each file
+    
+    resetUNames = 0
+    if the platform contains "mac" then
+      if not(baSysFolder("prefs") starts "/") then
+        baReturnUnixNames(1)
+        resetUNames = 1
+      end if
+    end if
+    
+    repeat with thisFile in listOfChangedFiles
+      if char 2 of thisFile = " " then
+        action = char 1 of thisFile
+        delete char 1 of thisFile
+        repeat while char 1 of thisFile = " "
+          delete char 1 of thisFile
+          if length(thisFile) < 1 then exit repeat
+        end repeat
+        if length(thisFile) > 0 then
+          offs = offset(fromFolderUnix, thisFile)
+          if offs = 1 then
+            case action of
+              "D": -- deleted
+                erg = baDeleteFile(toFolderUnix & thisFile)
+                
+                if erg <> 1 then
+                  alert "An error occurred during deleting the file (" & toFolderUnix & thisFile & "). Error:" && erg
+                else
+                  put "Delted file:" && toFolderUnix & thisFile
+                end if
+                
+              "U", "A": -- updated, added
+                delete char 1 to length(fromFolderUnix) of thisFile
+                erg = baCopyFileProgress(fromFolderUnix & thisFile, toFolderUnix & thisFile, "Always", "Replacing file " & thisFile & " with the version of the working folder", "", 33)
+                
+                if erg <> 0 then
+                  alert "An error occurred during copying the file (" & thisFile & "). Error:" && erg
+                else
+                  put "Replaced file:" && thisFile
+                end if
+                
+            end case
+          else
+            put "Couldn't copy file" && thisFile && "as it doesn't seem to be in the current path:" && fromFolderUnix
+          end if
+          
+        end if
+      end if
+    end repeat
+    
+    if resetUNames = 1 then baReturnUnixNames(0)
+    
+  else -- no list? we just copy over all .dir and .cst and .ls files
+    
+    flist = baFolderList(fromFolder)
+    flistCnt = count(flist)
+    repeat with n = flistCnt down to 1
+      thisFolder = flist[n]
+      if thisFolder starts ".svn" then next repeat
+      if not(baFolderExists(toFolder & thisFolder)) then
+        put "Attempting to create folder:" && toFolder & thisFolder
+        erg = baCreateFolder(toFolder & thisFolder)
+        
+        if erg = 0 then put "successfully created folder"
+        else put "Unable to create folder."
+        
       else
-        put "Replaced file:" && thisFile
+        erg = 1
       end if
-    end if
-  end repeat
-  
+      
+      if erg = 1 then
+        mCopyAllFiles me, fromFolder & thisFolder & the last char of toFolder, toFolder & thisFolder & the last char of toFolder
+      else
+        alert "Unable to create folder (" & thisFolder & "). Error:" && erg
+      end if
+      
+    end repeat
+    
+    flist = baFileList(fromFolder, "*.*")
+    flistCnt = count(flist)
+    repeat with n = 1 to flistCnt
+      thisFile = flist[n]
+      if thisFile starts ".svn" then next repeat
+      -- we get ourselves only dir and cast files:
+      len = length(thisFile)
+      ext = thisFile.char[len-3 .. len]
+      if ext = ".dir" or ext = ".cst" or ext = ".ls" then
+        erg = baCopyFileProgress(fromFolder & thisFile, toFolder & thisFile, "Always", "Replacing movie with the version of the working folder", "", 33)
+        if erg <> 0 then
+          alert "An error occurred during copying the file (" & thisFile & "). Error:" && erg
+        else
+          put "Replaced file:" && thisFile
+        end if
+      end if
+    end repeat
+    
+  end if
 end
 
@@ -2918 +3081 @@
   
   if the platform contains "mac" then
-    svnBin = baUnixName(svnBinary)
-    workFolder = baUnixName(workingFolder)
+    svnBin = mConvertHFS2Unix(me, svnBinary)
+    workFolder = mConvertHFS2Unix(me, workingFolder)
   else
     workFolder = workingFolder
@@ -2962 +3125 @@
     
     -----------------------------------------------------
-    
-    selectionList = string(selectionList)
-    if length(selectionList) > 0 then
-      
-      if char 1 of selectionList <> "[" then put "[" before selectionList
-      if the last char of selectionList <> "]" then put "]" after selectionList
-      
-      selectionList = value(selectionList)
-      if listP(selectionList) then
-        clnum = the number of castlibs + 1
-        castlibList = []
-        selectionListCnt = count(selectionList)
-        repeat with n = 1 to selectionListCnt
-          int = integer(selectionList[n])
-          if integerP(int) then
-            if clnum > int then
-              if castlibList.getPos(int) < 1 then castlibList.add(int)
-            end if
-          end if
-        end repeat
-      end if
-    end if
-    
-    if castlibList = 0 then
-      castlibList = []
-      castlibList.add(selected_Members_Only.number)
-    end if
+    processIOnlySelectedMembers = 1
+    clsellist = string(selectionList)
+    if length(clsellist) > 0 then
+      if listP(value(clsellist)) then processIOnlySelectedMembers = 0
+    end if
+    castlibList = getCastlibList(me, selectionList, selected_Members_Only.number)
     
     
@@ -3007 +3149 @@
     end if
     
-    
-    
-    mDisplayWaitStatusText me, "Commiting scripttext for castlibs:" && castlibList
-    
-    put "Commiting scripttext for castlibs:" && castlibList
     -----------------------------------------------------
     
@@ -3024 +3161 @@
       
       selected_Members_Only = castlib(castlibList[n])
-      
-      mDisplayWaitStatusText me, "Saving castlib:" && selected_Members_Only
-      
       
       -------------------- get version number:
@@ -3051 +3185 @@
       
       
-      selected_Members_Only.save()
-      
       if the last item of workingFolder = "castlib" & selected_Members_Only.number then
         clibfolder = workingFolder
@@ -3063 +3195 @@
       --------
       
-      
-      mExportAllScriptsToDiskWithFolder me, 1, selected_Members_Only, 1, workingFolder
       
     end repeat
@@ -3084 +3214 @@
   else -- treat all:
     
-    mDisplayWaitStatusText me, "Saving movie..."
-    
+    processIOnlySelectedMembers = 0
     
     -------------------- get version number:
@@ -3119 +3248 @@
     
     
-    saveMovie()
-    
-    mExportAllScriptsToDiskWithFolder me, 1, selected_Members_Only, 1, workingFolder
-    
     castlibList = 0
     
@@ -3128 +3253 @@
   
   
+  workingFolderOriginal = workingFolder
   
   if castlibList = 0 then
@@ -3135 +3261 @@
     --------
     
-    
     if the platform contains "mac" then
-      svnBinary = baUnixName(svnBinary)
-      workingFolder = baUnixName(workingFolder)
+      svnBinary = mConvertHFS2Unix(me, svnBinary)
+      workingFolder = mConvertHFS2Unix(me, workingFolder)
     else
       if the last char of workingFolder = the last char of the applicationpath then delete the last char of workingFolder
@@ -3148 +3273 @@
   else
     
-    if the platform contains "mac" then svnBinary = baUnixName(svnBinary)
+    if the platform contains "mac" then svnBinary = mConvertHFS2Unix(me, svnBinary)
     cnt = count(castlibList)
     
@@ -3156 +3281 @@
       
       if the platform contains "mac" then
-        castlibList[n][3] = baUnixName(castlibList[n][3])
+        castlibList[n][3] = mConvertHFS2Unix(me, castlibList[n][3])
       else
         str = castlibList[n][3]
@@ -3190 +3315 @@
   end if
   
+  
+  
+  -------- if we work on only one castlib:
+  
+  if ilk(selected_Members_Only) = #castLib then
+    
+    mDisplayWaitStatusText me, "Commiting scripttext for castlibs:" && castlibList
+    put "Commiting scripttext for castlibs:" && castlibList
+    repeat with n = count(castlibList) down to 1
+      
+      selected_Members_Only = castlib(castlibList[n][1])
+      if processIOnlySelectedMembers = 0 then processEntireCastlib = selected_Members_Only
+      else processEntireCastlib = 1
+      mDisplayWaitStatusText me, "Saving castlib:" && selected_Members_Only
+      selected_Members_Only.save()
+      mExportAllScriptsToDiskWithFolder me, 1, processEntireCastlib, 1, mConvertUnix2Hfs(me, castlibList[n][3])
+      
+    end repeat
+    
+  else -- treat all:
+    
+    mDisplayWaitStatusText me, "Saving movie..."
+    saveMovie()
+    mExportAllScriptsToDiskWithFolder me, 1, processIOnlySelectedMembers, 1, workingFolderOriginal
+    
+  end if
+  
+  
   theresult = mDoShellCmd(me, svnBinary && "status" & workingFolder, RETURN, 0, 1)
   
@@ -3206 +3359 @@
     case meth of
       "!": -- deleted file (missing here, but in the repository present)
-        -- I don't think, it is a good idea to delete the file in the repository in this case
-        -- as it may also be the case, that we only have a subset of the castlibs/scripts
-        -- therefore I just skip these files and leave it to the user what to do with them in his svn client application
-        -- we only put a message, so the user is made aware of this fact
-        put "Missing file!" && answ && "is missing here, but present in the repository"
-        
-        mDisplayWaitStatusText me, "Missing file!" && answ && "is missing here, but present in the repository"
+        
+        if processIOnlySelectedMembers = 1 then
+          -- I don't think, it is a good idea to delete the file in the repository in this case
+          -- as it may also be the case, that we only have a subset of the castlibs/scripts
+          -- therefore I just skip these files and leave it to the user what to do with them in his svn client application
+          -- we only put a message, so the user is made aware of this fact
+          put "Missing file!" && answ && "is missing here, but present in the repository"
+          
+          mDisplayWaitStatusText me, "Missing file!" && answ && "is missing here, but present in the repository"
+          
+        else
+          
+          mDoShellCmd(me, svnBinary && "rm" && QUOTE & answ & QUOTE, RETURN, 0, 1)
+          
+          put "Deleted file" && answ && "in the repository"
+          
+          mDisplayWaitStatusText me, "Deleted file" && answ && "in the repository"
+          
+        end if