From bb707420a16f5e8964d43312011b1d64d815c953 Mon Sep 17 00:00:00 2001 From: Pravin Barton <9560941+isc-pbarton@users.noreply.github.com> Date: Thu, 24 Apr 2025 16:51:08 -0400 Subject: [PATCH 1/2] fix: deletes no longer removed from uncommitted queue --- cls/SourceControl/Git/Change.cls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cls/SourceControl/Git/Change.cls b/cls/SourceControl/Git/Change.cls index fd981652..c6786606 100644 --- a/cls/SourceControl/Git/Change.cls +++ b/cls/SourceControl/Git/Change.cls @@ -149,7 +149,7 @@ ClassMethod RefreshUncommitted(Display = 0, IncludeRevert = 0, Output gitFiles, // skip files belonging to other git enabled packages if ($EXTRACT(filename, 1, $LENGTH(packageRoot)) '= packageRoot) continue - if (('##class(%File).Exists(filename)) || (InternalName = "") || ((InternalName '= "") && ('$data(gitFiles(InternalName), found)) && + if ((InternalName = "") || ((InternalName '= "") && ('$data(gitFiles(InternalName), found)) && (($data($$$TrackedItems(InternalName))) || ##class(SourceControl.Git.Utils).NormalizeExtension($data($$$TrackedItems(InternalName)))))) { set sc=..RemoveUncommitted(filename,Display,0,0) if $$$ISERR(sc) continue From e70f659384db717de78bd782148d69f691f8075d Mon Sep 17 00:00:00 2001 From: Pravin Barton <9560941+isc-pbarton@users.noreply.github.com> Date: Thu, 24 Apr 2025 16:58:39 -0400 Subject: [PATCH 2/2] refactor condition for removing uncommitted items --- CHANGELOG.md | 3 +++ cls/SourceControl/Git/Change.cls | 6 ++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index afdff336..54ac75f0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - Expanded Baseline Export to include custom HL7, X12, ASTM schemas and Lookup Tables (#693) +### Fixed +- Deletes are now properly owned by the user who did the delete (#729) + ## [2.11.0] - 2025-04-23 ### Added diff --git a/cls/SourceControl/Git/Change.cls b/cls/SourceControl/Git/Change.cls index c6786606..30cc1aa5 100644 --- a/cls/SourceControl/Git/Change.cls +++ b/cls/SourceControl/Git/Change.cls @@ -149,8 +149,10 @@ ClassMethod RefreshUncommitted(Display = 0, IncludeRevert = 0, Output gitFiles, // skip files belonging to other git enabled packages if ($EXTRACT(filename, 1, $LENGTH(packageRoot)) '= packageRoot) continue - if ((InternalName = "") || ((InternalName '= "") && ('$data(gitFiles(InternalName), found)) && - (($data($$$TrackedItems(InternalName))) || ##class(SourceControl.Git.Utils).NormalizeExtension($data($$$TrackedItems(InternalName)))))) { + if ((InternalName = "") + || ((InternalName '= "") + && ('$data(gitFiles(InternalName), found)) + && ($data($$$TrackedItems(##class(%Studio.SourceControl.Interface).normalizeName(InternalName)))))) { set sc=..RemoveUncommitted(filename,Display,0,0) if $$$ISERR(sc) continue }