Merge pull request #809 from raymond-rebbeck/reset-revert-sync

Sync files with IRIS after performing a 'Hard Reset' or 'Revert' via WebUI

Author: isc-pbarton

CHANGELOG.md

@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 - Fix Import All not importing items that do not already exist when compileOnImport is not set (#798)
 - Import All now imports configuration file before everything else (#806)
+- Fix Revert not syncing files with IRIS (#789)
 
 ## [2.12.2] - 2025-07-08
 

cls/SourceControl/Git/Utils.cls

@@ -2001,6 +2001,25 @@ ClassMethod RunGitCommandWithInput(command As %String, inFile As %String = "", O
                 set diffCompare = args(i + 1)
             } elseif (args(i) = "commit") {
                 set isCommit = 1
+            } elseif (args(i) = "reset") {
+                // Sync files after performing a 'Hard Reset' via the WebUI
+                if (args(i + 1) = "--hard") {
+                    set syncIrisWithDiff = 1
+                    set syncIrisWithDiffAfterGit = 1
+                    set syncIrisWithDiffVerbose = 1
+                    // The current commit will still be able to be referenced to diff against
+                    // despite the fact that it will disappear after the reset is performed
+                    set diffBase = ..GetCurrentRevision()
+                }
+            } elseif (args(i) = "revert") {
+                // Sync files after performing a 'Revert' via the WebUI
+                if (args(i + 1) = "--no-commit") {
+                    set syncIrisWithDiff = 1
+                    set syncIrisWithDiffAfterGit = 1
+                    set syncIrisWithDiffVerbose = 1
+                    // When syncing diff against what is being reverted
+                    set diffBase = args(i + 2)
+                }
             }
         }
     }