Skip to content

Commit 05e150c

Browse files
committed
Other minor bugfixes
1 parent 223a595 commit 05e150c

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

cls/SourceControl/Git/Change.cls

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,13 @@
11
Class SourceControl.Git.Change Extends %Studio.SourceControl.Change
22
{
33

4+
/// Returns the name of the backup file for this Item in the file system
5+
/// Unused in this class, so override to avoid errors.
6+
Property BackupName As %String [ Calculated, SqlComputeCode = {s {*} = ""}, SqlComputed ];
7+
8+
/// Returns the name of this Item in the file system
9+
Property ExternalName As %String [ Calculated, SqlComputeCode = {S {*} = "" }, SqlComputed ];
10+
411
Storage Default
512
{
613
<Type>%Storage.Persistent</Type>

cls/SourceControl/Git/Utils.cls

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -310,7 +310,7 @@ ClassMethod Pull(remote As %String = "origin") As %Status
310310
merge event.ModifiedFiles = files
311311
for i=1:1:$Get(files) {
312312
if $Data(files(i))#2 {
313-
set internalName = ##class(SourceControl.Git.Utils).NameToInternalName(..ModifiedFiles(i))
313+
set internalName = ##class(SourceControl.Git.Utils).NameToInternalName(event.ModifiedFiles(i))
314314
if (internalName '= "") {
315315
set event.ModifiedItems(internalName) = ""
316316
}
@@ -934,11 +934,13 @@ ClassMethod ExportItem(InternalName As %String, expand As %Boolean = 1, force As
934934
$$$QuitOnError(..ExportRoutinesAux(InternalName , "/", 0, force))
935935
}else {
936936
if ..IsTempFileOutdated(InternalName) || force {
937-
938937
#dim filename As %String = ..FullExternalName(InternalName)
939938
write "exporting new version of ", InternalName, " to ", filename,!
940939
$$$QuitOnError($system.OBJ.ExportUDL(InternalName, filename,"-d/diff"))
941940
$$$QuitOnError(..UpdateRoutineTSH(InternalName, $Horolog))
941+
if '##class(SourceControl.Git.Change).IsUncommitted(filename) {
942+
$$$ThrowOnError(##class(SourceControl.Git.Change).SetUncommitted(filename, "add", InternalName, $Username, "", 1, "", "", 0))
943+
}
942944
}
943945
}
944946
quit $$$OK

0 commit comments

Comments
 (0)