Skip to content

Fix pull failure when deleted items have no internal or external name #849

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 3 commits into from
Sep 10, 2025
Merged

Fix pull failure when deleted items have no internal or external name #849

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1ea9946
Prevent pull failure when deleting file where filename or item are nu…
raymond-rebbeck Sep 4, 2025
7dd63ba
Gracefully handle null strings in RemoveRoutineTSH to prevent a possi…
raymond-rebbeck Sep 4, 2025
9165ff9
Update CHANGELOG
raymond-rebbeck Sep 4, 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 @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Fixed
- Fixed Import All deploying changes to files in a CSP application (#828)
- Fixed pull failure when deleted items have no internal or external name (#848)

## [2.13.0] - 2025-08-20

Expand Down
2 changes: 1 addition & 1 deletion cls/SourceControl/Git/PullEventHandler/IncrementalLoad.cls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ Method DeleteFile(item As %String = "", externalName As %String = "") As %Status
$$$ThrowOnError(sc)
} catch e {
set filename = ##class(SourceControl.Git.Utils).FullExternalName(item)
if '##class(%File).Exists(filename) {
if (filename = "") || '##class(%File).Exists(filename) {
do ##class(SourceControl.Git.Utils).RemoveRoutineTSH(item)
// file doesn't exist anymore despite error -- should be ok
set sc = $$$OK
Expand Down
10 changes: 8 additions & 2 deletions cls/SourceControl/Git/Utils.cls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1329,8 +1329,14 @@ ClassMethod UpdateRoutineTSH(InternalName As %String, tsh As %String) As %Status

ClassMethod RemoveRoutineTSH(InternalName As %String) As %Status
{
kill @..#Storage@("TSH", ##class(%Studio.SourceControl.Interface).normalizeName(InternalName))
quit $$$OK
Quit:(InternalName = "") $$$OK
Set tInternalName = ##class(%Studio.SourceControl.Interface).normalizeName(InternalName)

// Prevent a possible null subscript error
Quit:(tInternalName = "") $$$OK
Kill @..#Storage@("TSH", tInternalName)

Quit $$$OK
}

ClassMethod DeleteExternalFile(InternalName As %String) As %Status
Expand Down