Changeset 21 for trunk/lingosource

Timestamp:

09/13/07 17:54:24 (5 years ago)

Author:

alex

Message:

compare to svn version andlers

Location:

trunk/lingosource

Files:

• castlib1/OSCmenu_Utilities.ls (modified) (2 diffs)
• castlib1/alexUtilities.ls (modified) (25 diffs)
• castlib1/memberInfo.xml (modified) (11 diffs)
• castlib2/memberInfo.xml (modified) (7 diffs)

trunk/lingosource/castlib1/OSCmenu_Utilities.ls

@@ -162 +162 @@
     subli.add("mExportListOfUsedLinkedScripts me")
     
+    
+    
+    li.add("")
+    li.add("Compare to SVN")
+    subli = []
+    li.add(subli)
+    subli.add("mCompareCurrentScriptToWorkingCopy me, convertLineBreaksToUnix")
+    subli.add("mExportCurrentScriptToWorkingCopyAndOpen me, convertLineBreaksToUnix")
+    
   end if
   
@@ -198 +207 @@
   li.add(subli)
   
-  subli.add("mSVN_Commit_SelectedCastlib_AND_Scripttext me, chooseNewPath, commitMsg, selectionListMember")
+  subli.add("mSVN_Commit_SelectedCastlib_AND_Scripttext me, chooseNewPath, commitMsg, selectionList")
   subli.add("mSVN_Commit_CurrentMovie_Binaries_AND_Scripttext me, chooseNewPath, commitMsg")
   ----------------------------------------------------

trunk/lingosource/castlib1/alexUtilities.ls

@@ -2338 +2338 @@
   end if
   
