Merge branch 'main' into fix-526

Author: isc-tleavitt

CHANGELOG.md

@@ -36,7 +36,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Fix filenames with spaces not showing correctly in workspace view (#551)
 - Removed inaccurate placeholder text for commit message in UI (#406)
 - Fixed regression that broke production conflict auto-resolve (#526)
+- Initialize repo in settings page now uses entered repo (#486)
 - Report error more clearly if you try to create a branch with an invalid name (#534)
+- Don't default to WINDOWS style paths (#357)
 
 ## [2.6.0] - 2024-10-07
 

cls/SourceControl/Git/Utils.cls

@@ -24,7 +24,7 @@ $Replace(..#Storage,"^SYS","^%SYS")
 /// Returns root temp folder
 ClassMethod DefaultTemp() As %String
 {
-    set defaultTemp = "c:\temp\"
+    set defaultTemp = ##class(%File).Construct($System.Util.ManagerDirectory(),"repo/"_$Namespace)
     try {
         set defaultTemp = $Get(@..%SYSNamespaceStorage()@("%defaultTemp"), defaultTemp)
     } catch e {

cls/_zpkg/isc/sc/git/Socket.cls

@@ -25,6 +25,20 @@ ClassMethod Run()
 	} ElseIf %request.Get("method") = "pull" {
 		Do ##class(SourceControl.Git.API).Pull()
 	} ElseIf %request.Get("method") = "init" {
+		set root = %request.Get("root")
+
+		// Use user input if provided
+		if (root '= "") {
+			set settings = ##class(SourceControl.Git.Settings).%New()
+			set settings.namespaceTemp = root
+			$$$ThrowOnError(settings.%Save())
+			if ($extract(root, $length(root)) = "\") || ($extract(root, $length(root)) = "/") {
+				set root = $extract(root, 1, $length(root) - 1)
+			}
+			set root = $translate(root, "\", "/")
+			do ##class(SourceControl.Git.Utils).RunGitCommandWithInput("config",,,,"--global", "--add", "safe.directory", root)
+		}
+
 		Do ##class(SourceControl.Git.Utils).Init()
 		Write !,"Done."
 	} ElseIf %request.Get("method") = "clone" {

csp/gitprojectsettings.csp

@@ -250,9 +250,11 @@ body {
                 } else {
                     set class = "form-control"
                 }
+                set placeholder = $Select($system.Version.GetOS()="Windows":"(e.g. C:\someproj\)",
+                        1:"(e.g., /someproj/)")
             </server>
             <div class="col-sm-7">
-                <input type="text" class="#(class)#" id="namespaceTemp" name="namespaceTemp" value='#(..EscapeHTML(settings.namespaceTemp))#' placeholder="e.g. C:\someproj\"/>
+                <input type="text" class="#(class)#" id="namespaceTemp" name="namespaceTemp" value='#(..EscapeHTML(settings.namespaceTemp))#' placeholder=#(placeholder)#/>
             </div>
         </div>
         <server>
@@ -290,8 +292,10 @@ body {
                             "File not found - generate a new key pair?"_
                             "</button>"
                     }
+                    set placeholder = $Select($system.Version.GetOS()="Windows":"(e.g. C:\Users\ExampleUser\.ssh\id_rsa)",
+                        1:"(e.g., /home/user/.ssh/id_rsa)")
                 </server>
-                <input type="text" class="#(class)#" id="privateKeyFile" name="privateKeyFile" value='#(..EscapeHTML(settings.privateKeyFile))#' placeholder="C:\Users\ExampleUser\.ssh\id_rsa"/>
+                <input type="text" class="#(class)#" id="privateKeyFile" name="privateKeyFile" value='#(..EscapeHTML(settings.privateKeyFile))#' placeholder=#(placeholder)#/>
                 <div class = "#(divClass)#">
                     #(feedbackText)#
                     <pre id="sshOutput"></pre>
@@ -658,8 +662,9 @@ function getSocket(urlPostfix) {
 
 function init() {
     disableActionButtons();
-	var ws = getSocket("method=init");
-	ws.onmessage = showOutput('initOutput');
+    var root = document.getElementById("namespaceTemp").value;
+    var ws = getSocket("method=init&root=" + encodeURIComponent(root));
+    ws.onmessage = showOutput('initOutput');
 }
 
 function clone() {