From 80e7dc423da98aca9308c1e594b16d2211288fc4 Mon Sep 17 00:00:00 2001 From: isc-tleavitt <73311181+isc-tleavitt@users.noreply.github.com> Date: Thu, 18 May 2023 08:10:56 -0400 Subject: [PATCH 1/2] Normalize slashes in ExternalName Fixes #252 --- cls/SourceControl/Git/Extension.cls | 3 ++- cls/SourceControl/Git/Utils.cls | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/cls/SourceControl/Git/Extension.cls b/cls/SourceControl/Git/Extension.cls index 2e819b52..51073a9e 100644 --- a/cls/SourceControl/Git/Extension.cls +++ b/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 @@ -335,3 +335,4 @@ Method AddToSourceControl(InternalName As %String, Description As %String = "") } } + diff --git a/cls/SourceControl/Git/Utils.cls b/cls/SourceControl/Git/Utils.cls index da313c59..cdc1248f 100644 --- a/cls/SourceControl/Git/Utils.cls +++ b/cls/SourceControl/Git/Utils.cls @@ -441,7 +441,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 From d005dc6b21107448e99ad497eee39d86e0bdf7c2 Mon Sep 17 00:00:00 2001 From: isc-tleavitt <73311181+isc-tleavitt@users.noreply.github.com> Date: Mon, 12 Jun 2023 12:55:35 -0400 Subject: [PATCH 2/2] Update CHANGELOG.md, module.xml --- CHANGELOG.md | 5 +++++ module.xml | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 22891353..955c525b 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/module.xml b/module.xml index a918957c..b8cdf4b3 100644 --- a/module.xml +++ b/module.xml @@ -3,7 +3,7 @@ git-source-control - 2.2.0 + 2.2.1 Server-side source control extension for use of Git on InterSystems platforms git source control studio vscode module