Changeset 18 for trunk/lingosource

Timestamp:

09/04/07 16:32:13 (5 years ago)

Author:

alex

Message:

added even more svn handlers

Location:

trunk/lingosource

Files:

• castlib1/OSCmenu_Utilities.ls (modified) (1 diff)
• castlib1/alexUtilities.ls (modified) (21 diffs)
• castlib2/memberInfo.xml (modified) (1 diff)

trunk/lingosource/castlib1/OSCmenu_Utilities.ls

@@ -167 +167 @@
   ---------------------------------------------------- scripttext export functions:
   li.add("")
-  li.add("Scripttext export for SVN")
-  subli = []
-  li.add(subli)
-  subli.add("mExportScriptsToFolder me, skipIcons, selectionOnly, convertLineBreaksToUnix")
+  li.add("Scripttext ex/import for SVN")
+  subli = []
+  li.add(subli)
+  subli.add("mExportScriptsToFolder me, skipIcons, selectionOnly, convertLineBreaksToUnix, chooseNewPath")
+  subli.add("mImportScriptWithThumbnail me, thePath, castlibNumber, dontWarn, infolist")
+  subli.add("")
+  subli.add("mSVN_Update_Working_Copy_ScriptText me, chooseNewPath")
   subli.add("mSVN_Update_And_Import_ScriptsFromFolder me, thePath, selectionOnly")
   subli.add("")
-  subli.add("mImportScriptWithThumbnail me, thePath, castlibNumber, dontWarn, infolist")
+  subli.add("mSVN_Commit_CurrentScripts_ScriptText me, selected_Members_Only")
+  subli.add("")
+  subli.add("mSVN_Delete_Selected_Scripts me, chooseNewPath")
+  
   
   ---------------------------------------------------- svn functions:
   li.add("")
-  li.add("SVN")
-  subli = []
-  li.add(subli)
-  subli.add("mSVN_Delete_Selected_Scripts me, chooseNewPath")
-  subli.add("")
-  subli.add("mSVN_Update_Working_Copy_ScriptText me, chooseNewPath")
-  subli.add("mSVN_Commit_CurrentScripts_ScriptText me, selected_Members_Only")
-  subli.add("")
+  li.add("SVN -- binary director files")
+  subli = []
+  li.add(subli)
+  subli.add("mSVN_Update_SelectedCastlib me, chooseNewPath, onlyUpdate_SVN_WorkingFolder")
   subli.add("mSVN_Update_CurrentMovie_Binaries me, chooseNewPath, onlyUpdate_SVN_WorkingFolder")
+  subli.add("")
+  subli.add("mSVN_Commit_SelectedCastlib me, chooseNewPath, commitMsg")
   subli.add("mSVN_Commit_CurrentMovie_Binaries me, chooseNewPath, commitMsg")
-    subli.add("")
+  ----------------------------------------------------
+  
+  li.add("")
+  li.add("SVN -- binary AND text")
+  subli = []
+  li.add(subli)
+  
+  subli.add("mSVN_Commit_SelectedCastlib_AND_Scripttext me, chooseNewPath, commitMsg")
   subli.add("mSVN_Commit_CurrentMovie_Binaries_AND_Scripttext me, chooseNewPath, commitMsg")
   ----------------------------------------------------

trunk/lingosource/castlib1/alexUtilities.ls

@@ -3090 +3090 @@
 -- export all scripts into a folder (I use this to compare to versions of a movie, open movie 1, export all scripts, open movie 2 and export all scripts and then compare with bbdiff both folders)
 
-on mExportScriptsToFolder me, skipIcons, selectionOnly, convertLineBreaksToUnix, theFolder
-  mExportAllScriptsToDiskWithFolder me, skipIcons, selectionOnly, convertLineBreaksToUnix
-end
-
--- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
-
-on mExportAllScriptsToDiskWithFolder me, skipIcons, selectionOnly, convertLineBreaksToUnix, theFolder
+on mExportScriptsToFolder me, skipIcons, selectionOnly, convertLineBreaksToUnix, chooseNewPath
+  mExportAllScriptsToDiskWithFolder me, skipIcons, selectionOnly, convertLineBreaksToUnix, void, chooseNewPath
+end
+
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+on mExportAllScriptsToDiskWithFolder me, skipIcons, selectionOnly, convertLineBreaksToUnix, theFolder, chooseNewPath
   
   theFolder = string(theFolder)
   if length(theFolder) < 1 then
