Skip to content

Deletes are no longer removed from the uncommitted queue #758

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
Apr 25, 2025
Merged

Deletes are no longer removed from the uncommitted queue #758

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
bb70742
fix: deletes no longer removed from uncommitted queue
isc-pbarton Apr 24, 2025
e70f659
refactor condition for removing uncommitted items
isc-pbarton Apr 24, 2025
9a94a86
Merge branch 'main' into fix-delete-ownership
isc-tleavitt Apr 25, 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 @@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- 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)
- Pull page output now displays better when pull preview shows a lot of changes (#740)

## [2.11.0] - 2025-04-23
Expand Down
6 changes: 4 additions & 2 deletions cls/SourceControl/Git/Change.cls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 (('##class(%File).Exists(filename)) || (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
}
Expand Down
Loading