iris sync implemented

Author: isc-hwojnick

cls/SourceControl/Git/Utils.cls

@@ -1605,29 +1605,53 @@ 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 diffBase = ""
 
     if (command = "checkout") || (command = "merge") || (command = "rebase") {
         set syncIris = 1
         set diffCompare = args(args)
-        set diffBase = ""
     }
 
-
+    
     for i=1:1:$get(args) {
         if ($data(args(i))) {
             set newArgs($increment(newArgs)) = args(i)
             if (args(i) = "checkout") || (args(i) = "merge") || (args(i) = "rebase") {
                 set syncIris = 1
                 set diffCompare = args(i + 1)
-                set diffBase = ""
-                if $LISTLENGTH(args) = (i + 2) {
+                
+                if args = (i + 2) {
                     set diffBase = args(i + 2)
                 }
             }
         }
     }
 
+    if syncIris {
+        if diffBase = "" {
+            set diffBase = ..GetCurrentBranch()
+        }
+        do ##class(SourceControl.Git.Utils).RunGitCommandWithInput("diff",,.errorStream,.outputStream, diffBase_".."_diffCompare, "--name-status")
+        while (outputStream.AtEnd = 0) {
+            set file = outputStream.ReadLine()
+            set modification = ##class(SourceControl.Git.Modification).%New()
+            set modification.changeType = $piece(file, $c(9), 1)
+            
+            set modification.externalName = $zstrip($piece(file, $c(9),2),"<W")
+            if (modification.changeType '= "A"){
+                set modification.internalName = ##class(SourceControl.Git.Utils).NameToInternalName(modification.externalName,,0)
+            }
+            else {
+                set modification.internalName = ""
+            }
+            set files($increment(files)) = modification
+            set mod = files(files)
+            write !, ?4, modification.changeType, ?4, modification.internalName, ?4 , modification.externalName
+        }
+    }
+
     set outLog = ##class(%Library.File).TempFilename()
     set errLog = ##class(%Library.File).TempFilename()
 
@@ -1656,49 +1680,14 @@ ClassMethod RunGitCommandWithInput(command As %String, inFile As %String = "", O
     }
 
     if syncIris {
-        if diffBase = "" {
-            set diffBase = ..GetCurrentBranch()
-        }
-        do ..SyncIrisWithRepo(diffBase, diffCompare)
+        
+        do ..SyncIrisWithRepo(.files)
     }
     quit returnCode
 }
 
-ClassMethod SyncIrisWithRepo(diffBase As %String, diffCompare As %String)
+ClassMethod SyncIrisWithRepo(ByRef files)
 {
-    do ##class(SourceControl.Git.Utils).RunGitCommandWithInput("diff",,.errStream,.outStream, diffBase_".."_diffCompare, "--name-status")
-    while (outStream.AtEnd = 0) {
-        set file = outStream.ReadLine()
-        set modification = ##class(SourceControl.Git.Modification).%New()
-        set modification.changeType = $piece(file, $c(9), 1)
-        set modification.externalName = $zstrip($piece(file, $c(9),2),"<W")
-        if (modification.changeType '= "A"){
-            set modification.internalName = ##class(SourceControl.Git.Utils).NameToInternalName(modification.externalName,,0)
-        }
-        else {
-            set modification.internalName = ""
-        }
-        set files($increment(files)) = modification
-        write !, ?4, modification.changeType, ?4, modification.internalName, ?4 , modification.externalName
-    }
-    if ('$data(files)) {
-        write !, ?4, "None"
-        if preview {
-            quit $$$OK
-        }
-        write !, "Already up to date."
-        quit $$$OK
-    } elseif preview {
-        quit $$$OK
-    }
-
-    set sc = ..RunGitWithArgs(.errStream, .outStream, "pull", remote, branchName)
-    if (sc=1){
-        do ..PrintStreams(errStream, outStream)
-        quit $$$ERROR(5001, "Pull event handler not called. Fix errors before compiling.")
-    }
-    do ..PrintStreams(outStream)
-    write !
 
     set key = $order(files(""))
     set deletedFiles = ""
@@ -1714,6 +1703,7 @@ ClassMethod SyncIrisWithRepo(diffBase As %String, diffCompare As %String)
             if (modification.internalName '= "") {
                 set addedFiles = addedFiles_","_modification.internalName
                 set files(key) = modification
+                
             }
         }
         set key = $order(files(key))