Improvements to instance-wide uncommitted queue

Editing the file will get rid of the warning. Also, warning can be disabled in configuration.

Author: isc-pbarton

cls/SourceControl/Git/Change.cls

@@ -185,7 +185,7 @@ ClassMethod RefreshUncommitted(Display = 0, IncludeRevert = 0, Output gitFiles,
     quit sc
 }
 
-Query InstanceUncommitted() As %Query(ROWSPEC = "InternalName:%String,User:%String")
+Query InstanceUncommitted() As %Query(ROWSPEC = "InternalName:%String,User:%String,Namespace:%String")
 {
 }
 
@@ -206,6 +206,7 @@ ClassMethod InstanceUncommittedExecute(ByRef qHandle As %Binary) As %Status
         while resultSet.%Next() {
             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
         }
     }
 
@@ -216,7 +217,7 @@ ClassMethod InstanceUncommittedFetch(ByRef qHandle As %Binary, ByRef Row As %Lis
 {
     set i = qHandle("i")
     if $data(qHandle("changes",i))=10 {
-        set Row = $listbuild(qHandle("changes", i, "InternalName"), qHandle("changes", i, "User"))
+        set Row = $listbuild(qHandle("changes", i, "InternalName"), qHandle("changes", i, "User"), qHandle("changes", i, "Namespace"))
     }
     if i >= $get(qHandle("changes"),0) {
         set AtEnd = 1

cls/SourceControl/Git/Extension.cls

@@ -44,18 +44,26 @@ XData Menu
 
 Method UserAction(Type As %Integer, Name As %String, InternalName As %String, SelectedText As %String, ByRef Action As %String, ByRef Target As %String, ByRef Msg As %String, ByRef Reload As %Boolean) As %Status
 {
+    set settings = ##class(SourceControl.Git.Settings).%New()
     // If namespace change event
     if Type = 1, Name = 5 {
         // reroute to Status menu option
         set Name = "%SourceMenu,Status"
     } 
 
     if (Type = 1) && (Name = 3) {
-        set user = ""
-        if ##class(SourceControl.Git.Utils).FileIsUncommitted(InternalName, .user) && (user '= $USERNAME){
-            set Target = InternalName _ " is currently being modified by " _ user
-            write !, Target
-            set Action = 6
+        if settings.warnInstanceWideUncommitted {
+            // if item is being edited in a different namespace, opening it will display an alert. Editing in this namespace will remove the alert.
+            set filename = ##class(SourceControl.Git.Utils).FullExternalName(.InternalName)
+            do ##class(SourceControl.Git.Change).GetUncommitted(filename,.tAction)
+            if '$data(tAction) {
+                set user = "", inNamespace = ""
+                if ##class(SourceControl.Git.Utils).InstanceWideUncommittedCheck(InternalName, .user, .inNamespace) {
+                    set Target = "Warning: Item " _ InternalName _ " is currently being modified by " _ user _ " in namespace " _ inNamespace _ "."
+                    write !, Target
+                    set Action = 6
+                }
+            }
         }
     }
 

cls/SourceControl/Git/Settings.cls

@@ -47,6 +47,9 @@ Property defaultMergeBranch As %String [ InitialExpression = {##class(SourceCont
 /// Compile using the configured pull event handler when "Import All" is run
 Property compileOnImport As %Boolean [ InitialExpression = {##class(SourceControl.Git.Utils).CompileOnImport()} ];
 
+/// Warn when an item has uncommitted changes in a different namespace in this instance
+Property warnInstanceWideUncommitted As %Boolean [ InitialExpression = {##class(SourceControl.Git.Utils).WarnInstanceWideUncommitted()} ];
+
 Property Mappings [ MultiDimensional ];
 
 Method %OnNew() As %Status
@@ -102,6 +105,7 @@ Method %Save() As %Status
     set @storage@("settings", "mappedItemsReadOnly") = ..mappedItemsReadOnly
     set @storage@("settings", "defaultMergeBranch") = ..defaultMergeBranch
     set @storage@("settings", "compileOnImport") = ..compileOnImport
+    set @storage@("settings", "warnInstanceWideUncommitted") = ..warnInstanceWideUncommitted
     set @storage@("settings", "basicMode") = ..systemBasicMode
     if ..basicMode = "system" {
         kill @storage@("settings", "user", $username, "basicMode")
@@ -229,4 +233,3 @@ Method OnAfterConfigure() As %Boolean
 }
 
 }
-

cls/SourceControl/Git/Utils.cls

@@ -158,6 +158,11 @@ ClassMethod CompileOnImport() As %Boolean
     quit $get(@..#Storage@("settings","compileOnImport"),1)
 }
 
+ClassMethod WarnInstanceWideUncommitted() As %Boolean
+{
+    quit $get(@..#Storage@("settings","warnInstanceWideUncommitted"),1)
+}
+
 ClassMethod NeedSettings() As %Boolean [ CodeMode = expression ]
 {
 (..TempFolder() = "") || (..GitBinPath() = "") ||  (..GitBinPath() = """")
@@ -2440,16 +2445,18 @@ ClassMethod GetGitEnabledNamespaces() As %String
     quit enabledNamespaces
 }
 
-ClassMethod FileIsUncommitted(InternalName As %String, Output User) As %Boolean
+/// Returns true if the given item has uncommitted changes on a different namespace in this instance.
+ClassMethod InstanceWideUncommittedCheck(InternalName As %String, Output User, Output Namespace) As %Boolean
 {
     set isUncommitted = 0
     set resultSet = ##class(SourceControl.Git.Change).InstanceUncommittedFunc()
     throw:resultSet.%SQLCODE<0 ##class(%Exception.SQL).CreateFromSQLCODE(resultSet.%SQLCODE,resultSet.%Message)
     while resultSet.%Next() {
         set fileName = resultSet.InternalName
-        if InternalName = fileName {
+        if (InternalName = fileName) && (resultSet.Namespace '= $namespace) {
             set isUncommitted = 1
             set User = resultSet.User
+            set Namespace = resultSet.Namespace
         }
     }