fixing merge conflict

Author: isc-hwojnick

CHANGELOG.md

@@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 - Fixed JS errors in Studio on certain operations (#416)
+- Add menu option disabled for unsaved files (#420)
 - Fixed issue where selecting different item in stash list didn't update diff view (#265)
 - Tooltip in workspace now shows user who made uncommitted change if not current user (#411)
 - Files are added to source control upon creation properly (#404)
@@ -17,6 +18,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fixed error popups in interop editors in Studio on 2024.1 (#417)
 - Reintroduced amend (#425)
 - Git operations that import items into IRIS now report output from compilation (#426)
+- Double quotes now permissible in commit messages (#433)
 
 ## [2.4.0] - 2024-07-08
 

cls/SourceControl/Git/Extension.cls

@@ -191,7 +191,12 @@ Method OnSourceMenuContextItem(itemName As %String, menuItemName As %String, ByR
     } elseif ##class(SourceControl.Git.Utils).IsInSourceControl(itemName) {
         set Enabled = $case(menuItemName, "AddToSC":-1,:1)
     } else {
-        set Enabled = $case(menuItemName, "AddToSC":1,:-1)
+        if (##class(SourceControl.Git.Utils).Type(itemName) = "cls") && ('$$$defClassDefined($extract(itemName, 1, $length(itemName) - 4))) {
+            set Enabled = -1
+        } else {
+            set Enabled = $case(menuItemName, "AddToSC":1,:-1)
+        }
+
     }
     if (menuItemName '= "") {
 	    set DisplayName = ..LocalizeName(menuItemName)

git-webui/release/share/git-webui/webui/js/git-webui.js

@@ -2551,6 +2551,9 @@ webui.NewChangedFilesView = function(workspaceView) {
 
     self.amend = function(message, details) {
         var selectedFilesAsString = selectedItems.join(" ");
+        message = self.doubleQuotesToSingleQuotes(message);
+        details = self.doubleQuotesToSingleQuotes(details);
+
         if (self.commitMsgEmpty()) {
             webui.git("add " + selectedFilesAsString);
             webui.git("commit --amend --no-edit -- " + selectedFilesAsString, function(output) {
@@ -2573,8 +2576,14 @@ webui.NewChangedFilesView = function(workspaceView) {
 
     }
 
+    self.doubleQuotesToSingleQuotes = function(string) {
+        return string.replace(/"/g, "'");
+    }
+
     self.commit = function(message, details) {
         var selectedFilesAsString = selectedItems.join(" ");
+        message = self.doubleQuotesToSingleQuotes(message);
+        details = self.doubleQuotesToSingleQuotes(details);
 
         webui.git("add " + selectedFilesAsString);
         webui.git('commit -m "' + message + '" -m "' + details + '" -- ' + selectedFilesAsString, function(output) {

git-webui/src/share/git-webui/webui/js/git-webui.js

@@ -2551,6 +2551,9 @@ webui.NewChangedFilesView = function(workspaceView) {
 
     self.amend = function(message, details) {
         var selectedFilesAsString = selectedItems.join(" ");
+        message = self.doubleQuotesToSingleQuotes(message);
+        details = self.doubleQuotesToSingleQuotes(details);
+
         if (self.commitMsgEmpty()) {
             webui.git("add " + selectedFilesAsString);
             webui.git("commit --amend --no-edit -- " + selectedFilesAsString, function(output) {
@@ -2573,8 +2576,14 @@ webui.NewChangedFilesView = function(workspaceView) {
 
     }
 
+    self.doubleQuotesToSingleQuotes = function(string) {
+        return string.replace(/"/g, "'");
+    }
+
     self.commit = function(message, details) {
         var selectedFilesAsString = selectedItems.join(" ");
+        message = self.doubleQuotesToSingleQuotes(message);
+        details = self.doubleQuotesToSingleQuotes(details);
 
         webui.git("add " + selectedFilesAsString);
         webui.git('commit -m "' + message + '" -m "' + details + '" -- ' + selectedFilesAsString, function(output) {