@@ -982,6 +982,7 @@ ClassMethod RemoveFromServerSideSourceControl(InternalName As %String) As %Statu
982
982
983
983
if $data (@..#Storage@(" items" , item )) {
984
984
kill @..#Storage@(" items" , item )
985
+ do ..RemoveRoutineTSH (item )
985
986
do ..RemoveFolderIfEmpty (..TempFolder ())
986
987
} elseif (type = " cls" ) {
987
988
set tsc = ..MakeError (item _ " is not in SourceControl" )
@@ -1567,7 +1568,7 @@ ClassMethod ImportRoutines(force As %Boolean = 0, pullEventClass As %String) As
1567
1568
1568
1569
#dim ec as %Status = ..ListItemsInFiles (.itemList , .err )
1569
1570
quit :'ec ec
1570
-
1571
+
1571
1572
// If there is a config file it must be imported before everything else.
1572
1573
if $Data (itemList (##class (SourceControl.Git.Settings.Document ).#INTERNALNAME)) {
1573
1574
set sc = ##class (SourceControl.Git.Utils ).ImportItem (##class (SourceControl.Git.Settings.Document ).#INTERNALNAME, force )
@@ -1591,10 +1592,10 @@ ClassMethod ImportRoutines(force As %Boolean = 0, pullEventClass As %String) As
1591
1592
for {
1592
1593
set internalName = $order (itemList (internalName ))
1593
1594
quit :internalName =" "
1594
-
1595
+
1595
1596
// Don't import the config file a second time
1596
1597
continue :internalName =##class (SourceControl.Git.Settings.Document ).#INTERNALNAME
1597
-
1598
+
1598
1599
set context = ##class (SourceControl.Git.PackageManagerContext ).ForInternalName (internalName )
1599
1600
continue :context .Package '=refPackage
1600
1601
set doImport = ..IsRoutineOutdated (internalName ) || force
@@ -1720,7 +1721,11 @@ ClassMethod ExportItem(InternalName As %String, expand As %Boolean = 1, force As
1720
1721
write !, " Production decomposition enabled, skipping export of production class"
1721
1722
set filename = " "
1722
1723
} else {
1723
- $$$QuitOnError($system .OBJ .ExportUDL (InternalName , filename ," -d/diff" ))
1724
+ set tSC = $SYSTEM .OBJ .ExportUDL (InternalName , filename ," -d/diff" )
1725
+ if $$$ISERR(tSC ) {
1726
+ write !?5 , InternalName , " not found. Cleaning up source control."
1727
+ do ..RemoveFromServerSideSourceControl (InternalName )
1728
+ }
1724
1729
}
1725
1730
if (filename '= " " ) && ##class (%File ).Exists (filename ) {
1726
1731
set filenames ($I (filenames )) = filename
0 commit comments