Merge branch 'main' into production-change-control

Author: isc-pbarton

CHANGELOG.md

@@ -12,13 +12,18 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Files in uncommitted queue in any namespace warn users when opened except for in VSCode (#370)
 - Added link back to IRIS management portal from Settings, Git WebUI pages (#449)
 - Added Import all and Import All (Force) to basic mode menu (#498)
+- Improved behavior for commits when attribution settings are not configured (#450)
 
 ### Fixed
 - Changed prompts in configure from 0/1 to no/yes (#461)
 - Added warnings when user is using incompatible git version (#488)
 - Fixed the back button navigation between WebUI and Settings page (#361)
+- Fixed issues with HL7 file extension inconsistencies (#495)
 - Basic mode Sync operation now imports items changed on the remote merge branch (#506)
 - Fetch diff output uses correct remote branch (#509)
+- Properly handle more cases of truncated filenames from git pull (#511)
+- Made git-source-control backwards compatible with IRIS 2021.1 (#513)
+- Sync, pull properly handle more change edge cases for import (#517, #496)
 
 ## [2.5.0] - 2024-09-24
 

cls/SourceControl/Git/Change.cls

@@ -82,29 +82,25 @@ ClassMethod GetOtherDeveloperChanges() As %Boolean
 {
     set numEntries = 0
     set fileToOtherDevelopers = {}
-    set query = "Select ItemFile, ChangedBy FROM SourceControl_Git.Change WHERE Committed = '0' AND ChangedBy <> ?"
-    set statement = ##class(%SQL.Statement).%New()
-    set status = statement.%Prepare(query, 0)
-    $$$ThrowOnError(status)
-    set rset = statement.%Execute($username)
-    if (rset.%SQLCODE < 0) {
-        throw ##class(%Exception.SQL).CreateFromSQLCODE(rset.%SQLCODE,rset.%Message)
-    }
-    set tempFolder = ##class(SourceControl.Git.Utils).TempFolder()
-    while rset.%Next(.sc) {
-        $$$ThrowOnError(sc)
 
-        if $FIND(rset.ItemFile, tempFolder) {
-            set filePath = $PIECE(rset.ItemFile, tempFolder, 2)
-        } else {
-            continue
+    set username = $username
+    &sql(DECLARE DeveloperCursor CURSOR FOR SELECT ItemFile, ChangedBy into :itemFile, :changedBy from SourceControl_Git.Change WHERE Committed = 0 and ChangedBy <> :username)
+    &sql(OPEN DeveloperCursor)
+        throw:SQLCODE<0 ##class(%Exception.SQL).CreateFromSQLCODE(SQLCODE, %msg)
+    &sql(FETCH DeveloperCursor)
+    set tempFolder = ##class(SourceControl.Git.Utils).TempFolder()
+    while(SQLCODE = 0) {
+        if $FIND(itemFile, tempFolder) {
+            set filePath = $PIECE(itemFile, tempFolder, 2)
+            set otherDevelopers = fileToOtherDevelopers.%Get(filePath, [])
+            do otherDevelopers.%Push(changedBy)
+            do fileToOtherDevelopers.%Set(filePath, otherDevelopers)
         }
 
-        set otherDevelopers = fileToOtherDevelopers.%Get(filePath, [])
-        do otherDevelopers.%Push(rset.ChangedBy)
-        do fileToOtherDevelopers.%Set(filePath, otherDevelopers)
+        &sql(FETCH DeveloperCursor)
     }
-    $$$ThrowOnError(sc)
+    &sql(CLOSE DeveloperCursor)
+
     return fileToOtherDevelopers
 }
 
@@ -193,6 +189,7 @@ Query InstanceUncommitted() As %Query(ROWSPEC = "InternalName:%String,User:%Stri
 ClassMethod InstanceUncommittedExecute(ByRef qHandle As %Binary) As %Status
 {
     set qHandle("q") = "SELECT InternalName, ChangedBy FROM SourceControl_Git.Change"
+    &sql(DECLARE InstanceCursor CURSOR FOR SELECT InternalName, ChangedBy into :internalName, :changedBy from SourceControl_Git.Change)
     set namespaces = ##class(SourceControl.Git.Utils).GetGitEnabledNamespaces()
     set tPtr = 0
     set qHandle("i") = 1
@@ -201,16 +198,17 @@ ClassMethod InstanceUncommittedExecute(ByRef qHandle As %Binary) As %Status
         set namespace = $ZCONVERT(tValue, "U")
         if '(namespace [ "^") {
             set $NAMESPACE = namespace
-            set statement = ##class(%SQL.Statement).%New()
-            $$$ThrowOnError(statement.%Prepare(qHandle("q"), 0))
-            set resultSet = statement.%Execute()
-            throw:resultSet.%SQLCODE<0 ##class(%Exception.SQL).CreateFromSQLCODE(resultSet.%SQLCODE,resultSet.%Message)
-            while resultSet.%Next(.sc) {
-                $$$ThrowOnError(sc)
-                set qHandle("changes", $increment(qHandle("changes")), "InternalName") = resultSet.%GetData(1)
-                set qHandle("changes", qHandle("changes"), "User") = resultSet.%GetData(2)
-                set qHandle("changes", qHandle("changes"), "Namespace") = namespace
-            }
+                
+                &sql(OPEN InstanceCursor)
+                    throw:SQLCODE<0 ##class(%Exception.SQL).CreateFromSQLCODE(SQLCODE, %msg)
+                &sql(FETCH InstanceCursor)
+                while(SQLCODE = 0) {
+                    set qHandle("changes", $increment(qHandle("changes")), "InternalName") = internalName
+                    set qHandle("changes", qHandle("changes"), "User") = changedBy
+                    set qHandle("changes", qHandle("changes"), "Namespace") = namespace
+                    &sql(FETCH InstanceCursor)
+                }
+                &sql(CLOSE InstanceCursor)
         }
     }
 
@@ -283,4 +281,3 @@ Storage Default
 }
 
 }
-

cls/SourceControl/Git/DiscardState.cls

@@ -77,23 +77,21 @@ ClassMethod DiscardStatesInBranch() As %DynamicArray
 {
     set currentBranch = ##class(SourceControl.Git.Utils).GetCurrentBranch()
 
-    set query = "SELECT ID FROM SourceControl_Git.DiscardState WHERE branch = ?"
-    set statement = ##class(%SQL.Statement).%New()
-    set status = statement.%Prepare(query, 0)
-    $$$ThrowOnError(status)
-    set resultSet = statement.%Execute(currentBranch)
-    if (resultSet.%SQLCODE < 0) {
-        throw ##class(%Exception.SQL).CreateFromSQLCODE(resultSet.%SQLCODE,resultSet.%Message)
-    }
-
+    // Use embedded SQL for backwards compatability
+    &sql(DECLARE DiscardCursor CURSOR FOR SELECT ID into :id from SourceControl_Git.DiscardState WHERE branch = :currentBranch)
+    &sql(OPEN DiscardCursor)
+        throw:SQLCODE<0 ##class(%Exception.SQL).CreateFromSQLCODE(SQLCODE, %msg)
+    &sql(FETCH DiscardCursor)
     set discardStates = []
-    while resultSet.%Next() {
-        set discardState = ..%OpenId(resultSet.ID)
+    while(SQLCODE = 0) {
+        set discardState = ..%OpenId(id)
         do discardState.%JSONExportToString(.JSONStr)
         set discardStateObject = ##class(%DynamicAbstractObject).%FromJSON(JSONStr)
-        set discardStateObject.Id = resultSet.ID
+        set discardStateObject.Id = id
         do discardStates.%Push(discardStateObject)
+        &sql(FETCH DiscardCursor)
     }
+    &sql(CLOSE DiscardCursor)
 
     quit discardStates
 }

cls/SourceControl/Git/Extension.cls

@@ -49,7 +49,8 @@ Method UserAction(Type As %Integer, Name As %String, InternalName As %String, Se
     if Type = 1, Name = 5 {
         // reroute to Status menu option
         set Name = "%SourceMenu,Status"
-    } 
+        do ..CheckCommitterIdentity(settings, .Action, .Target)
+    }
 
     if (Type = 1) && (Name = 3) {
         if settings.warnInstanceWideUncommitted {
@@ -74,10 +75,17 @@ Method UserAction(Type As %Integer, Name As %String, InternalName As %String, Se
 
     #dim ec as %Status = $$$OK
     #dim menu as %Status = $piece(Name, ",", 1)
+    #dim menuItemName as %String = $piece(Name,",",2)
     if menu '= "%SourceMenu", menu'="%SourceContext" {
         quit $$$OK
     }
 
+    if (menuItemName = "Commit") || (menuItemName = "Sync") {
+        if ..CheckCommitterIdentity(settings, .Action, .Target) {
+            quit $$$OK
+        }
+    }
+
     set InternalName = ##class(SourceControl.Git.Utils).NormalizeInternalName(InternalName)
     set context = ##class(SourceControl.Git.PackageManagerContext).ForInternalName(InternalName)
     set ec = ##class(SourceControl.Git.Utils).UserAction(InternalName, Name, .Target, .Action, .Reload, .Msg)
@@ -482,5 +490,16 @@ Method AddToSourceControl(InternalName As %String, Description As %String = "")
 	Quit ##class(SourceControl.Git.Utils).AddToSourceControl(InternalName)
 }
 
+/// Called to check if committer identity is configured.
+Method CheckCommitterIdentity(Settings As SourceControl.Git.Settings, ByRef Action As %String, ByRef Target As %String) As %Boolean
+{
+    if ((Settings.gitUserName = "") || (Settings.gitUserEmail = "")) {
+        set Target = "Git committer name or email is not configured. Go to the Settings page in the Source Control menu to fix this."
+        set Action = 6
+        return 1
+    }
+    return 0
+}
+
 }