@@ -1536,7 +1536,7 @@ ClassMethod ListItemsInFiles(ByRef itemList, ByRef err) As %Status
1536
1536
quit $$$OK
1537
1537
}
1538
1538
1539
- ClassMethod ImportRoutines (force As %Boolean = 0 ) As %Status
1539
+ ClassMethod ImportRoutines (force As %Boolean = 0 , pullEventClass As %String ) As %Status
1540
1540
{
1541
1541
set refContext = ##class (SourceControl.Git.PackageManagerContext ).%Get ()
1542
1542
set refPackage = refContext .Package
@@ -1573,7 +1573,7 @@ ClassMethod ImportRoutines(force As %Boolean = 0) As %Status
1573
1573
set modification = ##class (SourceControl.Git.Modification ).%New ()
1574
1574
set modification .changeType = " M"
1575
1575
set modification .internalName = internalName
1576
- set modification .externalName = ..FullExternalName (internalName )
1576
+ set modification .externalName = ..ExternalName (internalName )
1577
1577
set files ($increment (files )) = modification
1578
1578
}
1579
1579
}
@@ -1588,18 +1588,19 @@ ClassMethod ImportRoutines(force As %Boolean = 0) As %Status
1588
1588
set context = ##class (SourceControl.Git.PackageManagerContext ).ForInternalName (item )
1589
1589
continue :context .Package '=refPackage
1590
1590
1591
+ set externalName = ..ExternalName (item )
1591
1592
set fullExternalName = ..FullExternalName (item )
1592
1593
if '##class (%File ).Exists (fullExternalName ) {
1593
1594
write !,fullExternalName ," does not exist - deleting " ,item
1594
1595
set modification = ##class (SourceControl.Git.Modification ).%New ()
1595
1596
set modification .changeType = " D"
1596
1597
set modification .internalName = item
1597
- set modification .externalName = fullExternalName
1598
+ set modification .externalName = externalName
1598
1599
set files ($increment (files )) = modification
1599
1600
}
1600
1601
}
1601
1602
1602
- set sc = ##class (SourceControl.Git.PullEventHandler ).ForModifications (.files )
1603
+ set sc = ##class (SourceControl.Git.PullEventHandler ).ForModifications (.files , . pullEventClass )
1603
1604
if $$$ISERR(sc ) {
1604
1605
set ec = $$$ADDSC(ec ,sc )
1605
1606
}
@@ -1732,9 +1733,10 @@ ClassMethod ExportSystemDefaults() As %Status
1732
1733
}
1733
1734
1734
1735
/// if <var>force</var> = 1 then we import item even if timestamp in system is newer
1735
- ClassMethod ImportAll (force As %Boolean = 0 ) As %Status
1736
+ /// if <var>pullEventClass</var> is defined, then override the configured pull event handler class.
1737
+ ClassMethod ImportAll (force As %Boolean = 0 , pullEventClass As %String ) As %Status
1736
1738
{
1737
- quit ..ImportRoutines (force )
1739
+ quit ..ImportRoutines (force , . pullEventClass )
1738
1740
}
1739
1741
1740
1742
ClassMethod ExportRoutines (force As %Boolean = 0 ) As %Status
0 commit comments