Merge branch 'intersystems:main' into push-button

Author: isc-pbarton

CHANGELOG.md

@@ -5,6 +5,11 @@ 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.2.1] - Unreleased
+
+### Fixed
+- Studio export path doesn't get weird mixed slahes on Windows (#252)
+
 ## [2.2.0] - 2023-06-05
 
 ### Added

cls/SourceControl/Git/Extension.cls

@@ -266,7 +266,7 @@ Method OnAfterDelete(InternalName As %String) As %Status
 /// the routine/class/csp item. This is often a filename to write the file out to.
 Method ExternalName(InternalName As %String) As %String
 {
-    quit ##class(Utils).Name(InternalName)
+    quit ##class(Utils).ExternalName(InternalName)
 }
 
 Method IsReadOnly(InternalName As %String) As %Boolean

cls/SourceControl/Git/Utils.cls

@@ -498,7 +498,7 @@ ClassMethod NormalizeFolder(folder As %String) As %String
 
 ClassMethod ExternalName(InternalName As %String, ByRef MappingExists As %Boolean) As %String
 {
-    quit ..Name(.InternalName,.MappingExists)
+    quit $Replace(..Name(.InternalName,.MappingExists),"/",..#Slash)
 }
 
 ClassMethod AddToServerSideSourceControl(InternalName As %String) As %Status

module.xml

@@ -3,7 +3,7 @@
   <Document name="git-source-control.ZPM">
     <Module>
       <Name>git-source-control</Name>
-      <Version>2.2.0</Version>
+      <Version>2.2.1</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>