Skip to content

GetStatus correctly marks generated files read-only #915

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

Open
isc-pbarton wants to merge 1 commit into
base: main
Choose a base branch
from
Open

GetStatus correctly marks generated files read-only #915

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions cls/SourceControl/Git/Extension.cls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -590,4 +590,3 @@ Method CheckBusinessProcessesAndRules(InternalName As %String) As %Status
}

}

2 changes: 1 addition & 1 deletion module.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Document name="git-source-control.ZPM">
<Module>
<Name>git-source-control</Name>
<Version>2.15.0</Version>
<Version>2.15.1</Version>
<Description>Server-side source control extension for use of Git on InterSystems platforms</Description>
<Keywords>git source control studio vscode</Keywords>
<Packaging>module</Packaging>
Expand Down
7 changes: 5 additions & 2 deletions test/UnitTest/SourceControl/Git/Extension.cls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
}
Expand All @@ -32,4 +35,4 @@ Method TestGeneratedFilesReadOnlyOption()
$$$ThrowOnError(sc)
}

}
}
Loading