Fix behavior in package manager context (#205)

* Fix package manager awareness

Also improves performance by reducing duplication of git commands

* Bump version + update changelog

* Fix outdated unit test

Author: isc-tleavitt

CHANGELOG.md

@@ -5,6 +5,12 @@ 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.0.3+snapshot]
+
+### Fixed
+- Correctly detects filesystem mappings in a package manager context
+- Improved performance by removing redundant git status calls
+
 ## [2.0.2] - 2022-08-09
 
 ### Fixed

cls/SourceControl/Git/Change.cls

@@ -79,8 +79,10 @@ ClassMethod IsUncommitted(Filename, ByRef ID) As %Boolean
 }
 
 /// Goes through Uncommitted queue and removes any items of action 'edit' or 'add' which are ReadOnly or non-existent on the filesystem
-ClassMethod RefreshUncommitted(Display = 0, IncludeRevert = 0) As %Status
+ClassMethod RefreshUncommitted(Display = 0, IncludeRevert = 0, Output gitFiles) As %Status
 {
+    kill gitFiles
+    
     // files from the uncommitted queue
     set sc=..ListUncommitted(.tFileList,IncludeRevert,0)
     if $$$ISERR(sc) quit sc
@@ -127,3 +129,4 @@ ClassMethod RefreshUncommitted(Display = 0, IncludeRevert = 0) As %Status
 }
 
 }
+

cls/SourceControl/Git/Extension.cls

@@ -289,8 +289,18 @@ Method GetStatus(InternalName As %String, ByRef IsInSourceControl As %Boolean, B
     if '$$$FileExists(filename) {
         set IsCheckedOut=0
     }
-    do ##class(SourceControl.Git.Change).RefreshUncommitted()
-    do ##class(SourceControl.Git.Utils).GitStatus(.files)
+    // %MenuName and %InternalName set up by %Studio.SourceControl.Interface:MenuItems class query
+    if $Data(%MenuName)#2 && $Data(%InternalName)#2 {
+        if $Data(%MenuName(%InternalName)) {
+            merge files = %MenuName(%InternalName)
+        } else {
+            do ##class(SourceControl.Git.Change).RefreshUncommitted(,,.files)
+            // Cache to optimize rendering menu with multiple items dependent on status
+            merge %MenuName(%InternalName) = files
+        }
+    } else {
+        do ##class(SourceControl.Git.Change).RefreshUncommitted(,,.files)
+    }
     if $get(files(InternalName)) '= "" {
         ///it's in source control, checked out, and should be locked to editing by other users
         ///find out who has it edited
@@ -319,3 +329,4 @@ Method GetStatus(InternalName As %String, ByRef IsInSourceControl As %Boolean, B
 }
 
 }
+

cls/SourceControl/Git/Utils.cls

@@ -853,7 +853,7 @@ ClassMethod IsInSourceControl(InternalName As %String, ByRef sourceControlItem A
     if isInSourceControl {
         // Direct reference to namespace-default project
         set sourceControlItem = InternalName
-    } elseif context.IsInGitEnabledPackage && (InternalName = context.InternalName) {
+    } elseif context.IsInGitEnabledPackage && (InternalName = ..NormalizeExtension(context.InternalName)) {
         // Next thing to check is if we're in a package manager-based package
         set isInSourceControl = 1
         set sourceControlItem = context.ResourceReference.Name
@@ -1537,7 +1537,12 @@ ClassMethod NameToInternalName(Name, IgnorePercent = 1, IgnoreNonexistent = 1, V
 {
     set InternalName=""
     set Deleted = 0
-    if ($zconvert(Name,"U")'[$zconvert($$$SourceRoot,"U")) {
+    set context = ##class(SourceControl.Git.PackageManagerContext).%Get()
+    if (context.IsInGitEnabledPackage) {
+        if ($zconvert(Name,"U")'[$zconvert(context.Package.Root,"U")) {
+            set Name = ##class(%File).NormalizeFilename(context.Package.Root_Name)
+        }
+    } elseif ($zconvert(Name,"U")'[$zconvert($$$SourceRoot,"U")) {
         set Name = ##class(%File).NormalizeFilename(..TempFolder()_Name)
     }
     if (##class(%File).Exists(Name)) {
@@ -1546,6 +1551,10 @@ ClassMethod NameToInternalName(Name, IgnorePercent = 1, IgnoreNonexistent = 1, V
         if (($data(outName)=1) || ($data(outName) = 11 && ($order(outName(""),-1) = $order(outName(""))))) && ($zconvert(..Type(outName),"U") '= "CSP") {
             //only set if a single Name was returned ... ignore multi-item files
             set InternalName=outName
+            if (context.IsInGitEnabledPackage) {
+                // Don't need mappings!
+                return ..NormalizeInternalName(InternalName)
+            }
         }
     } else {
         // check for file in uncommitted queue
@@ -1716,3 +1725,4 @@ ClassMethod GetSourceControlInclude() As %String
 }
 
 }
+

module.xml

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

test/UnitTest/SourceControl/Git/NameToInternalNameTest.cls

@@ -9,6 +9,8 @@ Property Mappings [ MultiDimensional ];
 
 Property OldNamespaceTemp As %String;
 
+Property OldPercentClassReplace As %String;
+
 Method TestRegularClassNames()
 {
 	// Regular class that exists
@@ -93,7 +95,9 @@ Method OnBeforeAllTests() As %Status
 {
 	set settings = ##class(SourceControl.Git.Settings).%New()
 	set ..OldNamespaceTemp = settings.namespaceTemp
+	set ..OldPercentClassReplace = settings.percentClassReplace
 	set settings.namespaceTemp = $Piece(..Manager.CurrentDir,"test",1)
+	set settings.percentClassReplace = "_"
 	$$$ThrowOnError(settings.%Save())
 	merge ..Mappings = @##class(SourceControl.Git.Utils).MappingsNode()
 	kill @##class(SourceControl.Git.Utils).MappingsNode()
@@ -115,10 +119,12 @@ Method %OnClose() As %Status
 {
 	set settings = ##class(SourceControl.Git.Settings).%New()
 	set settings.namespaceTemp = ..OldNamespaceTemp
+	set settings.percentClassReplace = ..OldPercentClassReplace
 	do settings.%Save()
 	kill @##class(SourceControl.Git.Utils).MappingsNode()
 	merge @##class(SourceControl.Git.Utils).MappingsNode() = ..Mappings
 	quit $$$OK
 }
 
 }
+