Skip to content

Settings file imports before everything else #699

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 31, 2025
Merged

Settings file imports before everything else #699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa3df51
fix: settings file imports before all else
isc-pbarton Jan 28, 2025
a7fa732
fix: remove debugging statement
isc-pbarton Jan 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Fixed business processes and rules not being added to source control automatically (#676)
- Embedded Git commits settings when cloning empty repo to avert any issues
- Fixed Import All options not importing the Embedded Git configuration file
- That configuration file now imports before everything else (#697)
- Improved performance of IDE editing and baselining of decomposed productions
- Fixed Discard / Stash not working on deletes (#688)

Expand Down
9 changes: 9 additions & 0 deletions cls/SourceControl/Git/PullEventHandler/IncrementalLoad.cls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,15 @@ Parameter DESCRIPTION = "Performs an incremental load and compile of all changes
Method OnPull() As %Status
{
set sc = $$$OK

// certain items must be imported before everything else.
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 nFiles = 0

for i=1:1:$get(..ModifiedFiles){
Expand Down
Loading