Merge branch 'main' into fix-production-conflicts

isc-tleavitt · isc-tleavitt · commit 593c8589918c · 2024-06-28T09:00:45.000-04:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -20,10 +20,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Command-line utility to do a baseline export of items in a namespace
 - 'New Branch' menu option in basic now will create new branches from the configured default merge branch (#366)
 - Merging back with the default merge branch is now a part of the basic mode's Sync flow (#366)
+- Added a new option "compileOnImport". If true, Import options will compile files using the pull event handler. (#362)
 
 ### Fixed
 - Modifications to local repo files are now synced with IRIS (#153)
 - Menu items names are properly translated from internal name in VSCode, Management Portal (#372)
+- Now has proper locking behavior in `##class(SourceControl.Git.WebUIDriver).HandleRequest()`(#385)
+- Git operations from the WebUI now don't unlock the session if they aren't read-only
 
 ## [2.3.1] - 2024-04-30
 
diff --git a/cls/SourceControl/Git/PullEventHandler/IncrementalLoad.cls b/cls/SourceControl/Git/PullEventHandler/IncrementalLoad.cls
@@ -38,16 +38,36 @@ Method OnPull() As %Status
     quit $system.OBJ.CompileList(.compilelist, "cukb")
 }
 
-Method DeleteFile(item As %String)
+Method DeleteFile(item As %String) As %Status
 {
+    set sc = $$$OK
     set type = ##class(SourceControl.Git.Utils).Type(item)
-    if (type = "cls") {
-        quit $System.OBJ.Delete(item)
-    } elseif (type = "csp") {
-        quit $System.CSP.DeletePage(item)
+    set name = ##class(SourceControl.Git.Utils).NameWithoutExtension(item)
+    set deleted = 1
+    if type = "prj" {
+        set sc = $system.OBJ.DeleteProject(name)
+    }elseif type = "cls" {
+        set sc = $system.OBJ.Delete(item)
+    }elseif $listfind($listbuild("mac","int","inc","bas","mvb","mvi"), type) > 0 {
+        set sc = ##class(%Routine).Delete(item)
+    }elseif type = "csp" {
+        set sc = $System.CSP.DeletePage(item)
+    }elseif ##class(SourceControl.Git.Utils).UserTypeCached(item) {
+        set sc = ##class(%Library.RoutineMgr).Delete(item)
     } else {
-        quit ##class(%Library.RoutineMgr).Delete(item)
+        set deleted = 0
     }
+    
+    if deleted && $$$ISOK(sc) {
+        do ##class(SourceControl.Git.Utils).RemoveRoutineTSH(item)
+        kill $$$TrackedItems(##class(SourceControl.Git.Utils).NormalizeExtension(item))
+    } else {
+        if +$system.Status.GetErrorCodes(sc) = $$$ClassDoesNotExist {
+            // if something we wanted to delete is already deleted -- good!
+            set sc = $$$OK
+        }
+    }
+    return sc
 }
 
 }
diff --git a/cls/SourceControl/Git/Settings.cls b/cls/SourceControl/Git/Settings.cls
@@ -44,6 +44,9 @@ Property systemBasicMode As %Boolean [ InitialExpression = {##class(SourceContro
 /// In Basic mode, Sync will merge changes from this remote branch
 Property defaultMergeBranch As %String [ InitialExpression = {##class(SourceControl.Git.Utils).DefaultMergeBranch()} ];
 
+/// Import All options compile imported options using the configured pull event handler
+Property compileOnImport As %Boolean [ InitialExpression = {##class(SourceControl.Git.Utils).CompileOnImport()} ];
+
 Property Mappings [ MultiDimensional ];
 
 Method %OnNew() As %Status
@@ -97,6 +100,7 @@ Method %Save() As %Status
     set @storage@("settings","settingsUIReadOnly") = ..settingsUIReadOnly
     set @storage@("settings", "mappedItemsReadOnly") = ..mappedItemsReadOnly
     set @storage@("settings", "defaultMergeBranch") = ..defaultMergeBranch
+    set @storage@("settings", "compileOnImport") = ..compileOnImport
     set @storage@("settings", "basicMode") = ..systemBasicMode
     if ..basicMode = "system" {
         kill @storage@("settings", "user", $username, "basicMode")
diff --git a/cls/SourceControl/Git/Utils.cls b/cls/SourceControl/Git/Utils.cls
@@ -153,6 +153,11 @@ ClassMethod PrivateKeyFile() As %String
     quit $get(@..#Storage@("settings","ssh","privateKeyFile"))
 }
 
+ClassMethod CompileOnImport() As %Boolean
+{
+    quit $get(@..#Storage@("settings","compileOnImport"),1)
+}
+
 ClassMethod NeedSettings() As %Boolean [ CodeMode = expression ]
 {
 (..TempFolder() = "") || (..GitBinPath() = "") ||  (..GitBinPath() = """")
@@ -517,7 +522,7 @@ ClassMethod Pull(remote As %String = "origin") As %Status
     set branchName = outStream.ReadLine(outStream.Size)
     write !, "Pulling from branch: ", branchName
     kill errStream, outStream
-    set returnCode = ..RunGitWithArgs(.errStream, .outStream, "pull", remote, branchName)
+    set returnCode = ..RunGitWithArgs(.errStream, .outStream, "pull", remote)
     
     w !, "Pull ran with return code: " _ returnCode
     quit $$$OK
@@ -1337,13 +1342,17 @@ ClassMethod ImportRoutines(force As %Boolean = 0) As %Status
     
     #dim ec as %Status = ..ListItemsInFiles(.itemList, .err)
     quit:'ec ec
+
+    kill files
     
+    set settings = ##class(SourceControl.Git.Settings).%New()
     #dim internalName as %String = ""
     for  {
         set internalName = $order(itemList(internalName))
         quit:internalName=""
         set context = ##class(SourceControl.Git.PackageManagerContext).ForInternalName(internalName)
         continue:context.Package'=refPackage
+        set doImport = ..IsRoutineOutdated(internalName) || force
         if ..IsInSourceControl(internalName) {
             set sc = ..ImportItem(internalName, force)            
         } else {
@@ -1352,7 +1361,15 @@ ClassMethod ImportRoutines(force As %Boolean = 0) As %Status
         if $$$ISERR(sc) {
             set ec = $$$ADDSC(ec, sc)
         }
+        if doImport && settings.compileOnImport {
+            set modification = ##class(SourceControl.Git.Modification).%New()
+            set modification.changeType = "M"
+            set modification.internalName = internalName
+            set modification.externalName = ..FullExternalName(internalName)
+            set files($increment(files)) = modification
+        }
     }
+
     
     //let's delete all items for which corresponding files had been deleted
     #dim item as %String = ""
@@ -1366,41 +1383,21 @@ ClassMethod ImportRoutines(force As %Boolean = 0) As %Status
         set fullExternalName = ..FullExternalName(item)
         if '##class(%File).Exists(fullExternalName) {
             write !,fullExternalName," does not exist - deleting ",item
-            #dim type as %String = ..Type(item)
-            #dim name as %String = ..NameWithoutExtension(item)
-            #dim deleted as %Boolean = 1
-            if type = "prj" {
-                set ec = $$$ADDSC(ec, $system.OBJ.DeleteProject(name))
-            }elseif type = "cls" {
-                set ec = $$$ADDSC(ec, $system.OBJ.Delete(item))
-            }elseif $listfind($listbuild("mac","int","inc","bas","mvb","mvi"), type) > 0 {
-                set ec = $$$ADDSC(ec, ##class(%Routine).Delete(item))
-            }elseif type = "csp" {
-                #dim filename = $system.CSP.GetFileName(item)
-                if ##class(%File).Exists(filename) && '##class(%File).Delete(filename) {
-                    set ec = $$$ADDSC(ec, ..MakeError("Error while removing "_item))
-                }
-            }elseif ..UserTypeCached(item) {
-                set ec = $$$ADDSC(ec, ##class(%Library.RoutineMgr).Delete(item))
-            } else {
-                set deleted = 0
-            }
-            
-            if deleted && ec {
-                do ..RemoveRoutineTSH(item)
-                kill $$$TrackedItems(..NormalizeExtension(item))
-                write !, item, " was deleted"
-            } else {
-                if +$system.Status.GetErrorCodes(ec) '= $$$ClassDoesNotExist {
-                    write !, "Error: could not delete ", item
-                } else {
-                    // if something we wanted to delete is already deleted -- good!
-                    set ec = $$$OK
-                }
-            }
+            set modification = ##class(SourceControl.Git.Modification).%New()
+            set modification.changeType = "D"
+            set modification.internalName = item
+            set modification.externalName = fullExternalName
+            set files($increment(files)) = modification
         }
     }
     
+    set eventHandler = $classmethod(..PullEventClass(),"%New")
+    set eventHandler.LocalRoot = ..TempFolder()
+    merge eventHandler.ModifiedFiles = files
+    set sc = eventHandler.OnPull()
+    if $$$ISERR(sc) {
+        set ec = $$$ADDSC(ec,sc)
+    }
     write !, "==import done=="
     quit ec
 }
@@ -1577,10 +1574,6 @@ ClassMethod RunGitCommand(command As %String, Output errStream, Output outStream
 
 ClassMethod RunGitCommandWithInput(command As %String, inFile As %String = "", Output errStream, Output outStream, args...) As %Integer
 {
-    set pullArg = ""
-    if command = "pull" {
-        set pullArg = $Get(args(1))
-    }
     // Special case: git --version is used internally even when the settings incorporated here may be invalid/unspecified.
     if (command '= "--version") {
         set newArgs($increment(newArgs)) = "-C"
@@ -1608,44 +1601,43 @@ ClassMethod RunGitCommandWithInput(command As %String, inFile As %String = "", O
 
     set newArgs($increment(newArgs)) = command
 
-    // defining variables for if statement use later
-    set syncIris = 0
+    set syncIrisWithDiff = 0 // whether IRIS needs to be synced with repo file changes using diff output
+    set syncIrisWithCommand = 0 // // whether IRIS needs to be synced with repo file changes using command output
     set diffBase = ""
     set diffCompare = ""
-    set pullOriginIndex = ""
-    if (command = "checkout") || (command = "merge") || (command = "rebase") || (command = "pull") {
-        set syncIris = 1
-        if $data(args) && $data(args(args),diffCompare) {
-            // no-op
-        }
+
+    if (command = "checkout"){
+        set syncIrisWithDiff = 1
+        set diffCompare = args(args)
+    } elseif (command = "merge") || (command = "rebase")  || (command = "pull"){
+        set syncIrisWithCommand = 1
+        set diffCompare = args(args)
     }
     
     for i=1:1:$get(args) {
         if ($data(args(i))) {
             set newArgs($increment(newArgs)) = args(i)
-            if newArgs(newArgs) = pullArg {
-                set pullOriginIndex = newArgs
-            }
-            if (args(i) = "checkout") || (args(i) = "merge") || (args(i) = "rebase") || (args(i) = "pull"){
-                set syncIris = 1
+            if (args(i) = "checkout") {
+                set syncIrisWithDiff = 1
                 set diffCompare = args(i + 1)
                 
                 if args = (i + 2) {
                     set diffBase = args(i + 2)
                 }
+            } elseif (args(i) = "merge") || (args(i) = "rebase") || (args(i) = "pull") {
+                set syncIrisWithCommand = 1
+                set diffCompare = args(i + 1)
             }
 
-            if (args(i) = "pull") {
-                set pullOriginIndex = i
-            }
         }
     }
 
-    if (diffCompare = "--no-commit") || (diffCompare = "--abort") {
-        set syncIris = 0
+    if (diffCompare = "--no-commit") || (diffCompare = "--abort") || (diffCompare = "-b") {
+        set syncIrisWithDiff = 0
+        set syncIrisWithCommand = 0
     }
 
-    if syncIris {
+    if syncIrisWithDiff {
         if diffBase = "" {
             set diffBase = ..GetCurrentBranch()
         }
@@ -1665,13 +1657,9 @@ ClassMethod RunGitCommandWithInput(command As %String, inFile As %String = "", O
                 set modification.internalName = ""
             }
             set files($increment(files)) = modification
-            set mod = files(files)
             write !, ?4, modification.changeType, ?4, modification.internalName, ?4 , modification.externalName
         }
 
-        if pullOriginIndex '= "" {
-            set newArgs(pullOriginIndex) = $piece(newArgs(pullOriginIndex), "/", 1)
-        }
     }
 
     set outLog = ##class(%Library.File).TempFilename()
@@ -1700,16 +1688,61 @@ ClassMethod RunGitCommandWithInput(command As %String, inFile As %String = "", O
     for stream=errStream,outStream {
         set stream.RemoveOnClose = 1
     }
-    if syncIris {
-        do ..PrintStreams(errStream, outStream)
-        $$$ThrowOnError(..SyncIrisWithRepo(.files))
+    do ..PrintStreams(errStream, outStream)
+    if syncIrisWithDiff {
+        $$$ThrowOnError(..SyncIrisWithRepoThroughDiff(.files))
+    } elseif syncIrisWithCommand {
+        $$$ThrowOnError(..SyncIrisWithRepoThroughCommand(.outStream))
     }
     quit returnCode
 }
 
-ClassMethod SyncIrisWithRepo(ByRef files)
+ClassMethod SyncIrisWithRepoThroughCommand(ByRef outStream) As %Status
 {
+    set deletedFiles = ""
+    set addedFiles = ""
+    set files = ""
+    while (outStream.AtEnd = 0) {
+
+        set line = outStream.ReadLine()
+        set lineStart = $piece(line, " ", 2)
+        if (lineStart = "delete") || (lineStart = "create") {
+            set fileOperation = $select(lineStart = "create" : "A", 1: "D")
+            set externalName = $piece(line, " ", *)
+            set internalName = ##class(SourceControl.Git.Utils).NameToInternalName(externalName,,0)
+            set modification = ##class(SourceControl.Git.Modification).%New()
+            set modification.changeType = fileOperation
+            set modification.internalName = internalName
+            set modification.externalName = externalName
+            set files($i(files)) = modification
+            if fileOperation = "A" {
+                set addedFiles = addedFiles_","_internalName
+            } else {
+                set deletedFiles = deletedFiles_","_internalName
+            }
+        }
+    }
+    
+    set deletedFiles = $extract(deletedFiles, 2, *)
+    set addedFiles = $extract(addedFiles, 2, *)
+
 
+    if (deletedFiles '= ""){
+        set sc = ##class(SourceControl.Git.Utils).RemoveFromServerSideSourceControl(deletedFiles)
+    }
+    if (addedFiles '= ""){
+        set sc = ##class(SourceControl.Git.Utils).AddToServerSideSourceControl(addedFiles)
+    }
+
+    do outStream.Rewind()
+    set event = $classmethod(..PullEventClass(),"%New")
+    set event.LocalRoot = ..TempFolder()
+    merge event.ModifiedFiles = files
+    quit event.OnPull()
+}
+
+ClassMethod SyncIrisWithRepoThroughDiff(ByRef files) As %Status
+{
     set key = $order(files(""))
     set deletedFiles = ""
     set addedFiles = ""
diff --git a/cls/SourceControl/Git/WebUIDriver.cls b/cls/SourceControl/Git/WebUIDriver.cls
@@ -3,7 +3,6 @@ Class SourceControl.Git.WebUIDriver
 
 ClassMethod HandleRequest(pagePath As %String, InternalName As %String = "", Output handled As %Boolean = 0, Output %data As %Stream.Object)
 {
-    do %session.Unlock()
     // Make sure we capture any stray output
     set buffer = ##class(SourceControl.Git.Util.Buffer).%New()
     do buffer.BeginCaptureOutput()
@@ -13,6 +12,7 @@ ClassMethod HandleRequest(pagePath As %String, InternalName As %String = "", Out
     #dim %request as %CSP.Request
     set pathStart = $piece(pagePath,"/",2)
     if pathStart = "api" {
+        do %session.Unlock()
         set handled = 1
         set %data = ##class(%Stream.FileCharacter).%New()
         if $extract(pagePath,6,*) = "userinfo" {
@@ -42,6 +42,7 @@ ClassMethod HandleRequest(pagePath As %String, InternalName As %String = "", Out
             SimpleHTTPRequestHandler.do_GET(self)
             */
             if (pathStart = "git") {
+                do %session.Unlock()
                 if $piece(pagePath,"/",3) = "cat-file" {
                     set blob = $piece(pagePath,"/",4)
                     set name = $Piece(pagePath,"/",*)
@@ -107,6 +108,10 @@ ClassMethod HandleRequest(pagePath As %String, InternalName As %String = "", Out
                 }
                 set readOnlyCommands = $listbuild("branch","tag","log","ls-files","ls-tree","show","status","diff")
                 set baseCommand = $Piece(args(1)," ")
+                
+                if $listfind(readOnlyCommands,baseCommand) {
+                    do %session.Unlock()
+                }
 
                 set gitArgs($increment(gitArgs)) = "color.ui=true"
 
diff --git a/cls/_zpkg/isc/sc/git/Socket.cls b/cls/_zpkg/isc/sc/git/Socket.cls
@@ -15,7 +15,7 @@ ClassMethod Run()
 		set branchName = ##class(SourceControl.Git.Utils).GetCurrentBranch()
 		do ##class(SourceControl.Git.Utils).RunGitWithArgs(.errStream, .outStream, "fetch")
 		kill errStream, outStream
-		do ##class(SourceControl.Git.Utils).RunGitWithArgs(.errStream, .outStream, "diff", "origin/"_branchName, "--name-status")
+		do ##class(SourceControl.Git.Utils).RunGitWithArgs(.errStream, .outStream, "log", "HEAD..origin", "--name-status")
      } ElseIf %request.Get("method") = "pull" {
          Do ##class(SourceControl.Git.API).Pull()
      } ElseIf %request.Get("method") = "init" {
diff --git a/csp/gitprojectsettings.csp b/csp/gitprojectsettings.csp
diff --git a/csp/webuidriver.csp b/csp/webuidriver.csp
diff --git a/git-webui/package-lock.json b/git-webui/package-lock.json
