Skip to content

Issue #317 IPM Multi Developer Setting Issue Resolved #347

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 4 commits into from
Jun 10, 2024
Merged

Issue #317 IPM Multi Developer Setting Issue Resolved #347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cc30c44
some debugging globals set
isc-hwojnick Jun 3, 2024
c3b9a95
now skips over files in other git enabled packages when performing Re…
isc-hwojnick Jun 4, 2024
56148ea
fixed issue with non-ipm package contexts and typo where '= was =
isc-hwojnick Jun 6, 2024
2d08c9a
Merge branch 'main' into ipm-multideveloper-setting
isc-hwojnick Jun 10, 2024
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
4 changes: 3 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Pre-release support for IPM v0.9.0+
- Items mapped from database other than namespace's default routine database are now ignored by default when exporting or adding files
- New setting to configure whether mapped items should be should be treated as read-only
- Added a new "Branch" parameter to `##class(SourceControl.Git.PullEventHandler)` (#35
- Now skips files belonging to other git enabled packages in `##class(SourceControl.Git.Change).RefreshUncommitted()` (#347)
- Added a new "Branch" parameter to `##class(SourceControl.Git.PullEventHandler)` (#351)
- Command-line utility to do a baseline export of items in a namespace


## [2.3.1] - 2024-04-30

### Fixed
Expand Down
5 changes: 5 additions & 0 deletions cls/SourceControl/Git/Change.cls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,13 @@ ClassMethod RefreshUncommitted(Display = 0, IncludeRevert = 0, Output gitFiles,
set examine=$select(action="add":1,action="edit":1,action="delete":1, IncludeRevert&&(action="revert"):1,1:0)
if 'examine set filename=$order(tFileList(filename),1,action) continue

set packageRoot = ##class(SourceControl.Git.Utils).TempFolder()
set InternalName = ##class(SourceControl.Git.Utils).NameToInternalName(filename,0,0)

// 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)))))) {
set sc=..RemoveUncommitted(filename,Display,0,0)
Expand Down