-    theFolder = mGetFolderPathFromUser(me)
+    
+    if chooseNewPath <> 1 then
+      workingCopies = value(getPref("svn_workingCopies_paths.txt"))
+      if ilk(workingCopies) <> #proplist then workingCopies = [:]
+      
+      theFolder = mGetWorkingCopyPath(me, the moviepath & the moviename, chooseNewPath, workingCopies, "No working copy is specified for this movies scripttext. Please select a working copy for the scripttext now.")
+    end if
+    
+    if length(theFolder) < 1 then
+      
+      theFolder = mGetFolderPathFromUser(me)
+      
+    end if
+    
   end if
   
   if length(theFolder) < 1 then exit
   
-  if selectionOnly = 1 then
-    cl = the activecastlib
-    sel = the selection of castlib cl
-    
-    firstCastNum = cl
-    lastCastNum = cl    
+  if ilk(selectionOnly) = #castlib then
+    firstCastNum = selectionOnly.number
+    lastCastNum = firstCastNum
+    selectionOnly = 0
     
   else
-    firstCastNum = 1
-    lastCastNum = the number of castlibs
-  end if
+    if selectionOnly = 1 then
+      cl = the activecastlib
+      sel = the selection of castlib cl
+      
+      firstCastNum = cl
+      lastCastNum = cl    
+      
+    else
+      firstCastNum = 1
+      lastCastNum = the number of castlibs
+    end if
+  end if
+  
   
   isMac = (the platform contains "mac") -- we need the differentiation because of the dreaded 31 char limit
@@ -3826 +3847 @@
   if length(svnBinary) < 1 then exit
   
-  workingFolder = mGetWorkingCopyPath(me, the moviepath & the moviename, chooseNewPath, workingCopies)
+  workingFolder = mGetWorkingCopyPath(me, the moviepath & the moviename, chooseNewPath, workingCopies, "No working copy is specified for this movies scripttext. Please select a working copy for the scripttext now.")
   if length(workingFolder) < 1 then exit
   
@@ -3861 +3882 @@
   if length(svnBinary) < 1 then exit
   
-  workingFolder = mGetWorkingCopyPath(me, the moviepath & the moviename, chooseNewPath, workingCopies)
+  workingFolder = mGetWorkingCopyPath(me, the moviepath & the moviename, chooseNewPath, workingCopies, "No working copy is specified for this movies scripttext. Please select a working copy for the scripttext now.")
   if length(workingFolder) < 1 then exit
   
@@ -4040 +4061 @@
   
   
-  theResult = mSVN_Commit_CurrentScripts_ScriptText(me, 0, chooseNewPath, commitMsg)
+  theResult = mSVN_Commit_CurrentScripts_ScriptText(me, 0, chooseNewPath, commitMsg, 1)
   
   theResult = mSVN_Commit_CurrentMovie_Binaries(me, chooseNewPath, commitMsg, 1)
@@ -4048 +4069 @@
 -- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 
-on mSVN_Commit_CurrentMovie_Binaries me, chooseNewPath, commitMsg, dontSave
+on mSVN_Commit_SelectedCastlib_AND_Scripttext me, chooseNewPath, commitMsg 
+  
+  commitMsg = string(commitMsg)
+  if length(commitMsg) < 1 then
+    commitMsg = baPrompt("Commit message", "Enter commit message", "Commitmessage", 0, -2, -2)
+    
+    if length(commitMsg) < 1 then
+      alert "You must enter a message for the commit action."
+      exit
+    end if
+  end if
+  
+  theResult = mSVN_Commit_CurrentScripts_ScriptText(me, castlib(the activecastlib), chooseNewPath, commitMsg, 1)
+  
+  theResult = mSVN_Commit_SelectedCastlib(me, chooseNewPath, commitMsg, 1)
+  
+end
+
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+on mSVN_Commit_SelectedCastlib me, chooseNewPath, commitMsg, dontSave, dontShowAlert
+  
+  actCL = the activecastlib
   
   workingCopies = value(getPref("svn_wCopies_paths_Binary.txt"))
@@ -4056 +4099 @@
   if length(svnBinary) < 1 then return 0
   
