fix: git pull now successfully deletes production config items

Author: isc-pbarton

cls/SourceControl/Git/Util/ProductionItemCache.cls

@@ -0,0 +1,26 @@
+/// Maintains a cache mapping PTD items' full external names to internal names. 
+/// This is only required to deploy deletes because once the file is deleted from disk, there is 
+/// no way to determine the internal name for it.
+Class SourceControl.Git.Util.ProductionItemCache
+{
+
+ClassMethod Store(externalName, internalName)
+{
+    if externalName '= "" {
+        set @##class(SourceControl.Git.Utils).#Storage@("ptd_items", $translate(externalName,"\","/")) = internalName
+    }
+}
+
+ClassMethod Lookup(externalName)
+{
+    return $select(
+        externalName="":"",
+        1:$get(@##class(SourceControl.Git.Utils).#Storage@("ptd_items", $translate(externalName,"\","/"))))
+}
+
+ClassMethod Clear()
+{
+    kill @##class(SourceControl.Git.Utils).#Storage@("ptd_items")
+}
+
+}

cls/SourceControl/Git/Utils.cls

@@ -1265,14 +1265,16 @@ ClassMethod ImportItem(InternalName As %String, force As %Boolean = 0, verbose A
     set imported = 1
     if ..IsRoutineOutdated(InternalName) || force || (type = "ptd"){
         if (type = "ptd") && settings.decomposeProductions && ##class(%Library.EnsembleMgr).IsEnsembleNamespace() {
-            // Deployment manager should not reexport because studio project file includes timestamp
-            // ideally we could just new %SourceControl, but Ens portal config pages do not use %SourceControl
-            new %gscSkipSaveHooks
-            set %gscSkipSaveHooks = 1
-            set targetProduction = $piece(InternalName,"||",1)
-            set rollbackFile = ##class(%File).TempFilename()
-            set sc = ##class(Ens.Deployment.Deploy).DeployCode(filename,targetProduction,0,rollbackFile)
-            do ##class(%File).Delete(rollbackFile)
+            if ##class(%File).Exists(filename) {
+                // Deployment manager should not reexport because studio project file includes timestamp
+                // ideally we could just new %SourceControl, but Ens portal config pages do not use %SourceControl
+                new %gscSkipSaveHooks
+                set %gscSkipSaveHooks = 1
+                set targetProduction = $piece(InternalName,"||",1)
+                set rollbackFile = ##class(%File).TempFilename()
+                set sc = ##class(Ens.Deployment.Deploy).DeployCode(filename,targetProduction,0,rollbackFile)
+                do ##class(%File).Delete(rollbackFile)
+            }
         } elseif (type = "cls") && settings.decomposeProductions 
                 && ##class(SourceControl.Git.Production).IsProductionClass(
                     ..NameWithoutExtension(InternalName), "FullExternalName") {
@@ -2150,7 +2152,9 @@ ClassMethod Name(InternalName As %String, ByRef MappingExists As %Boolean) As %S
         quit $translate(found_$translate(InternalName,"%","_"),"\","/")
     } elseif (..Type(InternalName) = "ptd") {
         do ##class(SourceControl.Git.Production).ParseInternalName(InternalName,'default,.filename)
-        return $translate(found_filename, "\","/")
+        set externalName = $translate(found_filename, "\","/")
+        do ##class(SourceControl.Git.Util.ProductionItemCache).Store(..TempFolder()_externalName, InternalName)
+        return externalName
     } elseif ext="CLS"||(ext="PRJ")||usertype {
         set nam=$replace(nam,"%", ..PercentClassReplace())
         if default{
@@ -2216,10 +2220,6 @@ ClassMethod NameToInternalName(Name, IgnorePercent = 1, IgnoreNonexistent = 1, V
     }
     if (##class(%File).Exists(Name)) {
         set InternalName = ##class(SourceControl.Git.File).ExternalNameToInternalName(Name)
-        if (InternalName '= "") && (context.IsInGitEnabledPackage) {
-            // Don't need mappings!
-            return ..NormalizeInternalName(InternalName)
-        }
     } else {
         // check for file in uncommitted queue
         &sql(SELECT internalName into :InternalName FROM SourceControl_Git.Change where ItemFile = :Name)
@@ -2229,6 +2229,11 @@ ClassMethod NameToInternalName(Name, IgnorePercent = 1, IgnoreNonexistent = 1, V
             set Deleted = 1
         }
     }
+    // check for file in production item cache
+    if InternalName = "" {
+        set InternalName = ##class(SourceControl.Git.Util.ProductionItemCache).Lookup(Name)
+    }
+    // use mappings
     if (InternalName="") {
         set name=$extract(Name,$length($$$SourceRoot)+1,*)
         set name=$replace(name,"\","/")	// standardize slash direction
@@ -2361,7 +2366,11 @@ ClassMethod NameToInternalName(Name, IgnorePercent = 1, IgnoreNonexistent = 1, V
     }
     if ((IgnorePercent)&&($extract(InternalName)="%")) { set InternalName = "" }	// don't return a result for % items if instructed to ignore them
     if ((IgnoreNonexistent)&&('##class(%RoutineMgr).Exists(InternalName))&&('Deleted)) { set InternalName = "" }	// only return item names which exist in the DB
-    quit ..NormalizeInternalName(InternalName)
+    set normalizedInternalName = ..NormalizeInternalName(InternalName)
+    if ..Type(normalizedInternalName) = "ptd" {
+        do ##class(SourceControl.Git.Util.ProductionItemCache).Store(Name, normalizedInternalName)
+    }
+    quit normalizedInternalName
 }
 
 ClassMethod OutputConfigureMessage()