diff --git a/CHANGELOG.md b/CHANGELOG.md index 6a398969..9ecca164 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [2.15.1] - Unreleased + +## Fixed +- Fixed issue where Generated Files Read-only option didn't entirely work for files not in source control (#712) + ## [2.15.0] - 2026-01-06 ### Added diff --git a/cls/SourceControl/Git/Extension.cls b/cls/SourceControl/Git/Extension.cls index 6b7d7af3..565deac2 100644 --- a/cls/SourceControl/Git/Extension.cls +++ b/cls/SourceControl/Git/Extension.cls @@ -546,7 +546,7 @@ Method GetStatus(ByRef InternalName As %String, ByRef IsInSourceControl As %Bool } } else { // If it doesn't show up in git status, there are no uncommitted changes so it should not be locked or checked out by any user - set Editable=1, IsCheckedOut=0, UserCheckedOut="" + set IsCheckedOut=0, UserCheckedOut="" if ##class(SourceControl.Git.Change).IsUncommitted(filename) && '##class(SourceControl.Git.Change).IsDeleted(InternalName, .files) { #; Remove the item from the list of uncommitted changes; @@ -590,4 +590,3 @@ Method CheckBusinessProcessesAndRules(InternalName As %String) As %Status } } - diff --git a/module.xml b/module.xml index 91ff4754..794c8340 100644 --- a/module.xml +++ b/module.xml @@ -3,7 +3,7 @@ git-source-control - 2.15.0 + 2.15.1 Server-side source control extension for use of Git on InterSystems platforms git source control studio vscode module diff --git a/test/UnitTest/SourceControl/Git/Extension.cls b/test/UnitTest/SourceControl/Git/Extension.cls index 971f9528..c490e0ad 100644 --- a/test/UnitTest/SourceControl/Git/Extension.cls +++ b/test/UnitTest/SourceControl/Git/Extension.cls @@ -19,10 +19,13 @@ Method TestGeneratedFilesReadOnlyOption() $$$ThrowOnError(settings.%Save()) set extension = ##class(SourceControl.Git.Extension).%New("") do $$$AssertNotTrue(extension.IsReadOnly("UnitTest.SourceControl.Git.GeneratedReadOnly.cls")) - + do extension.GetStatus("UnitTest.SourceControl.Git.GeneratedReadOnly.cls",,.editable) + do $$$AssertTrue(editable) set settings.generatedFilesReadOnly = 1 $$$ThrowOnError(settings.%Save()) do $$$AssertTrue(extension.IsReadOnly("UnitTest.SourceControl.Git.GeneratedReadOnly.cls")) + do extension.GetStatus("UnitTest.SourceControl.Git.GeneratedReadOnly.cls",,.editable) + do $$$AssertNotTrue(editable) } catch err { set sc = err.AsStatus() } @@ -32,4 +35,4 @@ Method TestGeneratedFilesReadOnlyOption() $$$ThrowOnError(sc) } -} \ No newline at end of file +}