Merge branch 'main' into git-version-reminder

Author: isc-etamarch

CHANGELOG.md

@@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [2.5.0] - Unreleased
+## [2.5.0] - 2024-09-24
 
 ### Added
 - New UI for the basic mode Sync (#415)
@@ -25,6 +25,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Improved logging in preview and when errors occur via WebSocket commands (#467)
 - Fixed pull event handler handling of extremely long class names from diff (#467)
 - Fixed Git web UI prompt to update file list when file selected/unselected (#478)
+- Fixed folder settings in mappings to be saved and persist (#483)
+- Preview on the pull.csp page now shows commits from the correct branch (#490)
 
 ## [2.4.1] - 2024-08-02
 
@@ -173,4 +175,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - #201: fix behavior with CSP files
 
 ## [2.0.1] - 2022-06-02
-- Last released version before CHANGELOG existed.
+- Last released version before CHANGELOG existed.

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

@@ -16,7 +16,7 @@ ClassMethod Run()
 		Write !,"Current branch: ",branchName
 		Do ##class(SourceControl.Git.Utils).RunGitWithArgs(.errStream, .outStream, "fetch")
 		Kill errStream, outStream
-		Do ##class(SourceControl.Git.Utils).RunGitWithArgs(.errStream, .outStream, "log", "HEAD..origin", "--name-status")
+		Do ##class(SourceControl.Git.Utils).RunGitWithArgs(.errStream, .outStream, "log", "HEAD..origin/"_branchName, "--name-status")
 		Do ##class(SourceControl.Git.Utils).PrintStreams(errStream, outStream)
 		If (outStream.Size = 0) && (errStream.Size = 0) {
 			Write !,"Already up to date."

csp/gitprojectsettings.csp

@@ -665,6 +665,13 @@ function toggleNoFolders(e){
 
 $('[id^=noFoldersSwitch]').click(toggleNoFolders);
 
+// Check to persist state of no folder switches  
+$('.mapping-input-group').children('.voca').each(function(){
+    var currElement = $(this).children().children(".custom-control").children()[0]
+    if(!$(currElement).hasClass("active")) {
+        $(currElement).parent().siblings("#NoFolders")[0].value = "NoFolders";
+    }
+});
 </script>
 </body>
 </html>

module.xml

@@ -3,7 +3,7 @@
   <Document name="git-source-control.ZPM">
     <Module>
       <Name>git-source-control</Name>
-      <Version>2.4.1</Version>
+      <Version>2.5.0</Version>
       <Description>Server-side source control extension for use of Git on InterSystems platforms</Description>
       <Keywords>git source control studio vscode</Keywords>
       <Packaging>module</Packaging>