fix: menu discard calls PullEventHandler

refactor: add and use utility methods in PullEventHandler

Author: isc-tleavitt

cls/SourceControl/Git/PullEventHandler.cls

@@ -20,5 +20,28 @@ Method OnPull() As %Status [ Abstract ]
 {
 }
 
+/// <var>files</var> is an integer-subscripted array of <class>SourceControl.Git.Modification</class> objects.
+ClassMethod ForModifications(ByRef files) As %Status
+{
+    set event = $classmethod(##class(SourceControl.Git.Utils).PullEventClass(),"%New")
+    set event.LocalRoot = ##class(SourceControl.Git.Utils).TempFolder()
+    merge event.ModifiedFiles = files
+    quit event.OnPull()
 }
 
+/// <var>InternalName</var> may be a comma-delimited string or $ListBuild list
+ClassMethod ForInternalNames(InternalName As %String) As %Status
+{
+    set list = $select($listvalid(InternalName):InternalName,1:$ListFromString(InternalName))
+    set pointer = 0
+    while $listnext(list,pointer,InternalName) {
+        set mod = ##class(SourceControl.Git.Modification).%New()
+        set mod.internalName = InternalName
+        set mod.externalName = ##class(SourceControl.Git.Utils).FullExternalName(InternalName)
+        set mod.changeType = "M"
+        set files($i(files)) = mod
+    }
+    quit ..ForModifications(.files)
+}
+
+}

cls/SourceControl/Git/Utils.cls

@@ -338,8 +338,7 @@ ClassMethod Revert(InternalName As %String) As %Status
     do ..RunGitCommand("checkout", .errStream, .outStream, "--", filename)
     $$$QuitOnError(##class(SourceControl.Git.Change).RemoveUncommitted(filename,0,1))
     $$$QuitOnError(##class(SourceControl.Git.Change).RefreshUncommitted(0,1,,1))
-    $$$QuitOnError(..ImportItem(InternalName,1))
-    quit $$$OK
+    quit ##class(SourceControl.Git.PullEventHandler).ForInternalNames(InternalName)
 }
 
 ClassMethod Commit(InternalName As %String, Message As %String = "example commit message") As %Status
@@ -1415,10 +1414,7 @@ ClassMethod ImportRoutines(force As %Boolean = 0) As %Status
         }
     }
 
-    set eventHandler = $classmethod(..PullEventClass(),"%New")
-    set eventHandler.LocalRoot = ..TempFolder()
-    merge eventHandler.ModifiedFiles = files
-    set sc = eventHandler.OnPull()
+    set sc = ##class(SourceControl.Git.PullEventHandler).ForModifications(.files)
     if $$$ISERR(sc) {
         set ec = $$$ADDSC(ec,sc)
     }
@@ -1772,10 +1768,7 @@ ClassMethod SyncIrisWithRepoThroughCommand(ByRef outStream) As %Status
     }
 
     do outStream.Rewind()
-    set event = $classmethod(..PullEventClass(),"%New")
-    set event.LocalRoot = ..TempFolder()
-    merge event.ModifiedFiles = files
-    quit event.OnPull()
+    quit ##class(SourceControl.Git.PullEventHandler).ForModifications(.files)
 }
 
 ClassMethod SyncIrisWithRepoThroughDiff(ByRef files) As %Status
@@ -1809,10 +1802,7 @@ ClassMethod SyncIrisWithRepoThroughDiff(ByRef files) As %Status
         set sc = ##class(SourceControl.Git.Utils).AddToServerSideSourceControl(addedFiles)
     }
 
-    set event = $classmethod(..PullEventClass(),"%New")
-    set event.LocalRoot = ..TempFolder()
-    merge event.ModifiedFiles = files
-    quit event.OnPull()
+    quit ##class(SourceControl.Git.PullEventHandler).ForModifications(.files)
 }
 
 ClassMethod GenerateCommitMessageFromFiles(filesWithActions) As %String