Skip to content

Commit be5a51d

Browse files
committed
fix: various things for demo
IncrementalLoad needs to compile with ck, not u - production xdata changes aren't picked up with "u" Protection against argumentless operations in RunGitCommandWithInput
1 parent 593c858 commit be5a51d

File tree

2 files changed

+11
-7
lines changed

2 files changed

+11
-7
lines changed

cls/SourceControl/Git/PullEventHandler/IncrementalLoad.cls

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Method OnPull() As %Status
3535
write !, "Nothing to compile."
3636
quit $$$OK
3737
}
38-
quit $system.OBJ.CompileList(.compilelist, "cukb")
38+
quit $system.OBJ.CompileList(.compilelist, "ck")
3939
}
4040

4141
Method DeleteFile(item As %String) As %Status
@@ -71,4 +71,3 @@ Method DeleteFile(item As %String) As %Status
7171
}
7272

7373
}
74-

cls/SourceControl/Git/Utils.cls

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1608,10 +1608,14 @@ ClassMethod RunGitCommandWithInput(command As %String, inFile As %String = "", O
16081608

16091609
if (command = "checkout"){
16101610
set syncIrisWithDiff = 1
1611-
set diffCompare = args(args)
1611+
if $data(args) && $data(args(args),diffCompare) {
1612+
// no-op
1613+
}
16121614
} elseif (command = "merge") || (command = "rebase") || (command = "pull"){
16131615
set syncIrisWithCommand = 1
1614-
set diffCompare = args(args)
1616+
if $data(args) && $data(args(args),diffCompare) {
1617+
// no-op
1618+
}
16151619
}
16161620

16171621
for i=1:1:$get(args) {
@@ -1688,10 +1692,12 @@ ClassMethod RunGitCommandWithInput(command As %String, inFile As %String = "", O
16881692
for stream=errStream,outStream {
16891693
set stream.RemoveOnClose = 1
16901694
}
1691-
do ..PrintStreams(errStream, outStream)
1695+
16921696
if syncIrisWithDiff {
1697+
do ..PrintStreams(errStream, outStream)
16931698
$$$ThrowOnError(..SyncIrisWithRepoThroughDiff(.files))
16941699
} elseif syncIrisWithCommand {
1700+
do ..PrintStreams(errStream, outStream)
16951701
$$$ThrowOnError(..SyncIrisWithRepoThroughCommand(.outStream))
16961702
}
16971703
quit returnCode
@@ -1746,7 +1752,7 @@ ClassMethod SyncIrisWithRepoThroughDiff(ByRef files) As %Status
17461752
set key = $order(files(""))
17471753
set deletedFiles = ""
17481754
set addedFiles = ""
1749-
while(key '= "") {
1755+
while (key '= "") {
17501756
set modification = files(key)
17511757
if (modification.changeType = "D"){
17521758
if (modification.internalName '= "") {
@@ -1757,7 +1763,6 @@ ClassMethod SyncIrisWithRepoThroughDiff(ByRef files) As %Status
17571763
if (modification.internalName '= "") {
17581764
set addedFiles = addedFiles_","_modification.internalName
17591765
set files(key) = modification
1760-
17611766
}
17621767
}
17631768
set key = $order(files(key))

0 commit comments

Comments
 (0)