-  bbdiffpath = shell_cmd_list("which bbdiff")
-  if count(bbdiffpath) > 0 then
-    bbdiffpath = bbdiffpath[1]
-  else
-    bbdiffpath = ""
-    alert "Consider installing BBEdits command line tools. If we could use bbdiff it would be way nicer."
-  end if
+  --  bbdiffpath = shell_cmd_list("which bbdiff")
+  --  if count(bbdiffpath) > 0 then
+  --    bbdiffpath = bbdiffpath[1]
+  --  else
+  --    bbdiffpath = ""
+  --    alert "Consider installing BBEdits command line tools. If we could use bbdiff it would be way nicer."
+  --  end if
   
   
@@ -3085 +3085 @@
 
 
-
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+on mCompareCurrentScriptToWorkingCopy me, convertLineBreaksToUnix
+  
+  
+  if not(the platform contains "mac") then
+    alert "This function only works with BBDiff, a command line tool provided by the OSX app BBEdit. I am sure, something similar exists for windows too, but you'll need to change this script yourself for windows"
+    exit
+  end if
+  
+  if mCheckForXtra(me, "Shell") = 0 then
+    mShellXtraMissing me
+    exit
+  end if
+  
+  
+  bbdiffpath = mFindUnixAppInPath(me, "bbdiff")
+  if length(bbdiffpath) < 1 then
+    alert "This function only works with BBDiff, a command line tool provided by BBEdit. Consider installing BBEdits command line tools, it is really helpful."
+    exit
+  end if
+  
+  
+  
+  cl = the activecastlib
+  sel = the selection of castlib cl
+  
+  repeat with sub in sel
+    repeat with mem = sub[1] to sub[2]
+      memref = member(mem,cl)   
+      if memref.type = #script then
+        
+        thePath = mFindWorkingCopyCounterpart(me, memref)
+        
+        if length(thePath) < 1 then
+          alert "Corresponding member was not found"
+          exit  
+        end if
+        
+        st = memref.scripttext
+        
+        
+        ---------------------
+        -- create a temporary file from scripttext:
+        tempSrcPath = shell_cmd_list("mktemp -t temp_BBDiff_file1")
+        tempSrcPath = tempSrcPath[1]
+        
+        if mCheckForXtra(me, "budapi") = 0 then
+          tempSrcHFSPath = shell_cmd_list("osascript -e" && QUOTE & "return POSIX file \" & QUOTE & tempSrcPath & "\" & QUOTE & " as string" & QUOTE)
+          tempSrcHFSPath = tempSrcHFSPath[1]
+        else
+          tempSrcHFSPath = baHFSName(tempSrcPath)
+        end if
+        
+        
+        
+        ------------------------------------------ trac subversion support works better with unix linebreaks...
+        if voidP(convertLineBreaksToUnix) then convertLineBreaksToUnix = 1
+        if convertLineBreaksToUnix = "" then convertLineBreaksToUnix = 1
+        
+        if convertLineBreaksToUnix = 1 then
+          
+          if mCheckForXtra(me, "Pregex") = 1 then
+            
+            scrTextLi = [st]
+            pregex_replace(scrTextLi, "\x0D\x0A?", "g", "\x0A")
+            st = scrTextLi[1]
+            
+          else
+            
+            fndStr = numToChar(13) & numToChar(10)
+            offs = offset(fndStr, st)
+            repeat while offs > 0
+              delete char offs of st
+              offs = offset(fndStr, st)
+            end repeat
+            
+            fndStr = numToChar(13)
+            offs = offset(fndStr, st)
+            repeat while offs > 0
+              put numToChar(10) into char offs of st
+              offs = offset(fndStr, st)
+            end repeat
+            
+          end if
+        end if
+        -----------------------------------------
+        
+        
+        
+        theResult = mSaveTextToTempFile(me, st, tempSrcHFSPath)
+        ---------------------
+        
+        
+        
+        if mCheckForXtra(me, "budapi") = 0 then
+          comm = thePath
+          offs = offset(":", comm)
+          repeat while offs
+            put "/" into char offs of comm
+            offs = offset(":", comm)
+          end repeat
+          put "/Volumes/" before comm
+        else
+          comm = baUnixName(thePath)
+        end if
+        
+        shell_cmd(bbdiffpath & " --ignore-curly-quotes --ignore-spaces --wait --resume " &QUOTE& tempSrcPath &QUOTE&&QUOTE& comm &QUOTE)
+        
+        -- since we used the --wait and the --resume switch, we will only come to this line AFTER the diff process in bbedit is finished
+        
+        
+        -------- now write the results of the BBEdit diff back into the script members
+        scrText = mGetTextFromTempFile(me, tempSrcHFSPath)
+        
+        
+        if convertLineBreaksToUnix = 1 then
+          ------------------------------------------ trac subversion support works better with unix linebreaks...
+          if mCheckForXtra(me, "Pregex") = 1 then
+            
+            scrTextLi = [scrText]
+            if the platform contains "mac" then
+              pregex_replace(scrTextLi, "\x0D?\x0A", "g", "\x0D")
+            else
+              pregex_replace(scrTextLi, "\x0D([^\x0A])", "g", "\x0D\x0A\1")
+              pregex_replace(scrTextLi, "([^\x0D])\x0A", "g", "\1\x0D\x0A")
+            end if
+            scrText = scrTextLi[1]
+            
+          else
+            
+            if the platform contains "mac" then
+              
+              -- first convert windows to mac
+              fndStr = numToChar(13) & numToChar(10)
+              offs = offset(fndStr, scrText)
+              repeat while offs > 0
+                put numToChar(13) into char offs to offs+1 of scrText
+                offs = offset(fndStr, scrText)
+              end repeat
+              
+              -- now convert unix to mac
+              fndStr = numToChar(10)
+              offs = offset(fndStr, scrText)
+              repeat while offs > 0
+                put numToChar(13) into char offs of scrText
+                offs = offset(fndStr, scrText)
+              end repeat
+              
+            else
+              
+              fndStr = numToChar(13) & numToChar(10)
+              offs = offset(fndStr, scrText)
+              repeat while offs > 0
+                put "ÀÀÀ" into char offs+1 of scrText
+                offs = offset(fndStr, scrText)
+              end repeat
+              
+              
+              fndStr = numToChar(10)
+              offs = offset(fndStr, scrText)
+              repeat while offs > 0
+                put numToChar(13) & numToChar(10) into char offs of scrText
+                offs = offset(fndStr, scrText)
+              end repeat
+              
+              
+              
+              fndStr = numToChar(13) & "ÀÀÀ"
+              offs = offset(fndStr, scrText)
+              repeat while offs > 0
+                put numToChar(13) & numToChar(10) into char offs to offs+3 of scrText
+                offs = offset(fndStr, scrText)
+              end repeat
+              
+              
+              
+              fndStr = "ÀÀÀ"
+              offs = offset(fndStr, scrText)
+              repeat while offs > 0
+                put numToChar(13) & numToChar(10) into char offs to offs+2 of scrText
+                offs = offset(fndStr, scrText)
+              end repeat
+              
+            end if
+            
+          end if
+          -----------------------------------------
+        end if
+        
+        
+        memref.scripttext = scrText
+        
+      end if
+      
+    end repeat
+  end repeat
+  
+  
+  
+  
+  
+  
+  
+end
+
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+on mFindUnixAppInPath me, whichBinaryName
+  
+  binaryPath = []
+  
+  binaryPath = shell_cmd_list("for thisBinPath in /usr/bin /bin /usr/sbin /sbin /usr/local/sbin /usr/local/bin /opt/sbin /opt/bin /opt/local/sbin /opt/local/bin /sw/bin /sw/sbin ; do find $thisBinPath -name " & whichBinaryName & " ; done")
+  
+  if count(binaryPath) > 0 then return binaryPath[1]
+  
+  return ""
+  
+end
+
+
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+-- this can be used to open the corresponding script in bbedit and svn compare it to head
+
+on mExportCurrentScriptToWorkingCopyAndOpen me, convertLineBreaksToUnix
+  
+  mExportScriptsToFolder me, 1, 1, convertLineBreaksToUnix
+  
+  cl = the activecastlib
+  sel = the selection of castlib cl
+  
+  repeat with sub in sel
+    repeat with mem = sub[1] to sub[2]
+      memref = member(mem,cl)   
+      if memref.type = #script then
+        
+        thePath = mFindWorkingCopyCounterpart(me, memref)
+        
+        if length(thePath) < 1 then
+          alert "Corresponding member was not found"
+          exit  
+        end if
+        
+        st = memref.scripttext
+        
+        mSaveToTextFile me, st, thePath
+        
+        if the platform contains "mac" then
+          if (mCheckForXtra(me, "budapi") + mCheckForXtra(me, "shell")) = 2 then
+            
+            bbeditBinary = mFindUnixAppInPath(me, "bbedit")
+            if length(bbeditBinary) > 0 then
+              shell_cmd(bbeditBinary && QUOTE & baUnixName(thePath) & QUOTE)
+              exit
+            end if
+            
+          end if
+        end if
+        
+        open thePath
+        exit
+        
+      end if
+      
+    end repeat
+  end repeat
+  
+end
+
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+on mFindWorkingCopyCounterpart me, memref
+  
+  workingCopies = value(getPref("svn_workingCopies_paths.txt"))
+  if ilk(workingCopies) <> #proplist then workingCopies = [:]
+  
+  theFolder = mGetWorkingCopyPath(me, the moviepath & the moviename, 0, workingCopies, "No working copy is specified for this movies scripttext. Please select a working copy for the scripttext now.")
+  
+  if length(theFolder) < 1 then return ""
+  
+  
+  m = memref.castlibnum
+  
+  delim = the last char of the applicationpath
+  olddelim = the itemdelimiter
+  the itemdelimiter = delim
+  theFoldername = theFolder
+  if the last char of theFoldername = delim then delete the last char of theFoldername
+  else put delim after theFolder
+  theFoldername = the last item of theFoldername
+  the itemdelimiter = olddelim
+  
+  infolist = 0
+  
+  if theFoldername <> "castlib" & m then
+    
+    newPath = theFolder & "castlib" & m
+    
+    if baFolderExists(newPath) = 0 then
+      
+      infolistPath = theFolder & "memberInfo.xml"
+      
+      infolist = mReadXML_2_List(me, infolistPath)
+      
+      if ilk(infolist) <> #proplist then
+        
+        alert "The specified folder doesn't seem to contain info for this castlib: file memberInfo.xml missing."
+        return ""
+        
+      else
+        
+        theFolder = newPath
+        
+      end if
+      
+    else
+      
+      theFolder = newPath
+      
+    end if
+    
+  end if
+  
+  
+  if infolist = 0 then
+    
+    infolistPath = theFolder & "memberInfo.xml"
+    infolist = mReadXML_2_List(me, infolistPath)
+    
+    if ilk(infolist) <> #proplist then
+      
+      alert "The specified folder doesn't seem to contain info for this castlib: file memberInfo.xml missing."
+      return ""
+      
+    end if
+    
+  end if
+  
+  
+  
+  
+  cnt = count(infolist)
+  
+  repeat with l = 1 to cnt
+    li = infolist[l]
+    if li.getaprop(#memberName) = memref.name then
+      
+      fname = string(infolist[l].getaprop(#fname))
+      if length(fname) < 1 then fname = string(infolist.getpropat(l))
+      fpath = theFolder & fname & ".ls"
+      
+      if baFileExists(fpath) then return fpath
+      
+    end if
+  end repeat
+  
+  
+  return ""
+  
+end
 
 -- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -3268 +3627 @@
           
           ------------------------------------------ trac subversion support works better with unix linebreaks...
+          if voidP(convertLineBreaksToUnix) then convertLineBreaksToUnix = 1
+          if convertLineBreaksToUnix = "" then convertLineBreaksToUnix = 1
+          
           if convertLineBreaksToUnix = 1 then
             
@@ -3357 +3719 @@
           
           
-          infolist.setaprop(origname, [#scripttype: memref.scripttype, #comments: memref.comments, #membername: memname])
+          infolist.setaprop(symbol(origname), [#scripttype: memref.scripttype, #comments: memref.comments, #membername: memname, #fname: origname])
+          -- we need to store origname as string additionally to symbol, as the symbol may change the case (although only ufs is case sensitive
+          -- I am more comfortable with not relying on case insensitivity of filesystems)
           
         end if
@@ -3507 +3871 @@
   repeat with n = 1 to cnt
     thisMemberInfo = infoList[n]
-    fpath = thePath & infoList.getPropAt(n)
+    fname = string(thisMemberInfo.getaprop(#fname))
+    if length(fname) < 1 then fname = string(infoList.getPropAt(n))
+    fpath = thePath & fname
     mImportScriptWithThumbnail me, fpath & ".ls", fd, 1, thisMemberInfo
   end repeat
@@ -3583 +3949 @@
   sel = the selection of castlib cl
   anz = sel.count
-  cnt = 1
+  cnt = count(infolist)
   repeat with n = 1 to anz
     repeat with m = sel[n][1] to sel[n][2]
@@ -3593 +3959 @@
           li = infolist[l]
           if li.getaprop(#memberName) = memref.name then
-            fpath = thePath & infolist.getpropat(l) & ".ls"
+            
+            fname = string(infolist[l].getaprop(#fname))
+            if length(fname) < 1 then fname = string(infolist.getpropat(l))
+            fpath = thePath & fname & ".ls"
             
             if baFileExists(fpath) then
@@ -3672 +4041 @@
     if ilk(infolist) <> #proplist then infolist = [:]
     
-    infolist = infolist.getaprop(fname)
+    infolist = infolist.getaprop(symbol(fname))
     if ilk(infolist) <> #proplist then infolist = [:]
   end if
@@ -3772 +4141 @@
       pregex_replace(scrTextLi, "\x0D?\x0A", "g", "\x0D")
     else
-      pregex_replace(scrTextLi, "\x0D?\x0A", "g", "\x0D\x0A")
+      pregex_replace(scrTextLi, "\x0D([^\x0A])", "g", "\x0D\x0A\1")
+      pregex_replace(scrTextLi, "([^\x0D])\x0A", "g", "\1\x0D\x0A")
     end if
     scrText = scrTextLi[1]
@@ -3780 +4150 @@
     if the platform contains "mac" then
       
+      -- first convert windows to mac
       fndStr = numToChar(13) & numToChar(10)
       offs = offset(fndStr, scrText)
@@ -3787 +4158 @@
       end repeat
       
+      -- now convert unix to mac
+      fndStr = numToChar(10)
+      offs = offset(fndStr, scrText)
+      repeat while offs > 0
+        put numToChar(13) into char offs of scrText
+        offs = offset(fndStr, scrText)
+      end repeat
+      
     else
+      
+      
+      --      fndStr = numToChar(13) & numToChar(10)
+      --      offs = offset(fndStr, scrText)
+      --      repeat while offs > 0
+      --        delete char offs of scrText
+      --        offs = offset(fndStr, scrText)
+      --      end repeat
       
       fndStr = numToChar(13) & numToChar(10)
       offs = offset(fndStr, scrText)
       repeat while offs > 0
-        delete char offs of scrText
+        put "ÀÀÀ" into char offs+1 of scrText
         offs = offset(fndStr, scrText)
       end repeat
+      
+      
+      fndStr = numToChar(10)
+      offs = offset(fndStr, scrText)
+      repeat while offs > 0
+        put numToChar(13) & numToChar(10) into char offs of scrText
+        offs = offset(fndStr, scrText)
+      end repeat
+      
       
       
@@ -3803 +4199 @@
         offs = offset(fndStr, scrText)
       end repeat
+      
       
       
@@ -3969 +4366 @@
           
           if li.getaprop(#memberName) = memref.name then
-            fpath = thePath & infolist.getpropat(l) & ".ls"
+            
+            theFilename = string(li.getaprop(#fname))
+            if length(theFilename) < 1 then theFilename = string(infolist.getpropat(l))
+            
+            fpath = thePath & theFilename & ".ls"
             
             if baFileExists(fpath) then
@@ -4069 +4470 @@
 -- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 
-on mSVN_Commit_SelectedCastlib_AND_Scripttext me, chooseNewPath, commitMsg, selectionListMember
+on mSVN_Commit_SelectedCastlib_AND_Scripttext me, chooseNewPath, commitMsg, selectionList
   
   commitMsg = string(commitMsg)
@@ -4081 +4482 @@
   end if
   
-  theResult = mSVN_Commit_CurrentScripts_ScriptText(me, castlib(the activecastlib), chooseNewPath, commitMsg, 1, selectionListMember)
-  
-  theResult = mSVN_Commit_SelectedCastlib(me, chooseNewPath, commitMsg, 1, 0, selectionListMember)
-  
-end
-
--- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-
-on mSVN_Commit_SelectedCastlib me, chooseNewPath, commitMsg, dontSave, dontShowAlert, selectionListMember
+  theResult = mSVN_Commit_CurrentScripts_ScriptText(me, castlib(the activecastlib), chooseNewPath, commitMsg, 1, selectionList)
+  
+  theResult = mSVN_Commit_SelectedCastlib(me, chooseNewPath, commitMsg, 1, 0, selectionList)
+  
+end
+
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+on mSVN_Commit_SelectedCastlib me, chooseNewPath, commitMsg, dontSave, dontShowAlert, selectionList
   
   
   castlibList = 0
-  selectionListMember = member(selectionListMember)
-  if length(selectionListMember) > 0 then
-    mem = member(selectionListMember)
-    if not(voidP(mem)) then
-      dertext = mem.text
-      dertext = value(dertext.line[1])
-      if listP(dertext) then
-        castlibList = []
-        dertextCnt = count(dertext)
-        repeat with n = 1 to dertextCnt
-          if listP(dertext[n]) then
-            castlibList.add(n)
+  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 repeat
-      end if
+        end if
+      end repeat
     end if
   end if
@@ -4127 +4530 @@
   end repeat
   
-  if count(castlibList) < 1 then return 0
+  
+  if count(castlibList) < 1 then
+    alert "No castlib selected. The parameter didn't yiled a valid list. Make sure, that you provide a linear list with integers, specifying a number of a castlib each."
+    return 0
+  end if
+  
+  put "Committing castlibs:" && castlibList
   
   
@@ -4196 +4605 @@
     
     
-    repeat with cl in castlibList
+    castlibListCnt = count(castlibList)
+    repeat with r = 1 to castlibListCnt
+      cl = castlibList[r]
       
       fname = castlib(cl).filename
@@ -4217 +4628 @@
         baCopyFileProgress(fname, newpath, "Always", "Copying castlib " & actCL & " to working folder", "", 33)
         
-        castlibList[cl] = [cl, fname, newpath, newpathDir]
+        castlibList[r] = [cl, fname, newpath, newpathDir]
         
       else
@@ -4233 +4644 @@
   else
     
-    repeat with cl in castlibList
+    castlibListCnt = count(castlibList)
+    repeat with r = 1 to castlibListCnt
+      cl = castlibList[r]
       newpath = fname
       castlibList[cl] = [cl, fname, fname]
@@ -4247 +4660 @@
     workingFolder = baUnixName(workingFolder)
     
-    repeat with cl in castlibList
-      castlibList[cl][3] = baUnixName(castlibList[cl][3])
+    castlibListCnt = count(castlibList)
+    repeat with r = 1 to castlibListCnt
+      castlibList[r][3] = baUnixName(castlibList[r][3])
     end repeat
     
@@ -4257 +4671 @@
   
   
-  
-  repeat with cl in castlibList
+  isChanged = 0
+  castlibListCnt = count(castlibList)
+  repeat with r = 1 to castlibListCnt
+    --    cl = castlibList[r]
+    --  repeat with cl in castlibList
     ---------------------------------------
-    theresult = shell_cmd_list(svnBinary && "update" && QUOTE & castlibList[cl][3] & QUOTE)
+    theresult = shell_cmd_list(svnBinary && "update" && QUOTE & castlibList[r][3] & QUOTE)
     
     if count(theresult) < 1 then
-      theresult = shell_cmd_list(svnBinary && "update" && QUOTE & castlibList[cl][3] & QUOTE && "2>&1")
+      theresult = shell_cmd_list(svnBinary && "update" && QUOTE & castlibList[r][3] & QUOTE && "2>&1")
       if count(theresult) < 1 then
         theError = theresult[1]
@@ -4276 +4693 @@
     
     
-    theresult = shell_cmd_list(svnBinary && "status" && QUOTE & castlibList[cl][3] & QUOTE)
+    theresult = shell_cmd_list(svnBinary && "status" && QUOTE & castlibList[r][3] & QUOTE)
     
     cnt = count(theresult)
-    if cnt < 1 then
-      alert "Apparently there are no changes to the most recent version in the svn repository: svn status is empty"
-      return 0
+    if cnt > 0 then
+      isChanged = 1
+      --      alert "Apparently there are no changes to the most recent version in the svn repository: svn status is empty"
+      --      return 0
     end if
     
   end repeat
   
+  if isChanged = 0 then
+    alert "Apparently there are no changes to the most recent version in the svn repository: svn status is empty"
+    return 0 
+  end if
+  
+  
   pathStr = ""
-  repeat with cl in castlibList
-    put " " & QUOTE & castlibList[cl][3] & QUOTE after pathStr
+  castlibListCnt = count(castlibList)
+  repeat with r = 1 to castlibListCnt
+    put " " & QUOTE & castlibList[r][3] & QUOTE after pathStr
   end repeat
   
@@ -4757 +5182 @@
 -- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 
-on mSVN_Commit_CurrentScripts_ScriptText me, selected_Members_Only, chooseNewPath, commitMsg, dontShowAlert, selectionListMember
+on mSVN_Commit_CurrentScripts_ScriptText me, selected_Members_Only, chooseNewPath, commitMsg, dontShowAlert, selectionList
   
   workingCopies = value(getPref("svn_workingCopies_paths.txt"))
@@ -4805 +5230 @@
     -----------------------------------------------------
     
-    selectionListMember = member(selectionListMember)
-    if length(selectionListMember) > 0 then
-      mem = member(selectionListMember)
-      if not(voidP(mem)) then
-        dertext = mem.text
-        dertext = value(dertext.line[1])
-        if listP(dertext) then
-          castlibList = []
-          dertextCnt = count(dertext)
-          repeat with n = 1 to dertextCnt
-            if listP(dertext[n]) then
-              castlibList.add(n)
+    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 repeat
-        end if
+          end if
+        end repeat
       end if
     end if
@@ -4838 +5267 @@
     end repeat
     
-    if count(castlibList) < 1 then return 0
+    
+    if count(castlibList) < 1 then
+      alert "No castlib selected. The parameter didn't yiled a valid list. Make sure, that you provide a linear list with integers, specifying a number of a castlib each."
+      return 0
+    end if
+    
+    
+    put "Commiting scripttext for castlibs:" && castlibList
     -----------------------------------------------------
     

trunk/lingosource/castlib1/memberInfo.xml

@@ -5 +5 @@
                 <comments></comments>
                 <memberName>thisMoviesScript</memberName>
+                <fname>thisMoviesScript</fname>
         </thisMoviesScript>
         <keyboardNavigation_FrameLoop>
@@ -10 +11 @@
                 <comments></comments>
                 <memberName>keyboardNavigation_FrameLoop</memberName>
+                <fname>keyboardNavigation_FrameLoop</fname>
         </keyboardNavigation_FrameLoop>
         <simpleBMMenu>
@@ -15 +17 @@
                 <comments></comments>
                 <memberName>simpleBMMenu</memberName>
+                <fname>simpleBMMenu</fname>
         </simpleBMMenu>
         <OSCmenu_Utilities>
@@ -20 +23 @@
                 <comments></comments>
                 <memberName>OSCmenu_Utilities</memberName>
+                <fname>OSCmenu_Utilities</fname>
         </OSCmenu_Utilities>
         <alexUtilities>
@@ -25 +29 @@
                 <comments>~/Documents/Scripts/lingo/commonMovieScript.ls</comments>
                 <memberName>alexUtilities</memberName>
+                <fname>alexUtilities</fname>
         </alexUtilities>
         <convert_Lingo_2_CSS_Html>
@@ -30 +35 @@
                 <comments>~/Documents/Scripts/lingo/convert_Lingo_2_CSS_Html.ls</comments>
                 <memberName>convert_Lingo_2_CSS_Html</memberName>
+                <fname>convert_Lingo_2_CSS_Html</fname>
         </convert_Lingo_2_CSS_Html>
         <OSCmenu_Handlers>
@@ -35 +41 @@
                 <comments></comments>
                 <memberName>OSCmenu_Handlers</memberName>
+                <fname>OSCmenu_Handlers</fname>
         </OSCmenu_Handlers>
         <resizewindowfs>
@@ -40 +47 @@
                 <comments></comments>
                 <memberName>resizewindowfs</memberName>
+                <fname>resizewindowfs</fname>
         </resizewindowfs>
         <showHideHelp>
@@ -45 +53 @@
                 <comments></comments>
                 <memberName>showHideHelp</memberName>
+                <fname>showHideHelp</fname>
         </showHideHelp>
         <texthyperlinkBehavior>
@@ -50 +59 @@
                 <comments>/Users/alex/Documents/ALIEN/myLinkedScripts/texthyperlinkBehavior.ls</comments>
                 <memberName>texthyperlinkBehavior</memberName>
+                <fname>texthyperlinkBehavior</fname>
         </texthyperlinkBehavior>
         <bbdiff>
@@ -55 +65 @@
                 <comments></comments>
                 <memberName>bbdiff</memberName>
+                <fname>bbdiff</fname>
         </bbdiff>
 </Untitled>

trunk/lingosource/castlib2/memberInfo.xml

@@ -5 +5 @@
                 <comments>~/Documents/Scripts/lingo/commonMovieScript.ls</comments>
                 <memberName>commonMovieScript</memberName>
+                <fname>commonMovieScript</fname>
         </commonmoviescript>
         <FileIOFunktionen>
@@ -10 +11 @@
                 <comments>~/Documents/Scripts/lingo/FileIOFunktionen.ls</comments>
                 <memberName>FileIOFunktionen</memberName>
+                <fname>FileIOFunktionen</fname>
         </FileIOFunktionen>
         <GetSetPrefs>
@@ -15 +17 @@
                 <comments>~/Documents/Scripts/lingo/GetSetPrefs.ls</comments>
                 <memberName>GetSetPrefs</memberName>
+                <fname>GetSetPrefs</fname>
         </GetSetPrefs>
         <aleXtrasMovieScript>
@@ -20 +23 @@
                 <comments>~/Documents/Scripts/lingo/aleXtrasMovieScript.ls</comments>
                 <memberName>aleXtrasMovieScript</memberName>
+                <fname>aleXtrasMovieScript</fname>
         </aleXtrasMovieScript>
         <PseudoXMLPS>
@@ -25 +29 @@
                 <comments>~/Documents/Scripts/lingo/PseudoXMLPS.ls</comments>
                 <memberName>PseudoXMLPS</memberName>
+                <fname>PseudoXMLPS</fname>
         </PseudoXMLPS>
         <simpleGoToAction>
@@ -30 +35 @@
                 <comments>/Users/alex/Documents/ALIEN/myLinkedScripts/simpleGoToAction.ls</comments>
                 <memberName>simpleGoToAction</memberName>
+                <fname>simpleGoToAction</fname>
         </simpleGoToAction>
         <SpriteNameBeaver>
@@ -35 +41 @@
                 <comments>~/Documents/Scripts/lingo/SpriteNameBeaver.ls</comments>
                 <memberName>SpriteNameBeaver</memberName>
+                <fname>SpriteNameBeaver</fname>
         </SpriteNameBeaver>
-        <commonmoviescript>
-                <scriptType>#parent</scriptType>
-                <comments>~/Documents/Scripts/lingo/commonMovieScript.ls</comments>
-                <memberName>commonMovieScript</memberName>
-        </commonmoviescript>
-        <commonmoviescript>
-                <scriptType>#parent</scriptType>
-                <comments>~/Documents/Scripts/lingo/commonMovieScript.ls</comments>
-                <memberName>commonMovieScript</memberName>
-        </commonmoviescript>
-        <commonmoviescript>
-                <scriptType>#parent</scriptType>
-                <comments>~/Documents/Scripts/lingo/commonMovieScript.ls</comments>
-                <memberName>commonMovieScript</memberName>
-        </commonmoviescript>
-        <commonMovieScript>
-                <scriptType>#parent</scriptType>
-                <comments>~/Documents/Scripts/lingo/commonMovieScript.ls</comments>
-                <memberName>commonMovieScript</memberName>
-        </commonMovieScript>
 </Untitled>