From 2e10749417affb58a400aac7b876716a6649b359 Mon Sep 17 00:00:00 2001 From: Raymond Rebbeck Date: Fri, 11 Jul 2025 23:26:46 +0930 Subject: [PATCH] Improve config file handling in the incremental load pull event handler Force import to start with as it was getting forced imported later anyway. Stop iterating through files once it has been imported. Don't import it a second time. --- cls/SourceControl/Git/PullEventHandler/IncrementalLoad.cls | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/cls/SourceControl/Git/PullEventHandler/IncrementalLoad.cls b/cls/SourceControl/Git/PullEventHandler/IncrementalLoad.cls index d352364c..d93f69a2 100644 --- a/cls/SourceControl/Git/PullEventHandler/IncrementalLoad.cls +++ b/cls/SourceControl/Git/PullEventHandler/IncrementalLoad.cls @@ -15,7 +15,8 @@ Method OnPull() As %Status for i=1:1:$get(..ModifiedFiles) { set internalName = ..ModifiedFiles(i).internalName if internalName = ##class(SourceControl.Git.Settings.Document).#INTERNALNAME { - set sc = $$$ADDSC(sc, ##class(SourceControl.Git.Utils).ImportItem(internalName)) + set sc = $$$ADDSC(sc, ##class(SourceControl.Git.Utils).ImportItem(internalName, 1)) + quit } } @@ -23,6 +24,10 @@ Method OnPull() As %Status for i=1:1:$get(..ModifiedFiles){ set internalName = ..ModifiedFiles(i).internalName + + // Don't import the config file a second time + continue:internalName=##class(SourceControl.Git.Settings.Document).#INTERNALNAME + if ((internalName = "") && (..ModifiedFiles(i).changeType '= "D")) { write !, ..ModifiedFiles(i).externalName, " was not imported into the database and will not be compiled. " } elseif (..ModifiedFiles(i).changeType = "D") {