Merge branch 'main' into private-memory-store

Author: isc-dchui

.github/CODEOWNERS

@@ -0,0 +1,2 @@
+# Default Owners
+*	@isc-pbarton @isc-dchui @isc-tleavitt

CHANGELOG.md

@@ -5,17 +5,67 @@ 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.13.0] - Unreleased
+## [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
+- Import All has been added to public-facing API (#891)
+- Web UI workspace view now has an option to abort merge in progress (#895)
+- New setting lets you treat generated classes as read-only in Studio/VS Code (#712)
+
+## Fixed
+- Web UI workspace view labels changes as Merge Conflict if there are unmerged changes (#890)
+- Web UI workspace view displays diff correctly for files with merge conflicts (#898)
+- Storage definition changes in persistent classes are now correctly exported to the Git repository (#906)
+- Catch and log exceptions thrown by pull handlers (#909)
+- Fix Incremental Load to first remove production items before removing classes (#907)
+
+## [2.14.0] - 2025-11-07
+
+### Added
+- Option to lock/unlock namespace is now available on the settings page (#650)
+- Settings page now warns if Embedded Git is not the configured source control extension (#857)
+- Settings page now has option to switch namespace (#856)
+- SourceControl.Git.Settings is now documented as part of the public API to allow programmatic configuration of settings (#262)
+- Newly configured instances start with default mappings for ESD, LUT and HL7 when relevant (#724)
+- New setting to define an SSH client configuration file for connections to SSH remotes (#293)
+- Changed default compilation flags from "ck" to "ckbryu" to include related items (#882)
+
+### Fixed
+- When cloning a repo with Configure, that repo's embedded-git-config file will overwrite previous settings (#819)
+- Settings page no longer removes remote when saving after cloning (#858)
+- Always set the remote as the upstream branch when pushing (#871)
+- Fixed import of HL7 and LUT files added at the same time as their mappings (#864)
+- Fixed issue where Git's interactive credential manager causes Git push/pull/fetch to hang (#235)
+- Failed deployment of one interoperability production item no longer causes all other production items to fail (#886)
+
+## [2.13.1] - 2025-09-16
+
+### 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)
+- Fixed an error where source control pages do not display after installing on IRIS 2025.1 (#852)
+
+## [2.13.0] - 2025-08-20
 
 ### Added
 - Expanded Baseline Export to include XSL Transforms (#815)
+- Enhanced "Check out branch" to first refresh list of remote branches to eliminate failure due to stale information (#823)
 
 ### Fixed
 - Fix Import All not importing items that do not already exist when compileOnImport is not set (#798)
 - Fix baselining output more consistent, human readable (#814)
 - Import All now imports configuration file before everything else (#806)
 - Fixed another instance of deletes showing as owned by undefined user (#812)
 - Fix Revert not syncing files with IRIS (#789)
+- Fix "Export All" stopping prematurely because a tracked item no longer exist in the namespace (#821)
+- Import All now outputs a warning instead of an error when an item is in the wrong path (#291)
+- Fixed an error where classes with compilation errors would revert to broken versions on export (#830)
+- Fixed installation of the package on IRIS versions with the IRISSECURITY database (#770)
 
 ## [2.12.2] - 2025-07-08
 

CONTRIBUTING.md

@@ -1,7 +1,17 @@
-# How to contribute
+# How to Contribute
 
 Thank you for your interest in contributing! While this project originated at InterSystems, it is our hope that the community will continue to extend and enhance it.
 
+## Getting Started
+
+We recommend setting up a local development instance by following these steps:
+1. Install an instance of IRIS (go to https://evaluation.intersystems.com/ for an evaluation kit).
+2. Install IPM (InterSystems Package Manager) (https://github.com/intersystems/ipm).
+3. Clone a copy of the Embedded Git repository to disk using `git clone`.
+4. Install Embedded Git using IPM by running this terminal command (`zpm "load <path_to_embedded_git_repo_directory> -dev"`).
+5. Configure your Embedded Git instance to point at a Git repository that IS NOT Embedded Git (it can get very messy very quickly).
+6. Modify the code locally! Note that any changes to CSP pages will require loading the module again with IPM to propagate the changes to your local instance.
+
 ## Submitting changes
 
 If you have made a change that you would like to contribute back to the community, please send a [GitHub Pull Request](/pull/new/main) explaining it. If your change fixes an issue that you or another user reported, please mention it in the pull request. You can find out more about pull requests [here](http://help.github.com/pull-requests/).
@@ -10,17 +20,16 @@ Every pull request should include at least one entry in CHANGELOG.md - see [keep
 
 We encourage use of [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/).
 
-## Coding conventions
+## Coding Conventions
 
 Generally speaking, just try to match the conventions you see in the code you are reading. For this project, these include:
 
-* Do not use shortened command and function names. For example, use `set` instead of `s` instead of `set` and `$piece` instead of `$p`
+* Use the full command and function names. For example, use `set` instead of `s` and `$piece` instead of `$p`
 * One command per line
-* Do not use dot syntax
 * Indentation with tabs
 * [Pascal case](https://en.wikipedia.org/wiki/Camel_case) class and method names
-* Avoid using postconditionals
-* Local variables start with `t`; formal parameter names start with `p`
+* Avoid dot syntax
+* Avoid postconditionals
 * Always check %Status return values
 
 When making changes that involve JavaScript, ensure that your changes still work from Studio (which uses an old version of IE under the hood and therefore doesn't support various things you might take for granted).

README.md

@@ -14,14 +14,13 @@ Embedded Git support for InterSystems platforms, supporting unified source contr
     ```
     zpm "install git-source-control"
     ```
-    To install on an environment without access to the internet, download the tar.gz file from the [releases](https://github.com/intersystems/git-source-control/releases) page. Copy the archive onto a file system the IRIS instance has access to and extract it. Use the package manager to load the release from that directory.
+    To install on an environment without access to the internet, download the tar.gz file from the [releases](https://github.com/intersystems/git-source-control/releases) page. Copy it into a directory accessible to the IRIS instance and use a command in the IRIS terminal to install from the tar.gz file.
     ```
-    tar -xf /path/to/archive/git-source-control-release.tar.gz
-    zpm "load /path/to/archive/git-source-control-release"
+    zpm "load /path/to/archive/git-source-control-release.tar.gz"
     ```
 2. Configure settings by running the following method and answering the prompts:
    ```
-   d ##class(SourceControl.Git.API).Configure()
+   do ##class(SourceControl.Git.API).Configure()
    ```
    This will also allow you to generate an SSH key for use as (e.g.) a deploy key and to initialize or clone a git repo. (If you want to use https instead, please see the documentation [here])(/docs/https.md)
 3. If using VSCode: Set up `isfs` server-side editing. First, save your current workspace in which you have the code open. Then, open the `.code-workspace` file generated by VS Code and add the following to the list of folders:
@@ -155,6 +154,14 @@ Assuming you have the local and remote repositories created,
 ### HTTPS Support
 We recommend that people connect to their remote git repository using SSH. If you cannot use SSH connections, we also have support for HTTPS connection through OAuth2. See [our documentation for setting up an https connection](/docs/https.md).
 
+## Editing files in the Git repository server-side
+
+There are some circumstances where you'll want to edit files in the Git repository on the IRIS server. For example,
+- To edit interoperability system default settings for a different environment
+- To edit custom configuration files
+
+Embedded Git allows you to edit files in the Git repository server-side through VS Code. Enable the "Define a namespace-level web application " option by running `do ##class(SourceControl.Git.API).Configure()`. This will automatically create a new IRIS web application for editing files with the VS Code ObjectScript extension. Then go to the Embedded Git Web UI and use the "Code Workspace" option to download a VS Code workspace. The workspace will allow you to edit files in the Git repository on the server.
+
 ## Support
 
 If you find a bug or would like to request an enhancement, [report an issue](https://github.com/intersystems/git-source-control/issues/new). If you have a question, post it on the [InterSystems Developer Community](https://community.intersystems.com/) - consider using the "Git" and "Source Control" tags as appropriate.

cls/SourceControl/Git/API.cls

@@ -48,6 +48,13 @@ ClassMethod Pull(pTerminateOnError As %Boolean = 0)
     quit st
 }
 
+/// Imports all items from the Git repository into IRIS.
+/// - pForce: if true, will import an item even if the last updated timestamp in IRIS is later than that of the file on disk.
+ClassMethod ImportAll(pForce As %Boolean = 0) as %Status
+{
+    return ##class(SourceControl.Git.Utils).ImportAll(pForce)
+}
+
 /// Locks the environment to prevent changes to code other than through git pull.
 /// Returns 1 if the environment was already locked, 0 if it was previously unlocked.
 ClassMethod Lock()

cls/SourceControl/Git/Extension.cls

@@ -444,6 +444,22 @@ Method OnAfterDelete(InternalName As %String) As %Status
     quit $$$OK
 }
 
+/// This is called if you compile a class and the compilation updates the class storage.
+/// It is called after the storage has been updated so you can determine how to deal with this
+/// change in the class. The <var>Location</var> is the global reference to the class definition that was changed.
+Method OnAfterStorage(InternalName As %String, Location As %String = "") As %Status
+{
+    if (InternalName '= "") {
+        write !,"Item '"_InternalName_"' changed during compile so exporting new version."
+        set ..Modified(InternalName) = 1
+        set sc = ..OnAfterSave(InternalName)
+        if $$$ISERR(sc) {
+            do $System.OBJ.DisplayError(sc)
+        }
+    }
+    return $$$OK
+}
+
 /// Convert the internal name, e.g. TEST.MAC, to an external name that is used to export
 /// the routine/class/csp item. This is often a filename to write the file out to.
 Method ExternalName(InternalName As %String) As %String
@@ -461,6 +477,8 @@ Method IsReadOnly(InternalName As %String) As %Boolean
     set settings = ##class(SourceControl.Git.Settings).%New()
     quit (##class(SourceControl.Git.Utils).Locked() 
             && '$get(^IRIS.Temp("sscProd",$job,"bypassLock")))
+        || (settings.generatedFilesReadOnly
+            && ##class(SourceControl.Git.Utils).ItemIsGenerated(InternalName))
         || (##class(SourceControl.Git.Utils).ItemIsProductionToDecompose($get(InternalName))
             && 'settings.decomposeProdAllowIDE
             && '##class(SourceControl.Git.Production).IsEnsPortal())
@@ -531,7 +549,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;

cls/SourceControl/Git/File.cls

@@ -35,6 +35,11 @@ ClassMethod ExternalNameToInternalName(ExternalName As %String) As %String
         }
         new %SourceControl //don't trigger source hooks with this test load to get the Name
         set sc=$system.OBJ.Load(ExternalName,"-d",,.outName,1)
+        // If the test load was unsuccessful then it may be due to an unsupported
+        // file type (e.g. hl7 or lut) that we may otherwise be able to handle
+        if $$$ISERR(sc) {
+            set outName = ..ParseFileForInternalName(ExternalName)
+        }
         set itemIsPTD = 0
         if $data(outName) = 11 {
             set key = $order(outName(""))
@@ -59,6 +64,40 @@ ClassMethod ExternalNameToInternalName(ExternalName As %String) As %String
     quit internalName
 }
 
+/// Attempt to determine the internal name of a given file based on its content
+/// Intended to be used in situations where $system.OBJ.Load is unable to
+ClassMethod ParseFileForInternalName(fileName As %String) As %String [ Private ]
+{
+    Set internalName = ""
+    
+    Set fileExtension = $ZCONVERT($PIECE(fileName,".",*),"U")
+    If (fileExtension = "HL7") {
+        Set tSC = ##class(%XML.TextReader).ParseFile(fileName, .textReader)
+        If ($$$ISOK(tSC)) {
+            // The HL7 schema name is in the 'name' attribute of the 'Category' element
+            // Example: <Category name="...">
+            If (textReader.ReadStartElement("Category") && textReader.MoveToAttributeName("name")) {
+                If (textReader.Value '= "") {
+                    Set internalName = textReader.Value_"."_fileExtension
+                }
+            }
+        }
+    } ElseIf (fileExtension = "LUT") {
+        Set tSC = ##class(%XML.TextReader).ParseFile(fileName, .textReader)
+        If $$$ISOK(tSC) {
+            // The lookup table name is in the 'table' attribute of any 'entry' element
+            // Example: <entry table="...">
+            If (textReader.ReadStartElement("entry") && textReader.MoveToAttributeName("table")) {
+                If (textReader.Value '= "") {
+                    Set internalName = textReader.Value_"."_fileExtension
+                }
+            }
+        }
+    }
+    
+    Quit internalName
+}
+
 Storage Default
 {
 <Data name="FileDefaultData">

cls/SourceControl/Git/PackageManagerContext.cls

@@ -18,16 +18,16 @@ Method InternalNameSet(InternalName As %String = "") As %Status
     set InternalName = ##class(SourceControl.Git.Utils).NormalizeInternalName(InternalName)
     if (InternalName '= i%InternalName) {
         set i%InternalName = InternalName
+        set resourceReference = $$$NULLOREF
         if (InternalName = ##class(SourceControl.Git.Settings.Document).#INTERNALNAME) {
-            // git source control settings document is never in an IPM context
-            quit $$$OK
-        }
-        if $$$comClassDefined("%IPM.ExtensionBase.Utils") {
+            // Embedded Git settings document is never in an IPM context
+            set ..Package = $$$NULLOREF
+        } elseif $$$comClassDefined("%IPM.ExtensionBase.Utils") {
             set ..Package = ##class(%IPM.ExtensionBase.Utils).FindHomeModule(InternalName,,.resourceReference)
         } elseif $$$comClassDefined("%ZPM.PackageManager.Developer.Extension.Utils") {
             set ..Package = ##class(%ZPM.PackageManager.Developer.Extension.Utils).FindHomeModule(InternalName,,.resourceReference)
         } else {
-            quit $$$OK
+            set ..Package = $$$NULLOREF
         }
         set ..ResourceReference = resourceReference
         set ..IsInGitEnabledPackage = $isobject(..Package) && ##class(%Library.File).Exists(##class(%Library.File).NormalizeFilename(".git",..Package.Root))

cls/SourceControl/Git/Production.cls

@@ -154,13 +154,17 @@ ClassMethod ExportPTD(internalName As %String, nameMethod As %String) As %Status
     Return sc
 }
 
-/// Imports a PTD into a produciton given an external name and produciton name
+/// Imports a PTD into a production given an external name and produciton name
 ClassMethod ImportPTD(externalName As %String, productionName As %String) As %Status
 {
 	try {
 		set ^IRIS.Temp("sscProd",$job,"bypassLock") = 1
 		set rollbackFile = ##class(%File).TempFilename()
 		set sc = ##class(Ens.Deployment.Deploy).DeployCode(externalName,productionName,0,rollbackFile)
+        if $$$ISERR(sc) {
+            set sc2 = ##class(Ens.Deployment.Deploy).ClearDeploymentInProgressFlag()
+            if $$$ISERR(sc2) set sc = $$$ADDSC(sc, sc2)
+        }
 		do ##class(%File).Delete(rollbackFile)
 		kill ^IRIS.Temp("sscProd",$job,"bypassLock")
 	} catch err {
@@ -386,16 +390,16 @@ ClassMethod IsProductionClass(className As %String, nameMethod As %String) As %B
 		set filename = $classmethod(##class(%Studio.SourceControl.Interface).SourceControlClassGet(), nameMethod, className_".CLS")
 		if ##class(%File).Exists(filename) && '##class(%File).DirectoryExists(filename) && (##class(%File).GetFileSize(filename) '= 0) {
 			try {
-				set ^||%oddDEF=1
+				set ^||%oddDEF(className) = ""
 				$$$ThrowOnError($system.OBJ.Load(filename, "-d"))
 				// class XDatas are stored in ^||%oddDEF("<class name>","x","<XData name>") after temp load
 				set hasProdDef = $data(^||%oddDEF(className,$$$cCLASSxdata,"ProductionDefinition"))
-				kill ^||%oddDEF
+				kill ^||%oddDEF(className)
 				if hasProdDef {
 					return 1
 				}
 			} catch err {
-				kill ^||%oddDEF
+				kill ^||%oddDEF(className)
 				throw err
 			}
 		}

cls/SourceControl/Git/PullEventHandler.cls

@@ -24,7 +24,9 @@ Method OnPull() As %Status [ Abstract ]
 /// <var>pullEventClass</var>: if defined, override the configured pull event class
 ClassMethod ForModifications(ByRef files, pullEventClass As %String) As %Status
 {
-    set st = $$$OK
+    #Dim err As %Exception.AbstractException
+    #Dim pullError As %Exception.AbstractException
+    #Dim st As %Status = $$$OK
     try {
         set log = ##class(SourceControl.Git.DeploymentLog).%New()
         set log.HeadRevision = ##class(SourceControl.Git.Utils).GetCurrentRevision()
@@ -33,15 +35,20 @@ ClassMethod ForModifications(ByRef files, pullEventClass As %String) As %Status
         quit:$$$ISERR(st)
         set event = $classmethod(
             $select(
-                $data(pullEventClass)#2: pullEventClass, 
+                $data(pullEventClass)#2: pullEventClass,
                 1: ##class(SourceControl.Git.Utils).PullEventClass())
             ,"%New")
         set event.LocalRoot = ##class(SourceControl.Git.Utils).TempFolder()
         merge event.ModifiedFiles = files
-        set st = event.OnPull()
+        try {
+            set st = event.OnPull()
+        }
+        catch pullError {
+            set st = pullError.AsStatus()
+        }
         set log.EndTimestamp = $zdatetime($ztimestamp,3)
         set log.Status = st
-        set st = log.%Save()
+        set st = log.%Save()  // this hides any errors returned or thrown by OnPull()
         quit:$$$ISERR(st)
     } catch err {
         set st = err.AsStatus()