Safeguard-discard on menu-based discard

isc-etamarch · isc-etamarch · commit 6f4c805ab97c · 2024-09-26T10:55:58.000-04:00
diff --git a/cls/SourceControl/Git/Utils.cls b/cls/SourceControl/Git/Utils.cls
@@ -334,6 +334,7 @@ ClassMethod Init() As %Status
 ClassMethod Revert(InternalName As %String) As %Status
 {
     set filename = ..FullExternalName(.InternalName)
+    do ##class(SourceControl.Git.DiscardState).SaveDiscardState(InternalName)
     do ..RunGitCommand("checkout", .errStream, .outStream, "--", filename)
     $$$QuitOnError(##class(SourceControl.Git.Change).RemoveUncommitted(filename,0,1))
     $$$QuitOnError(##class(SourceControl.Git.Change).RefreshUncommitted(0,1,,1))

Original file line number	Diff line number	Diff line change
`@@ -334,6 +334,7 @@ ClassMethod Init() As %Status`
`334`	`334`	`ClassMethod Revert(InternalName As %String) As %Status`
`335`	`335`	`{`
`336`	`336`	`set filename = ..FullExternalName(.InternalName)`
	`337`	`+ do ##class(SourceControl.Git.DiscardState).SaveDiscardState(InternalName)`
`337`	`338`	`do ..RunGitCommand("checkout", .errStream, .outStream, "--", filename)`
`338`	`339`	`$$$QuitOnError(##class(SourceControl.Git.Change).RemoveUncommitted(filename,0,1))`
`339`	`340`	`$$$QuitOnError(##class(SourceControl.Git.Change).RefreshUncommitted(0,1,,1))`