From c22e353eb3437ccad3a398c436414ad3e0e1f2ff Mon Sep 17 00:00:00 2001 From: Raymond Rebbeck Date: Mon, 14 Jul 2025 22:29:45 +0930 Subject: [PATCH 1/3] Sync files with IRIS after performing a 'Hard Reset' via the WebUI --- cls/SourceControl/Git/Utils.cls | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/cls/SourceControl/Git/Utils.cls b/cls/SourceControl/Git/Utils.cls index f4f10756..4cca0220 100644 --- a/cls/SourceControl/Git/Utils.cls +++ b/cls/SourceControl/Git/Utils.cls @@ -2001,6 +2001,16 @@ 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() + } } } } From 1e0e9634c4f8749a8de963e6deaf47e42c855705 Mon Sep 17 00:00:00 2001 From: Raymond Rebbeck Date: Mon, 14 Jul 2025 22:35:42 +0930 Subject: [PATCH 2/3] Sync files with IRIS after performing a 'Revert' via the WebUI --- cls/SourceControl/Git/Utils.cls | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/cls/SourceControl/Git/Utils.cls b/cls/SourceControl/Git/Utils.cls index 4cca0220..98d34141 100644 --- a/cls/SourceControl/Git/Utils.cls +++ b/cls/SourceControl/Git/Utils.cls @@ -2011,6 +2011,15 @@ ClassMethod RunGitCommandWithInput(command As %String, inFile As %String = "", O // 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) + } } } } From 8052a8f86dd53013ec04ec72355032d0086ce907 Mon Sep 17 00:00:00 2001 From: Raymond Rebbeck Date: Mon, 14 Jul 2025 22:37:47 +0930 Subject: [PATCH 3/3] Update CHANGELOG --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b771e996..58dd55ee 100644 --- a/CHANGELOG.md +++ b/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