File tree Expand file tree Collapse file tree 1 file changed +10
-18
lines changed Expand file tree Collapse file tree 1 file changed +10
-18
lines changed Original file line number Diff line number Diff line change @@ -1569,28 +1569,20 @@ ClassMethod ImportRoutines(force As %Boolean = 0, pullEventClass As %String) As
1569
1569
quit :'ec ec
1570
1570
1571
1571
// If there is a config file it must be imported before everything else.
1572
- set internalName = " "
1573
- for {
1574
- set internalName = $order (itemList (internalName ))
1575
- quit :internalName =" "
1572
+ if $Data (itemList (##class (SourceControl.Git.Settings.Document ).#INTERNALNAME)) {
1573
+ set sc = ##class (SourceControl.Git.Utils ).ImportItem (##class (SourceControl.Git.Settings.Document ).#INTERNALNAME, force )
1576
1574
1577
- // If a config file is found then import it
1578
- if internalName = ##class (SourceControl.Git.Settings.Document ).#INTERNALNAME {
1579
- set sc = ##class (SourceControl.Git.Utils ).ImportItem (internalName , force )
1575
+ if $$$ISERR(sc ) {
1576
+ set ec = $$$ADDSC(ec , sc )
1577
+ } else {
1578
+ kill err , itemList
1579
+ set err = 0
1580
1580
1581
- if $$$ISERR(sc ) {
1582
- set ec = $$$ADDSC(ec , sc )
1583
- } else {
1584
- kill err , itemList
1585
- set err = 0
1586
-
1587
- // Get the item list again as it may be different after just importing the config file
1588
- set ec = $$$ADDSC(ec , ..ListItemsInFiles (.itemList , .err ))
1589
- }
1590
- quit
1581
+ // Get the item list again as it may be different after just importing the config file
1582
+ set ec = $$$ADDSC(ec , ..ListItemsInFiles (.itemList , .err ))
1591
1583
}
1584
+ quit :'ec ec
1592
1585
}
1593
- quit :'ec ec
1594
1586
1595
1587
kill files
1596
1588
You can’t perform that action at this time.
0 commit comments