-  workingFolder = mGetWorkingCopyPath(me, the moviepath & the moviename, chooseNewPath, workingCopies)
+  workingFolder = mGetWorkingCopyPath(me, the moviepath & the moviename, chooseNewPath, workingCopies, "No working copy is specified for this movies binaries (director files). Please select a working copy of the director files.")
+  if length(workingFolder) < 1 then return 0
+  
+  
+  ---------------------------------------
+  msg = string(commitMsg)
+  if length(msg) < 1 then
+    msg = baPrompt("Commit message", "Enter commit message", "Commitmessage", 0, -2, -2)
+    
+    if length(msg) < 1 then
+      alert "You must enter a message for the commit action."
+      return 0
+    end if
+  end if
+  ---------------------------------------
+  
+  
+  ---------------------------------------
+  if dontSave <> 1 then
+    -- this flag is only for the case, we come here from the combined commit call "mSVN_Commit_CurrentMovie_Binaries_AND_Scripttext"
+    -- as the movie was already saved in "mSVN_Commit_CurrentScripts_ScriptText"
+    
+    if workingCopies.getaprop(#dontWarnWhenSaving) <> 1 then
+      answer = baMsgBoxEx("The castlib will be saved before committing.", "Save castlib?", "Save", "Cancel", "Always save", "Question", 1, "left", "Arial", 14, 4, -2, -2)
+      if answer = "Cancel" then return 0
+      if answer = "Always save" then workingCopies.setaprop(#dontWarnWhenSaving, 1)
+    end if
+    
+    if the moviepath & the moviename = castlib(actCL).filename then
+      savemovie()
+    else
+      castlib(actCL).save()
+    end if
+    
+  end if
+  ----------------------------------------
+  
+  fname = castlib(actCL).filename
+  
+  
+  ---------------------------------------
+  if workingFolder <> the moviepath then
+    
+    mp = the moviepath
+    mplen = length(mp)
+    olddelim = the itemdelimiter
+    the itemdelimiter = mp
+    
+    fname = castlib(actCL).filename
+    if length(fname) > 0 then
+      
+      offs = offset(mp, fname)
+      if offs <> 1 then
+        alert "Castlib" && castlib(actCL) && "is not within your current moviepath. This is not supported."
+        return 0
+      end if
+      
+      relpath = fname
+      delete char 1 to mplen of relpath
+      
+      newpath = workingFolder & relpath
+      newpathDir = newpath
+      delete the last item of newpathDir
+      if baFolderExists(newpathDir) <> 1 then baCreateFolder(newpathDir)
+      baCopyFileProgress(fname, newpath, "Always", "Copying castlib " & actCL & " to working folder", "", 33)
+      
+    else
+      
+      -- musty something REALLY wrong, as the filename should ALWAYS be of any length (internal castlibs )
+      return 0
+      
+    end if
+    
+    the itemdelimiter = olddelim
+    
+  else
+    
+    newpath = fname
+  end if
+  ---------------------------------------
+  
+  
+  ---------------------------------------
+  if the platform contains "mac" then
+    svnBinary = baUnixName(svnBinary)
+    workingFolder = baUnixName(workingFolder)
+    newpath = baUnixName(newpath)
+  else
+    if the last char of workingFolder = the last char of the applicationpath then delete the last char of workingFolder
+  end if
+  ---------------------------------------
+  
+  
+  ---------------------------------------
+  theresult = shell_cmd_list(svnBinary && "update" && QUOTE & newpath & QUOTE)
+  
+  if count(theresult) < 1 then
+    theresult = shell_cmd_list(svnBinary && "update" && QUOTE & newpath & QUOTE && "2>&1")
+    if count(theresult) < 1 then
+      theError = theresult[1]
+    else
+      theError = "svn did not respond at all."
+    end if
+    alert "Can't proceed svn error while trying to update:" && theError
+    return 0  
+  end if
+  ---------------------------------------
+  
+  
+  theresult = shell_cmd_list(svnBinary && "status" && QUOTE & newpath & 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
+  end if
+  
+  theresult = shell_cmd_list(svnBinary && "ci --message" && QUOTE & msg & QUOTE && QUOTE & newpath & QUOTE)
+  
+  
+  ---------------------------------------
+  if count(theresult) > 0 then
+    theResult = theresult[1]
+    
+    put theResult
+    if dontShowAlert <> 1 then alert "Done, see the results of the svn operation in the message window."
+    
+  else
+    if dontShowAlert <> 1 then alert "svn application did not respond, something seems to have failed. :-("
+  end if
+  ---------------------------------------
+  
+  setPref("svn_wCopies_paths_Binary.txt", string(workingCopies))
+  
+  return 1
+  
+end
+
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+on mSVN_Commit_CurrentMovie_Binaries me, chooseNewPath, commitMsg, dontSave, dontShowAlert
+  
+  workingCopies = value(getPref("svn_wCopies_paths_Binary.txt"))
+  if ilk(workingCopies) <> #proplist then workingCopies = [:]
+  
+  svnBinary = mGetSVNBinaryPath(me, workingCopies)
+  if length(svnBinary) < 1 then return 0
+  
+  workingFolder = mGetWorkingCopyPath(me, the moviepath & the moviename, chooseNewPath, workingCopies, "No working copy is specified for this movies binaries (director files). Please select a working copy of the director files.")
   if length(workingFolder) < 1 then return 0
   
@@ -4106 +4297 @@
       if length(fname) > 0 then
         
-        offs = offset(mp, fname)
-        if offs <> 1 then
-          alert "Castlib" && castlib(n) && "is not within your current moviepath. This is not supported."
-          return 0
+        if the moviepath & the moviename <> fname then
+          offs = offset(mp, fname)
+          if offs <> 1 then
+            alert "Castlib" && castlib(n) && "is not within your current moviepath. This is not supported."
+            return 0
+          end if
+          relpath = fname
+          delete char 1 to mplen of relpath
+          
+          newpath = workingFolder & relpath
+          newpathDir = newpath
+          delete the last item of newpathDir
+          if baFolderExists(newpathDir) <> 1 then baCreateFolder(newpathDir)
+          baCopyFileProgress(fname, newpath, "Always", "Copying castlib " & n & " to working folder", "", 33)
+          
         end if
-        relpath = fname
-        delete char 1 to mplen of relpath
-        
-        newpath = workingFolder & relpath
-        newpathDir = newpath
-        delete the last item of newpathDir
-        if baFolderExists(newpathDir) <> 1 then baCreateFolder(newpathDir)
-        baCopyFileProgress(fname, newpath, "Always", "Copying castlib " & n & " to working folder", "", 33)
         
       end if
@@ -4201 +4395 @@
     
     put theResult
-    alert "Done, see the results of the svn operation in the message window."
+    if dontShowAlert <> 1 then alert "Done, see the results of the svn operation in the message window."
     
   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
   ---------------------------------------
@@ -4215 +4409 @@
 -- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 
-on mSVN_Update_CurrentMovie_Binaries me, chooseNewPath, onlyUpdate_SVN_WorkingFolder
+on mSVN_Update_SelectedCastlib me, chooseNewPath, onlyUpdate_SVN_WorkingFolder, dontShowAlert
+  
+  actCL = the activecastlib
   
   workingCopies = value(getPref("svn_wCopies_paths_Binary.txt"))
@@ -4223 +4419 @@
   if length(svnBinary) < 1 then exit
   
-  workingFolder = mGetWorkingCopyPath(me, the moviepath & the moviename, chooseNewPath, workingCopies)
+  workingFolder = mGetWorkingCopyPath(me, the moviepath & the moviename, chooseNewPath, workingCopies, "No working copy is specified for this movies binaries (director files). Please select a working copy of the director files.")
   if length(workingFolder) < 1 then exit
   
-  if the platform contains "mac" then
-    svnBinary = baUnixName(svnBinary)
-    workingFolder = baUnixName(workingFolder)
-  else
-    if the last char of workingFolder = the last char of the applicationpath then delete the last char of workingFolder
-  end if
+  
   
   oldmoviepath = the moviepath
   oldmovie = oldmoviepath & the moviename
+  
+  
+  fname = castlib(actCL).filename
+  
+  ---------------------------------------
+  if workingFolder <> the moviepath then
+    
+    mp = the moviepath
+    mplen = length(mp)
+    olddelim = the itemdelimiter
+    the itemdelimiter = mp
+    
+    if length(fname) > 0 then
+      
+      offs = offset(mp, fname)
+      if offs <> 1 then
+        alert "Castlib" && castlib(actCL) && "is not within your current moviepath. This is not supported."
+        return 0
+      end if
+      
+      relpath = fname
+      delete char 1 to mplen of relpath
+      
+      newpath = workingFolder & relpath
+      newpathDir = newpath
+      delete the last item of newpathDir
+      -- if baFolderExists(newpathDir) <> 1 then baCreateFolder(newpathDir)
+      -- baCopyFileProgress(fname, newpath, "Always", "Copying castlib " & actCL & " to working folder", "", 33)
+      
+    else
+      
+      -- musty something REALLY wrong, as the filename should ALWAYS be of any length (internal castlibs )
+      return 0
+      
+    end if
+    
+    the itemdelimiter = olddelim
+    
+  else
+    
+    newpath = fname
+  end if
+  ---------------------------------------
+  
+  
+  
+  doReturnToOldMovie = 0
   
   if (onlyUpdate_SVN_WorkingFolder <> 1) or (the moviepath contains workingFolder) then
@@ -4244 +4482 @@
     ------------------------------
     
-    onlyUpdate_SVN_WorkingFolder = 1
-  end if
-  
-  theresult = shell_cmd_list(svnBinary && "update" && QUOTE & workingFolder & QUOTE)
+    doReturnToOldMovie = 1
+    
+  end if
+  
+  
+  
+  if the platform contains "mac" then
+    svnBinary = baUnixName(svnBinary)
+    workingFolderUnix = baUnixName(workingFolder)
+    newpathUnix = baUnixName(newpath)
+  else
+    newpathUnix = newpath
+    workingFolderUnix = workingFolder
+    if the last char of workingFolderUnix = the last char of the applicationpath then delete the last char of workingFolderUnix
+  end if
+  
+  
+  theresult = shell_cmd_list(svnBinary && "update" && QUOTE & newpathUnix & QUOTE)
+  
   
   if count(theresult) > 0 then
@@ -4253 +4506 @@
     -------- reload the refreshed movie:
     if the moviepath contains workingFolder then
+      
       -- go to movie the moviepath & the moviename
+      
     else
       
       if onlyUpdate_SVN_WorkingFolder <> 1 then
+        
         -------------------------- now get the updated movies over here:
         if the last char of workingFolder <> the last char of the applicationpath then put the last char of the applicationpath after workingFolder
         
+        put "Copy file from " & workingFolder & " to " & oldmoviepath
+        
+        
+        erg = baCopyFileProgress(newpath, fname, "Always", "Replacing castlib with the version of the working folder", "", 33)
+        if erg <> 0 then
+          alert "An error occurred during copying the file (" & newpath & "). Error:" && erg
+        else
+          put "Replaced file:" && newpath
+        end if
+        
+        
+        ----------------------------------
+        
+      end if
+      
+    end if
+    
+    put theresult[1]
+    
+    if doReturnToOldMovie = 1 then go to movie oldmovie
+    
+    if dontShowAlert <> 1 then alert "Done, see the results of the svn operation in the message window."
+    
+  else
+    
+    if doReturnToOldMovie = 1 then go to movie oldmovie
+    
+    if dontShowAlert <> 1 then alert "svn application did not respond, something seems to have failed. :-("
+  end if
+  
+  
+  setPref("svn_wCopies_paths_Binary.txt", string(workingCopies))
+  
+end
+
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+on mSVN_Update_CurrentMovie_Binaries me, chooseNewPath, onlyUpdate_SVN_WorkingFolder, dontShowAlert
+  
+  workingCopies = value(getPref("svn_wCopies_paths_Binary.txt"))
+  if ilk(workingCopies) <> #proplist then workingCopies = [:]
+  
+  svnBinary = mGetSVNBinaryPath(me, workingCopies)
+  if length(svnBinary) < 1 then exit
+  
+  workingFolder = mGetWorkingCopyPath(me, the moviepath & the moviename, chooseNewPath, workingCopies, "No working copy is specified for this movies binaries (director files). Please select a working copy of the director files.")
+  if length(workingFolder) < 1 then exit
+  
+  if the platform contains "mac" then
+    svnBinary = baUnixName(svnBinary)
+    workingFolderUnix = baUnixName(workingFolder)
+  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
+  
+  
+  doReturnToOldMovie = 0
+  
+  if (onlyUpdate_SVN_WorkingFolder <> 1) or (the moviepath contains workingFolder) then
+    
+    ------------------------------
+    -- close this movie by issuing a "new movie..." command
+    -- in order to replace the current movie, with the updated movie
+    dispatchcommand(4097)
+    ------------------------------
+    
+    doReturnToOldMovie = 1
+    
+  end if
+  
+  theresult = shell_cmd_list(svnBinary && "update" && QUOTE & workingFolderUnix & QUOTE)
+  
+  if count(theresult) > 0 then
+    
+    -------- reload the refreshed movie:
+    if the moviepath contains workingFolder then
+      
+      -- go to movie the moviepath & the moviename
+      
+    else
+      
+      if onlyUpdate_SVN_WorkingFolder <> 1 then
+        
+        -------------------------- now get the updated movies over here:
+        if the last char of workingFolder <> the last char of the applicationpath then put the last char of the applicationpath after workingFolder
+        
+        put "Copy files from " & workingFolder & " to " & oldmoviepath
         mCopyAllFiles(me, workingFolder, oldmoviepath)
         
         ----------------------------------
+        
       end if
       
@@ -4269 +4617 @@
     put theresult[1]
     
-    if onlyUpdate_SVN_WorkingFolder = 1 then go to movie oldmovie
-    
-    alert "Done, see the results of the svn operation in the message window."
+    if doReturnToOldMovie = 1 then go to movie oldmovie
+    
+    if dontShowAlert <> 1 then alert "Done, see the results of the svn operation in the message window."
     
   else
     
-    if onlyUpdate_SVN_WorkingFolder = 1 then go to movie oldmovie
-    
-    alert "svn application did not respond, something seems to have failed. :-("
+    if doReturnToOldMovie = 1 then go to movie oldmovie
+    
+    if dontShowAlert <> 1 then alert "svn application did not respond, something seems to have failed. :-("
   end if
   
@@ -4295 +4643 @@
     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
@@ -4329 +4682 @@
 -- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 
-on mSVN_Commit_CurrentScripts_ScriptText me, selected_Members_Only, chooseNewPath, commitMsg
+on mSVN_Commit_CurrentScripts_ScriptText me, selected_Members_Only, chooseNewPath, commitMsg, dontShowAlert
   
   workingCopies = value(getPref("svn_workingCopies_paths.txt"))
@@ -4337 +4690 @@
   if length(svnBinary) < 1 then return 0
   
-  workingFolder = mGetWorkingCopyPath(me, the moviepath & the moviename, chooseNewPath, workingCopies)
+  workingFolder = mGetWorkingCopyPath(me, the moviepath & the moviename, chooseNewPath, workingCopies, "No working copy is specified for this movies scripttext. Please select a working copy for the scripttext now.")
   if length(workingFolder) < 1 then return 0
   
@@ -4362 +4715 @@
   
   
-  saveMovie()
+  clibfolder = ""
+  
+  
+  -------- if we work on only one castlib:
+  
+  if ilk(selected_Members_Only) = #castLib then
+    selected_Members_Only.save()
+    
+    delim = the last char of the applicationpath
+    
+    olddelim = the itemdelimiter
+    the itemdelimiter = delim
+    
+    if the last item of workingFolder = "castlib" & selected_Members_Only.number then
+      clibfolder = workingFolder
+    else
+      if the last char of workingFolder <> delim then put delim after workingFolder
+      clibfolder = workingFolder & "castlib" & selected_Members_Only.number
+    end if
+    
+    the itemdelimiter = olddelim
+    --------
+    
+    
+  else
+    saveMovie()
+    
+  end if
   
   
   mExportAllScriptsToDiskWithFolder me, 1, selected_Members_Only, 1, workingFolder
+  
+  
+  -------- if we work on only one castlib:
+  if length(clibfolder) then workingFolder = clibfolder
+  --------
   
   
@@ -4430 +4815 @@
     
     put theResult
-    alert "Done, see the results of the svn operation in the message window."
+    
+    
+    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. :-("
+    alert "svn application did not respond, something seems to have failed, while commiting the scripttext. :-("
   end if
   
@@ -4517 +4906 @@
 -- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
 
-on mGetWorkingCopyPath me, movieIdentifier, chooseNewPath, workingCopies
+on mGetWorkingCopyPath me, movieIdentifier, chooseNewPath, workingCopies, selectMsg
   
   movieIdentifier = string(movieIdentifier)
@@ -4539 +4928 @@
   end if
   
+  
   if chooseNewPath = 1 then
     workingFolder = baGetFolder(the moviepath, "Please select a working copy for SVN update", 3, "Select working copy", -2, -2)
@@ -4544 +4934 @@
   
   if workingFolder = "" then
-    alert "No working copy is specified for this movie. Please select a working copy now."
+    
+    selectMsg = string(selectMsg)
+    if length(selectMsg) < 1 then selectMsg = "No working copy is specified for this movie. Please select a working copy now."
+    
+    alert selectMsg
+    
     workingFolder = baGetFolder(the moviepath, "Please select a working copy for SVN update", 3, "Select working copy", -2, -2)
   end if

trunk/lingosource/castlib2/memberInfo.xml

@@ -36 +36 @@
                 <memberName>SpriteNameBeaver</memberName>
         </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>