Added attribution check for commit and sync menu items

Author: isc-akadoo

cls/SourceControl/Git/Extension.cls

@@ -49,10 +49,7 @@ 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"
-        if (settings.gitUserName = "") || (settings.gitUserEmail = "") {
-            set Target = "Warning: Git committer name or email is not configured. Go to settings."
-            set Action = 6
-        }
+        do ..CheckCommitterIdentity(settings, .Action, .Target)
     }
 
     if (Type = 1) && (Name = 3) {
@@ -78,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)
@@ -437,4 +441,15 @@ 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
+}
+
 }

cls/SourceControl/Git/Utils.cls

@@ -1649,8 +1649,13 @@ ClassMethod RunGitCommandWithInput(command As %String, inFile As %String = "", O
             set newArgs($increment(newArgs)) = "core.sshCommand=ssh -F /dev/null -o StrictHostKeyChecking=accept-new -i "_privateKeyFile
         }
 
-        set username = ..GitUserName()
-        set email = ..GitUserEmail()
+        set username = ""
+        set email = ""
+        
+        if (..GitUserName() '= "") && (..GitUserEmail() '= "") {
+            set username = ..GitUserName()
+            set email = ..GitUserEmail()
+        }
 
         set newArgs($increment(newArgs)) = "-c"
         set newArgs($increment(newArgs)) = "user.name="_username
@@ -1800,7 +1805,7 @@ ClassMethod RunGitCommandWithInput(command As %String, inFile As %String = "", O
         set errStreamLine = errStream.ReadLine()
         if (((errStreamLine = "Committer identity unknown") || (errStreamLine = "Author identity unknown"))) {
             do errStream.Clear()
-            do errStream.WriteLine("Commit failed as user identity unknown."_$c(13,10)_$c(13,10)_"Go to settings."_$c(13,10))
+            do errStream.WriteLine("Commit failed as user identity unknown."_$c(13,10)_$c(13,10)_"Go to the Settings page in the Source Control menu to fix this."_$c(13,10))
         }
     }