From 1f746515741956de5804f32853e1a660db4fec4b Mon Sep 17 00:00:00 2001
From: isc-hwojnick <hwojnick@intersystems.com>
Date: Wed, 7 Aug 2024 09:33:26 -0400
Subject: [PATCH 01/18] mostly done with changes

---
 cls/SourceControl/Git/DiscardState.cls        |  96 +++++++++++++++++
 cls/SourceControl/Git/WebUIDriver.cls         |  22 +++-
 .../share/git-webui/webui/css/git-webui.css   |   3 +
 .../share/git-webui/webui/img/discarded.svg   |   1 +
 .../share/git-webui/webui/js/git-webui.js     | 100 +++++++++++++++++-
 .../share/git-webui/webui/css/git-webui.less  |   4 +
 .../share/git-webui/webui/img/discarded.svg   |   1 +
 .../src/share/git-webui/webui/js/git-webui.js | 100 +++++++++++++++++-
 8 files changed, 316 insertions(+), 11 deletions(-)
 create mode 100644 cls/SourceControl/Git/DiscardState.cls
 create mode 100644 git-webui/release/share/git-webui/webui/img/discarded.svg
 create mode 100644 git-webui/src/share/git-webui/webui/img/discarded.svg

diff --git a/cls/SourceControl/Git/DiscardState.cls b/cls/SourceControl/Git/DiscardState.cls
new file mode 100644
index 00000000..8728f7d9
--- /dev/null
+++ b/cls/SourceControl/Git/DiscardState.cls
@@ -0,0 +1,96 @@
+Class SourceControl.Git.DiscardState Extends (%Persistent, %JSON.Adaptor)
+{
+
+Property FullExternalName As %String(MAXLEN = "") [ Required ];
+
+Property InternalName As %String [ Required ];
+
+Property Contents As %Stream.GlobalCharacter(LOCATION = "^DiscardStateContents");
+
+Property Username As %String [ Required ];
+
+Property Branch As %String [ Required ];
+
+Property Timestamp As %TimeStamp [ Required ];
+
+Method RestoreToFileTree()
+{
+        set fileStream = ##class(%Stream.FileCharacter).%OpenId(..FullExternalName,,.sc)
+        $$$ThrowOnError(sc)
+        do fileStream.CopyFrom(..Contents)
+        $$$ThrowOnError(fileStream.%Save())
+        do ##class(SourceControl.Git.Utils).ImportItem(..InternalName, 1, 1)
+        $$$ThrowOnError(..%DeleteId(..%Id()))
+}
+
+ClassMethod SaveDiscardState(InternalName As %String) As %Status
+{
+        set discardState = ..%New()
+        set discardState.FullExternalName = ##class(SourceControl.Git.Utils).FullExternalName(InternalName)
+        set discardState.InternalName = InternalName
+
+        set fileStream = ##class(%Stream.FileCharacter).%New()
+        set fileStream.Filename = discardState.FullExternalName
+        do fileStream.%Open()
+        do discardState.Contents.CopyFrom(fileStream)
+        do fileStream.%Close()
+        set discardState.Username = $USERNAME
+        set discardState.Branch = ##class(SourceControl.Git.Utils).GetCurrentBranch()
+        set discardState.Timestamp = $zdatetime($horolog, 3)
+
+        set st = discardState.%Save()
+
+        quit st
+}
+
+ClassMethod DiscardStatesInBranch() As %DynamicArray
+{
+    set currentBranch = ##class(SourceControl.Git.Utils).GetCurrentBranch()
+    set statement = "SELECT ID FROM SourceControl_Git.DiscardState WHERE branch = ?"
+    set resultSet = ##class(%SQL.Statement).%ExecDirect(, statement, currentBranch)
+    set discardStates = []
+    while resultSet.%Next() {
+        set discardState = ..%OpenId(resultSet.ID)
+        do discardState.%JSONExportToString(.JSONStr)
+        set discardStateObject = ##class(%DynamicAbstractObject).%FromJSON(JSONStr)
+        do discardStates.%Push(discardStateObject)
+    }
+
+    quit discardStates
+}
+
+Storage Default
+{
+<Data name="DiscardStateDefaultData">
+<Value name="1">
+<Value>%%CLASSNAME</Value>
+</Value>
+<Value name="2">
+<Value>FullExternalName</Value>
+</Value>
+<Value name="3">
+<Value>InternalName</Value>
+</Value>
+<Value name="4">
+<Value>Contents</Value>
+</Value>
+<Value name="5">
+<Value>Username</Value>
+</Value>
+<Value name="6">
+<Value>Branch</Value>
+</Value>
+<Value name="7">
+<Value>Timestamp</Value>
+</Value>
+</Data>
+<DataLocation>^SourceControl22B9.DiscardStateD</DataLocation>
+<DefaultData>DiscardStateDefaultData</DefaultData>
+<IdLocation>^SourceControl22B9.DiscardStateD</IdLocation>
+<IndexLocation>^SourceControl22B9.DiscardStateI</IndexLocation>
+<StreamLocation>^SourceControl22B9.DiscardStateS</StreamLocation>
+<Type>%Storage.Persistent</Type>
+}
+
+}
+
diff --git a/cls/SourceControl/Git/WebUIDriver.cls b/cls/SourceControl/Git/WebUIDriver.cls
index f6c29214..203d9d0a 100644
--- a/cls/SourceControl/Git/WebUIDriver.cls
+++ b/cls/SourceControl/Git/WebUIDriver.cls
@@ -27,7 +27,7 @@ ClassMethod HandleRequest(pagePath As %String, InternalName As %String = "", Out
         if $isobject($get(responseJSON)) {
             do responseJSON.%ToJSON(%data)
         }
-    } elseif $match(pathStart,"git-command|git|dirname|hostname|viewonly") {
+    } elseif $match(pathStart,"git-command|git|dirname|hostname|viewonly|discarded-states") {
         if (%request.Method = "GET") {
             set %data = ##class(%Stream.TmpCharacter).%New()
             // Things not handled from Python backend:
@@ -76,6 +76,10 @@ ClassMethod HandleRequest(pagePath As %String, InternalName As %String = "", Out
             } elseif (pathStart = "dirname") {
                 do %data.Write(##class(SourceControl.Git.Utils).TempFolder())
                 set handled = 1
+            } elseif (pathStart = "discarded-states") {
+                set discardsInBranch = ##class(SourceControl.Git.DiscardState).DiscardStatesInBranch()
+                do %data.Write(discardsInBranch.%ToJSON())
+                set handled = 1
             }
         } elseif (%request.Method = "POST") {
             // Things not handled from Python backend:
@@ -163,6 +167,22 @@ ClassMethod HandleRequest(pagePath As %String, InternalName As %String = "", Out
                 set requestBody = ##class(%Library.DynamicObject).%FromJSON(%request.Content)
                 set command = requestBody.command
 
+                set gitCmd = command.%Get(0)
+
+                if gitCmd = "restore" {
+                    set iter = command.%GetIterator()
+                    set isFile = 0
+                    while iter.%GetNext(,.value) {
+                        if isFile {
+                            set internalName = ##class(SourceControl.Git.Utils).NameToInternalName(value)
+                            do ##class(SourceControl.Git.DiscardState).SaveDiscardState(internalName)
+                        }
+                        if value = "--"{
+                            set isFile = 1
+                        }
+                    }
+                }
+
                 set argsArr = ""
                 set argsArr($increment(argsArr)) = "color.ui=true"
                 set iterator = command.%GetIterator()
diff --git a/git-webui/release/share/git-webui/webui/css/git-webui.css b/git-webui/release/share/git-webui/webui/css/git-webui.css
index aeb3a5b0..75763cfc 100644
--- a/git-webui/release/share/git-webui/webui/css/git-webui.css
+++ b/git-webui/release/share/git-webui/webui/css/git-webui.css
@@ -205,6 +205,9 @@ body {
 #sidebar #sidebar-content #sidebar-stash h4:before {
   content: url(../img/inboxes.svg);
 }
+#sidebar #sidebar-content #sidebarDiscarded h4:before {
+  content: url(../img/discarded.svg);
+}
 #sidebar #sidebar-content #sidebar-remote h4:before {
   content: url(../img/daemon.svg);
 }
diff --git a/git-webui/release/share/git-webui/webui/img/discarded.svg b/git-webui/release/share/git-webui/webui/img/discarded.svg
new file mode 100644
index 00000000..8c927a6b
--- /dev/null
+++ b/git-webui/release/share/git-webui/webui/img/discarded.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="20px" viewBox="0 -960 960 960" width="20px" fill="#eee"><path d="m366-589 86-144-43-72q-14-23-41.5-23T326-805l-84 141 124 75Zm380 253-87-144 125-72 65 107q10 16 10.5 34t-7.5 35q-9 19-26.5 29.5T787-336h-41ZM624-74 480-218l144-144v74h184l-52 104q-10 18-27.5 29T691-144h-67v70Zm-362-70q-17 0-32-9t-23-25q-7-14-6-29t9-29l31-52h167v144H262Zm-95-115-59-117q-8-17-7-35t10-34l20-34-62-37 198-49 49 198-62-37-87 145Zm518-319-198-50 62-37-119-199h127q19 0 35 9.5t26 25.5l54 90 62-37-49 198Z"/></svg>
\ No newline at end of file
diff --git a/git-webui/release/share/git-webui/webui/js/git-webui.js b/git-webui/release/share/git-webui/webui/js/git-webui.js
index e3a0ad90..b22c2d65 100644
--- a/git-webui/release/share/git-webui/webui/js/git-webui.js
+++ b/git-webui/release/share/git-webui/webui/js/git-webui.js
@@ -866,6 +866,9 @@ webui.SideBarView = function(mainView, noEventHandlers) {
                                 '<section id="sidebar-stash">' +
                                     '<h4>Stash</h4>' +
                                 '</section>' +
+                                '<section id="sidebarDiscarded">' +
+                                    '<h4>Discarded Files</h4>' +
+                                '</section>' +
                                 '<section id="sidebar-local-branches">' +
                                     '<h4 class="mt-3">Local Branches' +
                                     '<button type="button" class="btn btn-default btn-sidebar-icon btn-add shadow-none" >' +
@@ -904,6 +907,13 @@ webui.SideBarView = function(mainView, noEventHandlers) {
             self.mainView.stashView.update(0);
         });
 
+        var discardedElement = $("#sidebarDiscarded", self.element);
+        discardedElement.click(function() {
+            $("*", self.element).removeClass("active");
+            discardedElement.addClass("active");
+            self.mainView.discardedView.show();
+        });
+
         $(".btn-add", self.element).click(self.createNewLocalBranch);
         $('.btn-prune-remote-branches', self.element).click(self.pruneRemoteBranches);
         $("#sidebar-settings", self.element).click(self.goToSettingsPage);
@@ -1823,6 +1833,28 @@ webui.DiffView = function(sideBySide, hunkSelectionAllowed, parent, stashedCommi
     var gitApplyType = "stage";
 };
 
+webui.DiscardedView = function(mainView) {
+    var self = this;
+
+    self.show = function() {
+        self.update();
+        mainView.switchTo(self.element);
+    };
+
+    self.getDiscardedStates = function() {
+        $.get("discarded-states", function(discarded) {
+            console.log(discarded);
+        });
+    }
+
+    self.update = function() {
+        self.getDiscardedStates();
+    }
+
+    self.element = $('<div id="discardedView"></div>')[0];
+
+}
+
 /*
  * == TreeView ================================================================
  */
@@ -2366,7 +2398,7 @@ webui.NewChangedFilesView = function(workspaceView) {
                     if (selectedItemsFromOtherUser.length > 0) {
                         self.confirmActionOnOtherUsersChanges("discard");
                     } else {
-                        self.discard();
+                        self.confirmDiscard();
                     }
                 });
 
@@ -2383,6 +2415,59 @@ webui.NewChangedFilesView = function(workspaceView) {
         });
     }
 
+    self.confirmDiscard = function() {
+        function removePopup(popup) {
+            $(popup).children(".modal-fade").modal("hide");
+            $(".modal-backdrop").remove();
+            $("#confirmDiscard").remove();
+        }
+
+        var popup = $(
+            '<div class="modal fade" tabindex="-1" id="confirmDiscard" role="dialog" data-backdrop="static">' +
+                '<div class="modal-dialog modal-md" role="document">' +
+                    '<div class="modal-content">' + 
+                        '<div class="modal-header">' +
+                            '<h5 class="modal-title">Confirm Discard</h5>' +
+                            '<button type="button" class="btn btn-default close" data-dismiss="modal">' + webui.largeXIcon + '</button>' +
+                        '</div>' +
+                        '<div class="modal-body">' + 
+                            '<div class="row">' +
+                                '<div class="col-sm-1">' +
+                                    webui.warningIcon +
+                                '</div>' +
+                                '<div class="col-sm-11">' +
+                                    '<p>Careful, discarding changes will delete all changes made to your file since the last commit. This will mean deleting a newly created file.</p>' + // Removed extra closing </p> tag
+                                '</div>' +
+                            '</div>' +
+                        '</div>' +
+                        '<div class="modal-footer"></div>' +
+                    '</div>' + 
+                '</div>' +
+            '</div>'
+        )[0];
+
+        $("body").append(popup);
+
+        var popupFooter = $(".modal-footer", popup)[0];
+        webui.detachChildren(popupFooter);
+
+        $(
+            '<button class="btn btn-sm btn-warning action-btn" id="confirmDiscardBtn">Confirm discard</button>' +
+            '<button class="btn btn-sm btn-secondary action-btn" id="cancelDiscardBtn">Cancel</button>'
+        ).appendTo(popupFooter);
+
+        $(popup).modal('show');
+
+        $("#confirmDiscardBtn").on('click', function() {
+            removePopup(popup);
+            self.discard();
+        });
+
+        $("#confirmDiscard").find(".close, #cancelDiscardBtn").click(function() {
+            removePopup(popup);
+        })
+    }
+
     self.confirmAmend = function() {
         function removePopup(popup) {
             $(popup).children(".modal-fade").modal("hide");
@@ -2395,7 +2480,7 @@ webui.NewChangedFilesView = function(workspaceView) {
                 '<div class="modal-dialog modal-md" role="document">' +
                     '<div class="modal-content">' + 
                         '<div class="modal-header">' +
-                            '<h5 class="modal-title">Confirm amend</h5>' +
+                            '<h5 class="modal-title">Confirm Amend</h5>' +
                             '<button type="button" class="btn btn-default close" data-dismiss="modal">' + webui.largeXIcon + '</button>' +
                         '</div>' +
                         '<div class="modal-body"></div>' +
@@ -2482,6 +2567,11 @@ webui.NewChangedFilesView = function(workspaceView) {
                 $(  '<div>' +
                         '<p>Careful, amending commits will rewrite the branch history. The amended commit will not be pushed to remote, even if the previous commit was.</p>' +
                     '</div>').appendTo(popupContent);
+            } else if (action == "discard") {
+                $(  
+                '<div>' +
+                    '<p>Careful, discarding changes will delete all changes made to your file since the last commit. This will mean deleting a newly created file.</p>' +
+                '</div>').appendTo(popupContent);
             }
     
             var popupFooter = $(".modal-footer", popup)[0];
@@ -2624,9 +2714,8 @@ webui.NewChangedFilesView = function(workspaceView) {
     }
 
     self.discard = function() {
-        var selectedFilesAsString = selectedItems.join(" ");
-        webui.git("add -- " + selectedFilesAsString, function() {
-            webui.git("restore --staged --worktree -- " + selectedFilesAsString, function() {
+        webui.git_command(["add", "--"].concat(selectedItems), function() {
+            webui.git_command(["restore", "--staged", "--worktree", "--"].concat(selectedItems), function() {
                 workspaceView.update();
             });
         });
@@ -2733,6 +2822,7 @@ function MainUi() {
                 if (!webui.viewonly) {
                     self.workspaceView = new webui.WorkspaceView(self);
                     self.stashView = new webui.StashView(self);
+                    self.discardedView = new webui.DiscardedView(self);
                 }
                 self.sideBarView.selectRef("HEAD");
             });
diff --git a/git-webui/src/share/git-webui/webui/css/git-webui.less b/git-webui/src/share/git-webui/webui/css/git-webui.less
index 62700a43..417314ec 100644
--- a/git-webui/src/share/git-webui/webui/css/git-webui.less
+++ b/git-webui/src/share/git-webui/webui/css/git-webui.less
@@ -287,6 +287,10 @@ body {
             content: url(../img/inboxes.svg);
         }
 
+        #sidebarDiscarded h4:before {
+            content: url(../img/discarded.svg);
+        }
+
         #sidebar-remote h4:before {
             content: url(../img/daemon.svg);
         }
diff --git a/git-webui/src/share/git-webui/webui/img/discarded.svg b/git-webui/src/share/git-webui/webui/img/discarded.svg
new file mode 100644
index 00000000..8c927a6b
--- /dev/null
+++ b/git-webui/src/share/git-webui/webui/img/discarded.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="20px" viewBox="0 -960 960 960" width="20px" fill="#eee"><path d="m366-589 86-144-43-72q-14-23-41.5-23T326-805l-84 141 124 75Zm380 253-87-144 125-72 65 107q10 16 10.5 34t-7.5 35q-9 19-26.5 29.5T787-336h-41ZM624-74 480-218l144-144v74h184l-52 104q-10 18-27.5 29T691-144h-67v70Zm-362-70q-17 0-32-9t-23-25q-7-14-6-29t9-29l31-52h167v144H262Zm-95-115-59-117q-8-17-7-35t10-34l20-34-62-37 198-49 49 198-62-37-87 145Zm518-319-198-50 62-37-119-199h127q19 0 35 9.5t26 25.5l54 90 62-37-49 198Z"/></svg>
\ No newline at end of file
diff --git a/git-webui/src/share/git-webui/webui/js/git-webui.js b/git-webui/src/share/git-webui/webui/js/git-webui.js
index e3a0ad90..b22c2d65 100644
--- a/git-webui/src/share/git-webui/webui/js/git-webui.js
+++ b/git-webui/src/share/git-webui/webui/js/git-webui.js
@@ -866,6 +866,9 @@ webui.SideBarView = function(mainView, noEventHandlers) {
                                 '<section id="sidebar-stash">' +
                                     '<h4>Stash</h4>' +
                                 '</section>' +
+                                '<section id="sidebarDiscarded">' +
+                                    '<h4>Discarded Files</h4>' +
+                                '</section>' +
                                 '<section id="sidebar-local-branches">' +
                                     '<h4 class="mt-3">Local Branches' +
                                     '<button type="button" class="btn btn-default btn-sidebar-icon btn-add shadow-none" >' +
@@ -904,6 +907,13 @@ webui.SideBarView = function(mainView, noEventHandlers) {
             self.mainView.stashView.update(0);
         });
 
+        var discardedElement = $("#sidebarDiscarded", self.element);
+        discardedElement.click(function() {
+            $("*", self.element).removeClass("active");
+            discardedElement.addClass("active");
+            self.mainView.discardedView.show();
+        });
+
         $(".btn-add", self.element).click(self.createNewLocalBranch);
         $('.btn-prune-remote-branches', self.element).click(self.pruneRemoteBranches);
         $("#sidebar-settings", self.element).click(self.goToSettingsPage);
@@ -1823,6 +1833,28 @@ webui.DiffView = function(sideBySide, hunkSelectionAllowed, parent, stashedCommi
     var gitApplyType = "stage";
 };
 
+webui.DiscardedView = function(mainView) {
+    var self = this;
+
+    self.show = function() {
+        self.update();
+        mainView.switchTo(self.element);
+    };
+
+    self.getDiscardedStates = function() {
+        $.get("discarded-states", function(discarded) {
+            console.log(discarded);
+        });
+    }
+
+    self.update = function() {
+        self.getDiscardedStates();
+    }
+
+    self.element = $('<div id="discardedView"></div>')[0];
+
+}
+
 /*
  * == TreeView ================================================================
  */
@@ -2366,7 +2398,7 @@ webui.NewChangedFilesView = function(workspaceView) {
                     if (selectedItemsFromOtherUser.length > 0) {
                         self.confirmActionOnOtherUsersChanges("discard");
                     } else {
-                        self.discard();
+                        self.confirmDiscard();
                     }
                 });
 
@@ -2383,6 +2415,59 @@ webui.NewChangedFilesView = function(workspaceView) {
         });
     }
 
+    self.confirmDiscard = function() {
+        function removePopup(popup) {
+            $(popup).children(".modal-fade").modal("hide");
+            $(".modal-backdrop").remove();
+            $("#confirmDiscard").remove();
+        }
+
+        var popup = $(
+            '<div class="modal fade" tabindex="-1" id="confirmDiscard" role="dialog" data-backdrop="static">' +
+                '<div class="modal-dialog modal-md" role="document">' +
+                    '<div class="modal-content">' + 
+                        '<div class="modal-header">' +
+                            '<h5 class="modal-title">Confirm Discard</h5>' +
+                            '<button type="button" class="btn btn-default close" data-dismiss="modal">' + webui.largeXIcon + '</button>' +
+                        '</div>' +
+                        '<div class="modal-body">' + 
+                            '<div class="row">' +
+                                '<div class="col-sm-1">' +
+                                    webui.warningIcon +
+                                '</div>' +
+                                '<div class="col-sm-11">' +
+                                    '<p>Careful, discarding changes will delete all changes made to your file since the last commit. This will mean deleting a newly created file.</p>' + // Removed extra closing </p> tag
+                                '</div>' +
+                            '</div>' +
+                        '</div>' +
+                        '<div class="modal-footer"></div>' +
+                    '</div>' + 
+                '</div>' +
+            '</div>'
+        )[0];
+
+        $("body").append(popup);
+
+        var popupFooter = $(".modal-footer", popup)[0];
+        webui.detachChildren(popupFooter);
+
+        $(
+            '<button class="btn btn-sm btn-warning action-btn" id="confirmDiscardBtn">Confirm discard</button>' +
+            '<button class="btn btn-sm btn-secondary action-btn" id="cancelDiscardBtn">Cancel</button>'
+        ).appendTo(popupFooter);
+
+        $(popup).modal('show');
+
+        $("#confirmDiscardBtn").on('click', function() {
+            removePopup(popup);
+            self.discard();
+        });
+
+        $("#confirmDiscard").find(".close, #cancelDiscardBtn").click(function() {
+            removePopup(popup);
+        })
+    }
+
     self.confirmAmend = function() {
         function removePopup(popup) {
             $(popup).children(".modal-fade").modal("hide");
@@ -2395,7 +2480,7 @@ webui.NewChangedFilesView = function(workspaceView) {
                 '<div class="modal-dialog modal-md" role="document">' +
                     '<div class="modal-content">' + 
                         '<div class="modal-header">' +
-                            '<h5 class="modal-title">Confirm amend</h5>' +
+                            '<h5 class="modal-title">Confirm Amend</h5>' +
                             '<button type="button" class="btn btn-default close" data-dismiss="modal">' + webui.largeXIcon + '</button>' +
                         '</div>' +
                         '<div class="modal-body"></div>' +
@@ -2482,6 +2567,11 @@ webui.NewChangedFilesView = function(workspaceView) {
                 $(  '<div>' +
                         '<p>Careful, amending commits will rewrite the branch history. The amended commit will not be pushed to remote, even if the previous commit was.</p>' +
                     '</div>').appendTo(popupContent);
+            } else if (action == "discard") {
+                $(  
+                '<div>' +
+                    '<p>Careful, discarding changes will delete all changes made to your file since the last commit. This will mean deleting a newly created file.</p>' +
+                '</div>').appendTo(popupContent);
             }
     
             var popupFooter = $(".modal-footer", popup)[0];
@@ -2624,9 +2714,8 @@ webui.NewChangedFilesView = function(workspaceView) {
     }
 
     self.discard = function() {
-        var selectedFilesAsString = selectedItems.join(" ");
-        webui.git("add -- " + selectedFilesAsString, function() {
-            webui.git("restore --staged --worktree -- " + selectedFilesAsString, function() {
+        webui.git_command(["add", "--"].concat(selectedItems), function() {
+            webui.git_command(["restore", "--staged", "--worktree", "--"].concat(selectedItems), function() {
                 workspaceView.update();
             });
         });
@@ -2733,6 +2822,7 @@ function MainUi() {
                 if (!webui.viewonly) {
                     self.workspaceView = new webui.WorkspaceView(self);
                     self.stashView = new webui.StashView(self);
+                    self.discardedView = new webui.DiscardedView(self);
                 }
                 self.sideBarView.selectRef("HEAD");
             });

From b0ff14308d243d2e73cc753521195c5a657124d5 Mon Sep 17 00:00:00 2001
From: isc-hwojnick <hwojnick@intersystems.com>
Date: Mon, 12 Aug 2024 14:41:24 -0400
Subject: [PATCH 02/18] feat: discard safeguard finished

---
 cls/SourceControl/Git/Change.cls              |  1 +
 cls/SourceControl/Git/DiscardState.cls        |  2 +
 cls/SourceControl/Git/Utils.cls               |  1 +
 cls/SourceControl/Git/WebUIDriver.cls         | 19 +++-
 .../share/git-webui/webui/css/git-webui.css   | 49 ++++++++++
 .../share/git-webui/webui/js/git-webui.js     | 93 ++++++++++++++++++-
 .../share/git-webui/webui/css/git-webui.less  | 62 +++++++++++++
 .../src/share/git-webui/webui/js/git-webui.js | 93 ++++++++++++++++++-
 8 files changed, 309 insertions(+), 11 deletions(-)

diff --git a/cls/SourceControl/Git/Change.cls b/cls/SourceControl/Git/Change.cls
index 7b137c65..905531c9 100644
--- a/cls/SourceControl/Git/Change.cls
+++ b/cls/SourceControl/Git/Change.cls
@@ -66,6 +66,7 @@ ClassMethod AddDeletedToUncommitted(Filename, InternalName) As %Status
     Quit ..SetUncommitted(Filename, "delete", InternalName, $USERNAME, "", 1, "", "", 0)
 }
 
+/// The Filename here is an ExternalName formatted name with the full file path
 ClassMethod IsUncommitted(Filename, ByRef ID) As %Boolean
 {
     &SQL(SELECT ID INTO :ID FROM SourceControl_Git.Change WHERE ItemFile = :Filename AND Committed = '0')
diff --git a/cls/SourceControl/Git/DiscardState.cls b/cls/SourceControl/Git/DiscardState.cls
index 8728f7d9..b016c0ec 100644
--- a/cls/SourceControl/Git/DiscardState.cls
+++ b/cls/SourceControl/Git/DiscardState.cls
@@ -20,6 +20,7 @@ Method RestoreToFileTree()
         do fileStream.CopyFrom(..Contents)
         $$$ThrowOnError(fileStream.%Save())
         do ##class(SourceControl.Git.Utils).ImportItem(..InternalName, 1, 1)
+        do ##class(SourceControl.Git.Utils).AddToServerSideSourceControl(..InternalName)
         $$$ThrowOnError(..%DeleteId(..%Id()))
 }
 
@@ -53,6 +54,7 @@ ClassMethod DiscardStatesInBranch() As %DynamicArray
         set discardState = ..%OpenId(resultSet.ID)
         do discardState.%JSONExportToString(.JSONStr)
         set discardStateObject = ##class(%DynamicAbstractObject).%FromJSON(JSONStr)
+        set discardStateObject.Id = resultSet.ID
         do discardStates.%Push(discardStateObject)
     }
 
diff --git a/cls/SourceControl/Git/Utils.cls b/cls/SourceControl/Git/Utils.cls
index 4e55ff2f..8be198df 100644
--- a/cls/SourceControl/Git/Utils.cls
+++ b/cls/SourceControl/Git/Utils.cls
@@ -1917,6 +1917,7 @@ ClassMethod SyncIrisWithRepoThroughDiff(ByRef files, ByRef filterToFiles, invert
     set addedFiles = $extract(addedFiles, 2, *)
     
     if (deletedFiles '= ""){
+        set ^mtempdeletedFiles($i(^mtempdeletedFiles)) = deletedFiles 
         set sc = ##class(SourceControl.Git.Utils).RemoveFromServerSideSourceControl(deletedFiles)
     }
     if (addedFiles '= ""){
diff --git a/cls/SourceControl/Git/WebUIDriver.cls b/cls/SourceControl/Git/WebUIDriver.cls
index 203d9d0a..ed97f4ce 100644
--- a/cls/SourceControl/Git/WebUIDriver.cls
+++ b/cls/SourceControl/Git/WebUIDriver.cls
@@ -27,7 +27,7 @@ ClassMethod HandleRequest(pagePath As %String, InternalName As %String = "", Out
         if $isobject($get(responseJSON)) {
             do responseJSON.%ToJSON(%data)
         }
-    } elseif $match(pathStart,"git-command|git|dirname|hostname|viewonly|discarded-states") {
+    } elseif $match(pathStart,"git-command|git|dirname|hostname|viewonly|discarded-states|restore-discarded") {
         if (%request.Method = "GET") {
             set %data = ##class(%Stream.TmpCharacter).%New()
             // Things not handled from Python backend:
@@ -213,6 +213,23 @@ ClassMethod HandleRequest(pagePath As %String, InternalName As %String = "", Out
                 do %data.Write("Git-Return-Code: " _ returnCode) // No ending newline expected
                 do %data.Rewind()
                 set handled = 1
+            } elseif (pathStart = "restore-discarded") {
+                merge data = %request.Data 
+                set fileId = data("file",1)
+                
+                set %data = ##class(%Stream.TmpCharacter).%New()
+
+                set discardState = ##class(SourceControl.Git.DiscardState).%OpenId(fileId)
+                if ##class(SourceControl.Git.Change).IsUncommitted(discardState.FullExternalName) {
+                    do %data.WriteLine("Please commit changes to file before restoring discarded state")
+                } else {
+                    do discardState.RestoreToFileTree()
+                    do %data.WriteLine("Successfully restored discarded file state")
+                }
+
+                do %data.Rewind()
+                do ##class(SourceControl.Git.Change).RefreshUncommitted(,,,1)
+                set handled = 1  
             }
         }
     }
diff --git a/git-webui/release/share/git-webui/webui/css/git-webui.css b/git-webui/release/share/git-webui/webui/css/git-webui.css
index 75763cfc..95d21762 100644
--- a/git-webui/release/share/git-webui/webui/css/git-webui.css
+++ b/git-webui/release/share/git-webui/webui/css/git-webui.css
@@ -936,3 +936,52 @@ body {
   -webkit-flex: 1 1 0px;
   overflow: auto;
 }
+#discardedView {
+  width: 100%;
+}
+#discardedView #discardedList {
+  height: 100%;
+  border-right: 1px #dddddd solid;
+}
+#discardedView #discardedList h4 {
+  text-align: center;
+  padding-top: 100px;
+}
+#discardedView .active {
+  background-color: rgba(13, 110, 253, 0.9) !important;
+  color: #fff;
+}
+#discardedView header {
+  display: flex;
+  display: -webkit-flex;
+  min-height: 0;
+  min-width: 0;
+}
+#discardedView header .file-internalname {
+  display: inline-block;
+}
+#discardedView header .discard-date {
+  margin-left: auto;
+}
+#discardedView .external-name {
+  font-size: 1rem;
+  padding: 20px 15px 0 0;
+}
+#discardedView .contents-menu {
+  display: flex;
+  display: -webkit-flex;
+  min-height: 0;
+  min-width: 0;
+}
+#discardedView .contents-menu .restore-discarded {
+  padding-top: 15px;
+  margin-left: auto;
+  margin-right: 15px;
+}
+#discardedView .has-items {
+  padding-bottom: 20px;
+  border-bottom: 1px solid lightgrey;
+}
+#discardedView .file-contents {
+  padding-top: 20px;
+}
diff --git a/git-webui/release/share/git-webui/webui/js/git-webui.js b/git-webui/release/share/git-webui/webui/js/git-webui.js
index b22c2d65..c4ea54ad 100644
--- a/git-webui/release/share/git-webui/webui/js/git-webui.js
+++ b/git-webui/release/share/git-webui/webui/js/git-webui.js
@@ -1841,17 +1841,100 @@ webui.DiscardedView = function(mainView) {
         mainView.switchTo(self.element);
     };
 
-    self.getDiscardedStates = function() {
+
+    self.update = function() {
+        self.discarded = [];
+        discardedList.innerHTML = '';
+        $('.file-contents').html('');
+        $('.contents-menu').removeClass("has-items");
+        $('.external-name').text('');
+        $('.restore-discarded').html('');
+
+        // TODO: Empty the discarded list properly
         $.get("discarded-states", function(discarded) {
-            console.log(discarded);
+            self.discarded = JSON.parse(discarded);
+            if (self.discarded.length == 0) {
+                discardedList.innerHTML = '<h4>You have no saved discarded states</h4>';
+            }
+            
+            self.populateUiWithDiscardedStates();
         });
+
+        
     }
 
-    self.update = function() {
-        self.getDiscardedStates();
+        
+
+    self.populateUiWithDiscardedStates = function() {
+        self.discarded.forEach((discardedState, ind) => {
+            var discardedListEntry = $(
+                '<a class="log-entry list-group-item">' + 
+                    '<header>' + 
+                        '<h6 class="file-internalname">' + discardedState.InternalName + '</h6>' + 
+                        '<span class="discard-date">' + self.formatTimestamp(discardedState.Timestamp) + '</span>' +
+                    '</header>' +
+                    '<span> Branch: ' + discardedState.Branch + ' </span> <br>' +
+                    '<span> User: '+ discardedState.Username + '</span>' +
+
+                '</a>'
+            );
+            
+            discardedListEntry.on("click", function() {
+                $('.log-entry.list-group-item').removeClass('active');
+                $(this).addClass('active');
+
+                $('.contents-menu').addClass("has-items");
+                $('.external-name').text(self.discarded[ind].FullExternalName);
+                
+                var btn = $('<button class="btn btn-sm btn-primary restore-discarded-btn">Restore</button>')[0];
+                var discardElement = $('.restore-discarded')[0];
+                discardElement.innerHTML = '';
+                discardElement.appendChild(btn);
+
+                $('.restore-discarded-btn').off("click").on("click", function() {
+                    $.post("restore-discarded", {file: discardedState.Id}, function(message) {
+                        if (message.trim() == "Please commit changes to file before restoring discarded state") {
+                            webui.showError(message);
+                        } else {
+                            webui.showSuccess(message);
+                        }
+                        
+                        self.update();
+                    });
+                });
+
+                $('.file-contents').html('<pre>' + discardedState.Contents + '</pre>');
+            });
+
+            
+            discardedListEntry.prependTo(discardedList)[0];
+        });
     }
+    /// This function takes in an IRIS timestamp format makes it use the "date, time" format
+    self.formatTimestamp = function(timestamp) {
+        var timestampArr = timestamp.split("T");
+        return timestampArr[0] + ', ' + timestampArr[1].slice(0, -1);
+    }
+
+    self.element = $(
+        '<div class="row" id="discardedView">' +
+            '<div class="col-sm-7">' +
+                '<div id="discardedList"></div>' +
+            '</div>' +
+            '<div class="col-sm-5">' +
+                '<div class="contents-menu">' +
+                    '<div class="nav-item external-name"></div>' +
+                    '<div class="nav-item restore-discarded"></div>' +
+                '</div>' +
+                '<div class="container file-contents">' +
 
-    self.element = $('<div id="discardedView"></div>')[0];
+                '</div>' +
+            '</div>' +
+        '</div>'
+        
+    )[0];
+    self.discarded = [];
+    var discardedList = $("#discardedList", self.element)[0];
 
 }
 
diff --git a/git-webui/src/share/git-webui/webui/css/git-webui.less b/git-webui/src/share/git-webui/webui/css/git-webui.less
index 417314ec..09e309dc 100644
--- a/git-webui/src/share/git-webui/webui/css/git-webui.less
+++ b/git-webui/src/share/git-webui/webui/css/git-webui.less
@@ -942,3 +942,65 @@ body {
         }
     }
 }
+
+#discardedView {
+    width: 100%;
+
+    #discardedList {
+        height: 100%;
+        border-right: 1px @separator-line solid;
+
+        h4{
+            text-align: center;
+            padding-top: 100px;
+        }
+    }
+
+
+    .active {
+        background-color: rgba(13, 110, 253, 0.9) !important;
+        color: #fff;
+    }
+
+    header {
+        .display-flex();
+        .file-internalname {
+            display: inline-block;
+        }
+
+        .discard-date {
+            margin-left: auto;
+        }
+    }
+
+    .external-name {
+        font-size: 1rem;
+        padding: 20px 15px 0 0;
+    }
+
+    
+
+    .contents-menu {
+        .display-flex();
+
+        .restore-discarded {
+            padding-top: 15px;
+            margin-left: auto;
+            margin-right: 15px;
+        }
+
+        
+       
+    }
+
+    .has-items {
+        padding-bottom: 20px;
+        border-bottom: 1px solid lightgrey;
+    }
+
+    .file-contents {
+        padding-top: 20px;
+    }
+
+    
+}
diff --git a/git-webui/src/share/git-webui/webui/js/git-webui.js b/git-webui/src/share/git-webui/webui/js/git-webui.js
index b22c2d65..c4ea54ad 100644
--- a/git-webui/src/share/git-webui/webui/js/git-webui.js
+++ b/git-webui/src/share/git-webui/webui/js/git-webui.js
@@ -1841,17 +1841,100 @@ webui.DiscardedView = function(mainView) {
         mainView.switchTo(self.element);
     };
 
-    self.getDiscardedStates = function() {
+
+    self.update = function() {
+        self.discarded = [];
+        discardedList.innerHTML = '';
+        $('.file-contents').html('');
+        $('.contents-menu').removeClass("has-items");
+        $('.external-name').text('');
+        $('.restore-discarded').html('');
+
+        // TODO: Empty the discarded list properly
         $.get("discarded-states", function(discarded) {
-            console.log(discarded);
+            self.discarded = JSON.parse(discarded);
+            if (self.discarded.length == 0) {
+                discardedList.innerHTML = '<h4>You have no saved discarded states</h4>';
+            }
+            
+            self.populateUiWithDiscardedStates();
         });
+
+        
     }
 
-    self.update = function() {
-        self.getDiscardedStates();
+        
+
+    self.populateUiWithDiscardedStates = function() {
+        self.discarded.forEach((discardedState, ind) => {
+            var discardedListEntry = $(
+                '<a class="log-entry list-group-item">' + 
+                    '<header>' + 
+                        '<h6 class="file-internalname">' + discardedState.InternalName + '</h6>' + 
+                        '<span class="discard-date">' + self.formatTimestamp(discardedState.Timestamp) + '</span>' +
+                    '</header>' +
+                    '<span> Branch: ' + discardedState.Branch + ' </span> <br>' +
+                    '<span> User: '+ discardedState.Username + '</span>' +
+
+                '</a>'
+            );
+            
+            discardedListEntry.on("click", function() {
+                $('.log-entry.list-group-item').removeClass('active');
+                $(this).addClass('active');
+
+                $('.contents-menu').addClass("has-items");
+                $('.external-name').text(self.discarded[ind].FullExternalName);
+                
+                var btn = $('<button class="btn btn-sm btn-primary restore-discarded-btn">Restore</button>')[0];
+                var discardElement = $('.restore-discarded')[0];
+                discardElement.innerHTML = '';
+                discardElement.appendChild(btn);
+
+                $('.restore-discarded-btn').off("click").on("click", function() {
+                    $.post("restore-discarded", {file: discardedState.Id}, function(message) {
+                        if (message.trim() == "Please commit changes to file before restoring discarded state") {
+                            webui.showError(message);
+                        } else {
+                            webui.showSuccess(message);
+                        }
+                        
+                        self.update();
+                    });
+                });
+
+                $('.file-contents').html('<pre>' + discardedState.Contents + '</pre>');
+            });
+
+            
+            discardedListEntry.prependTo(discardedList)[0];
+        });
     }
+    /// This function takes in an IRIS timestamp format makes it use the "date, time" format
+    self.formatTimestamp = function(timestamp) {
+        var timestampArr = timestamp.split("T");
+        return timestampArr[0] + ', ' + timestampArr[1].slice(0, -1);
+    }
+
+    self.element = $(
+        '<div class="row" id="discardedView">' +
+            '<div class="col-sm-7">' +
+                '<div id="discardedList"></div>' +
+            '</div>' +
+            '<div class="col-sm-5">' +
+                '<div class="contents-menu">' +
+                    '<div class="nav-item external-name"></div>' +
+                    '<div class="nav-item restore-discarded"></div>' +
+                '</div>' +
+                '<div class="container file-contents">' +
 
-    self.element = $('<div id="discardedView"></div>')[0];
+                '</div>' +
+            '</div>' +
+        '</div>'
+        
+    )[0];
+    self.discarded = [];
+    var discardedList = $("#discardedList", self.element)[0];
 
 }
 

From 97a5233df666748721152d25c82e241bafd86bf4 Mon Sep 17 00:00:00 2001
From: isc-hwojnick <hwojnick@intersystems.com>
Date: Mon, 12 Aug 2024 15:32:11 -0400
Subject: [PATCH 03/18] docs: update changelog

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d5fb31f4..e580a4ae 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.5.0] - Unreleased
+
+### Added
+- Discards safeguarded by discard stash and warning modal (#455)
+
 ## [2.4.1] - 2024-08-02
 
 ### Added

From fb94fd1091050c978827d5636e5c44b39e17a5cc Mon Sep 17 00:00:00 2001
From: Elijah Tamarchenko <etamarch@intersystems.com>
Date: Tue, 24 Sep 2024 16:51:15 -0400
Subject: [PATCH 04/18] Fix discarding external files (not in IRIS)

---
 cls/SourceControl/Git/DiscardState.cls        | 35 +++++++++++++++----
 cls/SourceControl/Git/Utils.cls               |  2 --
 cls/SourceControl/Git/WebUIDriver.cls         |  3 +-
 .../share/git-webui/webui/img/context.svg     |  2 +-
 .../share/git-webui/webui/js/git-webui.js     |  2 +-
 .../src/share/git-webui/webui/js/git-webui.js |  2 +-
 6 files changed, 32 insertions(+), 14 deletions(-)

diff --git a/cls/SourceControl/Git/DiscardState.cls b/cls/SourceControl/Git/DiscardState.cls
index b016c0ec..e456b5f3 100644
--- a/cls/SourceControl/Git/DiscardState.cls
+++ b/cls/SourceControl/Git/DiscardState.cls
@@ -3,7 +3,7 @@ Class SourceControl.Git.DiscardState Extends (%Persistent, %JSON.Adaptor)
 
 Property FullExternalName As %String(MAXLEN = "") [ Required ];
 
-Property InternalName As %String [ Required ];
+Property Name As %String [ Required ];
 
 Property Contents As %Stream.GlobalCharacter(LOCATION = "^DiscardStateContents");
 
@@ -13,25 +13,41 @@ Property Branch As %String [ Required ];
 
 Property Timestamp As %TimeStamp [ Required ];
 
+Property ExternalFile As %Boolean [ Required ];
+
 Method RestoreToFileTree()
 {
         set fileStream = ##class(%Stream.FileCharacter).%OpenId(..FullExternalName,,.sc)
         $$$ThrowOnError(sc)
         do fileStream.CopyFrom(..Contents)
         $$$ThrowOnError(fileStream.%Save())
-        do ##class(SourceControl.Git.Utils).ImportItem(..InternalName, 1, 1)
-        do ##class(SourceControl.Git.Utils).AddToServerSideSourceControl(..InternalName)
+        if '..ExternalFile {
+            do ##class(SourceControl.Git.Utils).ImportItem(..Name, 1, 1)
+            do ##class(SourceControl.Git.Utils).AddToServerSideSourceControl(..Name)
+        }
+
         $$$ThrowOnError(..%DeleteId(..%Id()))
 }
 
-ClassMethod SaveDiscardState(InternalName As %String) As %Status
+ClassMethod SaveDiscardState(InternalName As %String, name As %String) As %Status
 {
         set discardState = ..%New()
-        set discardState.FullExternalName = ##class(SourceControl.Git.Utils).FullExternalName(InternalName)
-        set discardState.InternalName = InternalName
+
+        // If not an IRIS file
+        if (InternalName = "") {
+            set externalName = ##class(%File).Construct($Get(^SYS("SourceControl","Git","settings","namespaceTemp")),name)
+            set discardState.FullExternalName = externalName
+            set discardState.Name = name
+            set discardState.ExternalFile = 1
+        } else {
+            set discardState.FullExternalName = ##class(SourceControl.Git.Utils).FullExternalName(InternalName)
+            set discardState.Name = InternalName
+            set discardState.ExternalFile = 0
+        }
 
         set fileStream = ##class(%Stream.FileCharacter).%New()
         set fileStream.Filename = discardState.FullExternalName
+            
         do fileStream.%Open()
         do discardState.Contents.CopyFrom(fileStream)
         do fileStream.%Close()
@@ -85,6 +101,12 @@ Storage Default
 <Value name="7">
 <Value>Timestamp</Value>
 </Value>
+<Value name="8">
+<Value>Name</Value>
+</Value>
+<Value name="9">
+<Value>ExternalFile</Value>
+</Value>
 </Data>
 <DataLocation>^SourceControl22B9.DiscardStateD</DataLocation>
 <DefaultData>DiscardStateDefaultData</DefaultData>
@@ -95,4 +117,3 @@ Storage Default
 }
 
 }
-
diff --git a/cls/SourceControl/Git/Utils.cls b/cls/SourceControl/Git/Utils.cls
index 8be198df..4dff6ec1 100644
--- a/cls/SourceControl/Git/Utils.cls
+++ b/cls/SourceControl/Git/Utils.cls
@@ -1917,7 +1917,6 @@ ClassMethod SyncIrisWithRepoThroughDiff(ByRef files, ByRef filterToFiles, invert
     set addedFiles = $extract(addedFiles, 2, *)
     
     if (deletedFiles '= ""){
-        set ^mtempdeletedFiles($i(^mtempdeletedFiles)) = deletedFiles 
         set sc = ##class(SourceControl.Git.Utils).RemoveFromServerSideSourceControl(deletedFiles)
     }
     if (addedFiles '= ""){
@@ -2573,4 +2572,3 @@ ClassMethod BaselineExport(pCommitMessage = "", pPushToRemote = "") As %Status
 }
 
 }
-
diff --git a/cls/SourceControl/Git/WebUIDriver.cls b/cls/SourceControl/Git/WebUIDriver.cls
index ed97f4ce..d0795934 100644
--- a/cls/SourceControl/Git/WebUIDriver.cls
+++ b/cls/SourceControl/Git/WebUIDriver.cls
@@ -175,7 +175,7 @@ ClassMethod HandleRequest(pagePath As %String, InternalName As %String = "", Out
                     while iter.%GetNext(,.value) {
                         if isFile {
                             set internalName = ##class(SourceControl.Git.Utils).NameToInternalName(value)
-                            do ##class(SourceControl.Git.DiscardState).SaveDiscardState(internalName)
+                            do ##class(SourceControl.Git.DiscardState).SaveDiscardState(internalName, value)
                         }
                         if value = "--"{
                             set isFile = 1
@@ -306,4 +306,3 @@ ClassMethod GetPackageVersion() As %Library.DynamicObject
 }
 
 }
-
diff --git a/git-webui/release/share/git-webui/webui/img/context.svg b/git-webui/release/share/git-webui/webui/img/context.svg
index e3732172..f5ef6c98 100644
--- a/git-webui/release/share/git-webui/webui/img/context.svg
+++ b/git-webui/release/share/git-webui/webui/img/context.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 -960 960 960" width="24px" fill="#eee"><path d="M600-40q-33 0-56.5-23.5T520-120q0-23 11-41t29-29v-221q-18-11-29-28.5T520-480q0-33 23.5-56.5T600-560q33 0 56.5 23.5T680-480q0 23-11 40.5T640-411v115l160-53v-62q-18-11-29-28.5T760-480q0-33 23.5-56.5T840-560q33 0 56.5 23.5T920-480q0 23-11 40.5T880-411v119l-240 80v22q18 11 29 29t11 41q0 33-23.5 56.5T600-40ZM160-160v-560 560Zm0 0q-33 0-56.5-23.5T80-240v-480q0-33 23.5-56.5T160-800h240l80 80h320q33 0 56.5 23.5T880-640H447l-80-80H160v480h280v80H160Z"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" height="16" viewBox="0 -960 960 960" width="16" fill="#eee"><path d="M600-40q-33 0-56.5-23.5T520-120q0-23 11-41t29-29v-221q-18-11-29-28.5T520-480q0-33 23.5-56.5T600-560q33 0 56.5 23.5T680-480q0 23-11 40.5T640-411v115l160-53v-62q-18-11-29-28.5T760-480q0-33 23.5-56.5T840-560q33 0 56.5 23.5T920-480q0 23-11 40.5T880-411v119l-240 80v22q18 11 29 29t11 41q0 33-23.5 56.5T600-40ZM160-160v-560 560Zm0 0q-33 0-56.5-23.5T80-240v-480q0-33 23.5-56.5T160-800h240l80 80h320q33 0 56.5 23.5T880-640H447l-80-80H160v480h280v80H160Z"/></svg>
\ No newline at end of file
diff --git a/git-webui/release/share/git-webui/webui/js/git-webui.js b/git-webui/release/share/git-webui/webui/js/git-webui.js
index c4ea54ad..2130df5e 100644
--- a/git-webui/release/share/git-webui/webui/js/git-webui.js
+++ b/git-webui/release/share/git-webui/webui/js/git-webui.js
@@ -1870,7 +1870,7 @@ webui.DiscardedView = function(mainView) {
             var discardedListEntry = $(
                 '<a class="log-entry list-group-item">' + 
                     '<header>' + 
-                        '<h6 class="file-internalname">' + discardedState.InternalName + '</h6>' + 
+                        '<h6 class="file-internalname">' + discardedState.Name + '</h6>' + 
                         '<span class="discard-date">' + self.formatTimestamp(discardedState.Timestamp) + '</span>' +
                     '</header>' +
                     '<span> Branch: ' + discardedState.Branch + ' </span> <br>' +
diff --git a/git-webui/src/share/git-webui/webui/js/git-webui.js b/git-webui/src/share/git-webui/webui/js/git-webui.js
index c4ea54ad..2130df5e 100644
--- a/git-webui/src/share/git-webui/webui/js/git-webui.js
+++ b/git-webui/src/share/git-webui/webui/js/git-webui.js
@@ -1870,7 +1870,7 @@ webui.DiscardedView = function(mainView) {
             var discardedListEntry = $(
                 '<a class="log-entry list-group-item">' + 
                     '<header>' + 
-                        '<h6 class="file-internalname">' + discardedState.InternalName + '</h6>' + 
+                        '<h6 class="file-internalname">' + discardedState.Name + '</h6>' + 
                         '<span class="discard-date">' + self.formatTimestamp(discardedState.Timestamp) + '</span>' +
                     '</header>' +
                     '<span> Branch: ' + discardedState.Branch + ' </span> <br>' +

From 902972ec044f773a4a02d2765f6f8004fb1aab47 Mon Sep 17 00:00:00 2001
From: Elijah Tamarchenko <etamarch@intersystems.com>
Date: Wed, 25 Sep 2024 14:02:55 -0400
Subject: [PATCH 05/18] Replace removed discarded-state code

---
 cls/SourceControl/Git/WebUIDriver.cls | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/cls/SourceControl/Git/WebUIDriver.cls b/cls/SourceControl/Git/WebUIDriver.cls
index 967d166a..34abe534 100644
--- a/cls/SourceControl/Git/WebUIDriver.cls
+++ b/cls/SourceControl/Git/WebUIDriver.cls
@@ -137,6 +137,9 @@ ClassMethod HandleRequest(pagePath As %String, InternalName As %String = "", Out
             } elseif (pathStart = "dirname") {
                 do %data.Write(##class(SourceControl.Git.Utils).TempFolder())
                 set handled = 1
+            } elseif (pathStart = "discarded-states") {
+                set discardsInBranch = ##class(SourceControl.Git.DiscardState).DiscardStatesInBranch()
+                do %data.Write(discardsInBranch.%ToJSON())
             } elseif (pathStart = "contexts") {
                 set contexts = ##class(SourceControl.Git.Utils).GetContexts()
                 do contexts.%ToJSON(%data)

From b9e1c132bb8a90406543e25394e14bd8b8c70992 Mon Sep 17 00:00:00 2001
From: Elijah Tamarchenko <etamarch@intersystems.com>
Date: Wed, 25 Sep 2024 14:17:43 -0400
Subject: [PATCH 06/18] Fix bug in webdriver handling

---
 cls/SourceControl/Git/Build.cls                           | 1 -
 cls/SourceControl/Git/File.cls                            | 1 -
 cls/SourceControl/Git/Modification.cls                    | 1 -
 cls/SourceControl/Git/PackageManagerContext.cls           | 1 -
 cls/SourceControl/Git/PullEventHandler.cls                | 1 -
 cls/SourceControl/Git/PullEventHandler/Default.cls        | 1 -
 cls/SourceControl/Git/PullEventHandler/PackageManager.cls | 1 -
 cls/SourceControl/Git/Settings.cls                        | 1 -
 cls/SourceControl/Git/Util/Buffer.cls                     | 1 -
 cls/SourceControl/Git/Util/ProductionConflictResolver.cls | 1 -
 cls/SourceControl/Git/Util/Singleton.cls                  | 1 -
 cls/SourceControl/Git/WebUIDriver.cls                     | 1 +
 12 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/cls/SourceControl/Git/Build.cls b/cls/SourceControl/Git/Build.cls
index e61b844f..c017de30 100644
--- a/cls/SourceControl/Git/Build.cls
+++ b/cls/SourceControl/Git/Build.cls
@@ -15,4 +15,3 @@ ClassMethod BuildUIForDevMode(devMode As %Boolean, rootDirectory As %String)
 }
 
 }
-
diff --git a/cls/SourceControl/Git/File.cls b/cls/SourceControl/Git/File.cls
index ba624fc0..2b5de296 100644
--- a/cls/SourceControl/Git/File.cls
+++ b/cls/SourceControl/Git/File.cls
@@ -69,4 +69,3 @@ Storage Default
 }
 
 }
-
diff --git a/cls/SourceControl/Git/Modification.cls b/cls/SourceControl/Git/Modification.cls
index b9660dd3..faf4e360 100644
--- a/cls/SourceControl/Git/Modification.cls
+++ b/cls/SourceControl/Git/Modification.cls
@@ -12,4 +12,3 @@ Property internalName As %String;
 Property changeType As %String;
 
 }
-
diff --git a/cls/SourceControl/Git/PackageManagerContext.cls b/cls/SourceControl/Git/PackageManagerContext.cls
index 874bbad0..4dba02e2 100644
--- a/cls/SourceControl/Git/PackageManagerContext.cls
+++ b/cls/SourceControl/Git/PackageManagerContext.cls
@@ -51,4 +51,3 @@ Method Dump()
 }
 
 }
-
diff --git a/cls/SourceControl/Git/PullEventHandler.cls b/cls/SourceControl/Git/PullEventHandler.cls
index 3e3eb07b..66728728 100644
--- a/cls/SourceControl/Git/PullEventHandler.cls
+++ b/cls/SourceControl/Git/PullEventHandler.cls
@@ -45,4 +45,3 @@ ClassMethod ForInternalNames(InternalName As %String) As %Status
 }
 
 }
-
diff --git a/cls/SourceControl/Git/PullEventHandler/Default.cls b/cls/SourceControl/Git/PullEventHandler/Default.cls
index 70c3d954..71044970 100644
--- a/cls/SourceControl/Git/PullEventHandler/Default.cls
+++ b/cls/SourceControl/Git/PullEventHandler/Default.cls
@@ -16,4 +16,3 @@ Method OnPull() As %Status
 }
 
 }
-
diff --git a/cls/SourceControl/Git/PullEventHandler/PackageManager.cls b/cls/SourceControl/Git/PullEventHandler/PackageManager.cls
index e824885e..37a35f54 100644
--- a/cls/SourceControl/Git/PullEventHandler/PackageManager.cls
+++ b/cls/SourceControl/Git/PullEventHandler/PackageManager.cls
@@ -12,4 +12,3 @@ Method OnPull() As %Status
 }
 
 }
-
diff --git a/cls/SourceControl/Git/Settings.cls b/cls/SourceControl/Git/Settings.cls
index da9fdddf..e05fab93 100644
--- a/cls/SourceControl/Git/Settings.cls
+++ b/cls/SourceControl/Git/Settings.cls
@@ -303,4 +303,3 @@ Method OnAfterConfigure() As %Boolean
 }
 
 }
-
diff --git a/cls/SourceControl/Git/Util/Buffer.cls b/cls/SourceControl/Git/Util/Buffer.cls
index 425a62cd..8134e516 100644
--- a/cls/SourceControl/Git/Util/Buffer.cls
+++ b/cls/SourceControl/Git/Util/Buffer.cls
@@ -281,4 +281,3 @@ Method UsePreviousDeviceAndSettings() [ Internal, Private ]
 }
 
 }
-
diff --git a/cls/SourceControl/Git/Util/ProductionConflictResolver.cls b/cls/SourceControl/Git/Util/ProductionConflictResolver.cls
index 57b7525f..ec29a1a9 100644
--- a/cls/SourceControl/Git/Util/ProductionConflictResolver.cls
+++ b/cls/SourceControl/Git/Util/ProductionConflictResolver.cls
@@ -154,4 +154,3 @@ ClassMethod ResolveStream(stream As %Stream.Object)
 }
 
 }
-
diff --git a/cls/SourceControl/Git/Util/Singleton.cls b/cls/SourceControl/Git/Util/Singleton.cls
index e3cb5412..4f7432a1 100644
--- a/cls/SourceControl/Git/Util/Singleton.cls
+++ b/cls/SourceControl/Git/Util/Singleton.cls
@@ -167,4 +167,3 @@ Method %RemoveOref() As %Status [ CodeMode = objectgenerator, Final, Internal, P
 }
 
 }
-
diff --git a/cls/SourceControl/Git/WebUIDriver.cls b/cls/SourceControl/Git/WebUIDriver.cls
index 34abe534..8c052416 100644
--- a/cls/SourceControl/Git/WebUIDriver.cls
+++ b/cls/SourceControl/Git/WebUIDriver.cls
@@ -140,6 +140,7 @@ ClassMethod HandleRequest(pagePath As %String, InternalName As %String = "", Out
             } elseif (pathStart = "discarded-states") {
                 set discardsInBranch = ##class(SourceControl.Git.DiscardState).DiscardStatesInBranch()
                 do %data.Write(discardsInBranch.%ToJSON())
+                set handled = 1
             } elseif (pathStart = "contexts") {
                 set contexts = ##class(SourceControl.Git.Utils).GetContexts()
                 do contexts.%ToJSON(%data)

From 8cd6ee788618ed55c267d423762b3e7a5cf4f866 Mon Sep 17 00:00:00 2001
From: Elijah Tamarchenko <etamarch@intersystems.com>
Date: Wed, 25 Sep 2024 15:54:26 -0400
Subject: [PATCH 07/18] Fix SQL issues, fix file restoration

---
 cls/SourceControl/Git/DiscardState.cls | 31 +++++++++++++++++---------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/cls/SourceControl/Git/DiscardState.cls b/cls/SourceControl/Git/DiscardState.cls
index e456b5f3..4fc72af2 100644
--- a/cls/SourceControl/Git/DiscardState.cls
+++ b/cls/SourceControl/Git/DiscardState.cls
@@ -17,16 +17,17 @@ Property ExternalFile As %Boolean [ Required ];
 
 Method RestoreToFileTree()
 {
-        set fileStream = ##class(%Stream.FileCharacter).%OpenId(..FullExternalName,,.sc)
-        $$$ThrowOnError(sc)
-        do fileStream.CopyFrom(..Contents)
-        $$$ThrowOnError(fileStream.%Save())
-        if '..ExternalFile {
-            do ##class(SourceControl.Git.Utils).ImportItem(..Name, 1, 1)
-            do ##class(SourceControl.Git.Utils).AddToServerSideSourceControl(..Name)
-        }
+    set fileStream = ##class(%Stream.FileCharacter).%New()
+    set fileStream.Filename = ..FullExternalName
+    $$$THROWONERROR(fileStream.CopyFrom(..Contents))
+    $$$THROWONERROR(fileStream.%Save())
+
+    if '..ExternalFile {
+        do ##class(SourceControl.Git.Utils).ImportItem(..Name, 1, 1)
+        do ##class(SourceControl.Git.Utils).AddToServerSideSourceControl(..Name)
+    }
 
-        $$$ThrowOnError(..%DeleteId(..%Id()))
+    $$$ThrowOnError(..%DeleteId(..%Id()))
 }
 
 ClassMethod SaveDiscardState(InternalName As %String, name As %String) As %Status
@@ -63,8 +64,16 @@ ClassMethod SaveDiscardState(InternalName As %String, name As %String) As %Statu
 ClassMethod DiscardStatesInBranch() As %DynamicArray
 {
     set currentBranch = ##class(SourceControl.Git.Utils).GetCurrentBranch()
-    set statement = "SELECT ID FROM SourceControl_Git.DiscardState WHERE branch = ?"
-    set resultSet = ##class(%SQL.Statement).%ExecDirect(, statement, currentBranch)
+
+    set query = "SELECT ID FROM SourceControl_Git.DiscardState WHERE branch = ?"
+    set statement = ##class(%SQL.Statement).%New()
+    set status = statement.%Prepare(query, 0)
+    $$$ThrowOnError(status)
+    set resultSet = statement.%Execute(currentBranch)
+    if (resultSet.%SQLCODE < 0) {
+        throw ##class(%Exception.SQL).CreateFromSQLCODE(resultSet.%SQLCODE,resultSet.%Message)
+    }
+
     set discardStates = []
     while resultSet.%Next() {
         set discardState = ..%OpenId(resultSet.ID)

From 9eb7ad8aa98380886a6b0a8afafaa1571912cc8a Mon Sep 17 00:00:00 2001
From: Elijah Tamarchenko <etamarch@intersystems.com>
Date: Wed, 25 Sep 2024 15:57:28 -0400
Subject: [PATCH 08/18] fix macro call

Replaced "$$$THROWONERROR" with "$$$ThrowOnError"
---
 cls/SourceControl/Git/DiscardState.cls | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cls/SourceControl/Git/DiscardState.cls b/cls/SourceControl/Git/DiscardState.cls
index 4fc72af2..e803753d 100644
--- a/cls/SourceControl/Git/DiscardState.cls
+++ b/cls/SourceControl/Git/DiscardState.cls
@@ -19,8 +19,8 @@ Method RestoreToFileTree()
 {
     set fileStream = ##class(%Stream.FileCharacter).%New()
     set fileStream.Filename = ..FullExternalName
-    $$$THROWONERROR(fileStream.CopyFrom(..Contents))
-    $$$THROWONERROR(fileStream.%Save())
+    $$$ThrowOnError(fileStream.CopyFrom(..Contents))
+    $$$ThrowOnError(fileStream.%Save())
 
     if '..ExternalFile {
         do ##class(SourceControl.Git.Utils).ImportItem(..Name, 1, 1)

From 8c496543030febf77f4cfeb81da481ac390cdc0d Mon Sep 17 00:00:00 2001
From: Elijah Tamarchenko <etamarch@intersystems.com>
Date: Thu, 26 Sep 2024 10:04:45 -0400
Subject: [PATCH 09/18] Fix file restore

Fix file restore for files whose directories have been deleted. Refresh uncommited queue after file discard
---
 cls/SourceControl/Git/DiscardState.cls | 18 ++++++++++++++----
 cls/SourceControl/Git/WebUIDriver.cls  |  1 +
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/cls/SourceControl/Git/DiscardState.cls b/cls/SourceControl/Git/DiscardState.cls
index e803753d..26b9746b 100644
--- a/cls/SourceControl/Git/DiscardState.cls
+++ b/cls/SourceControl/Git/DiscardState.cls
@@ -17,25 +17,34 @@ Property ExternalFile As %Boolean [ Required ];
 
 Method RestoreToFileTree()
 {
+    // Make sure directory for file exists
+    set dir = ##class(%File).GetDirectory(..FullExternalName)
+    if ('##class(%File).DirectoryExists(dir)) {
+        do ##class(%File).CreateDirectoryChain(dir)
+    }
+    
+    // Recreate File
     set fileStream = ##class(%Stream.FileCharacter).%New()
     set fileStream.Filename = ..FullExternalName
     $$$ThrowOnError(fileStream.CopyFrom(..Contents))
     $$$ThrowOnError(fileStream.%Save())
 
+    // Add file to source-control / IRIS
     if '..ExternalFile {
         do ##class(SourceControl.Git.Utils).ImportItem(..Name, 1, 1)
         do ##class(SourceControl.Git.Utils).AddToServerSideSourceControl(..Name)
     }
 
+    // Delete discard record
     $$$ThrowOnError(..%DeleteId(..%Id()))
 }
 
 ClassMethod SaveDiscardState(InternalName As %String, name As %String) As %Status
 {
         set discardState = ..%New()
-
-        // If not an IRIS file
+        
         if (InternalName = "") {
+            // If not in IRIS
             set externalName = ##class(%File).Construct($Get(^SYS("SourceControl","Git","settings","namespaceTemp")),name)
             set discardState.FullExternalName = externalName
             set discardState.Name = name
@@ -45,13 +54,14 @@ ClassMethod SaveDiscardState(InternalName As %String, name As %String) As %Statu
             set discardState.Name = InternalName
             set discardState.ExternalFile = 0
         }
-
+        // Copy over file contents
         set fileStream = ##class(%Stream.FileCharacter).%New()
         set fileStream.Filename = discardState.FullExternalName
-            
         do fileStream.%Open()
         do discardState.Contents.CopyFrom(fileStream)
         do fileStream.%Close()
+
+        // Save extra information
         set discardState.Username = $USERNAME
         set discardState.Branch = ##class(SourceControl.Git.Utils).GetCurrentBranch()
         set discardState.Timestamp = $zdatetime($horolog, 3)
diff --git a/cls/SourceControl/Git/WebUIDriver.cls b/cls/SourceControl/Git/WebUIDriver.cls
index 8c052416..ba491abe 100644
--- a/cls/SourceControl/Git/WebUIDriver.cls
+++ b/cls/SourceControl/Git/WebUIDriver.cls
@@ -246,6 +246,7 @@ ClassMethod HandleRequest(pagePath As %String, InternalName As %String = "", Out
                             set isFile = 1
                         }
                     }
+                    do ##class(SourceControl.Git.Change).RefreshUncommitted(,,,1)
                 }
 
                 set argsArr = ""

From 6f4c805ab97c205f95b5867976d9c1484af4497c Mon Sep 17 00:00:00 2001
From: Elijah Tamarchenko <etamarch@intersystems.com>
Date: Thu, 26 Sep 2024 10:55:58 -0400
Subject: [PATCH 10/18] Safeguard-discard on menu-based discard

---
 cls/SourceControl/Git/Utils.cls | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cls/SourceControl/Git/Utils.cls b/cls/SourceControl/Git/Utils.cls
index d1533610..6df7709c 100644
--- 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))

From 8739093947d238b522912c2d7870f4451d23f3c6 Mon Sep 17 00:00:00 2001
From: Elijah Tamarchenko <etamarch@intersystems.com>
Date: Thu, 26 Sep 2024 11:29:03 -0400
Subject: [PATCH 11/18] Fix UI and post-discard refresh

Fixed the UI so that the "Restore" button in the discarded files is always visible
Run a refresh of the uncommitted queue after the discard
---
 cls/SourceControl/Git/Build.cls                |  2 +-
 cls/SourceControl/Git/File.cls                 |  2 +-
 cls/SourceControl/Git/Modification.cls         |  2 +-
 .../Git/PackageManagerContext.cls              |  2 +-
 cls/SourceControl/Git/PullEventHandler.cls     |  2 +-
 .../Git/PullEventHandler/Default.cls           |  2 +-
 .../Git/PullEventHandler/PackageManager.cls    |  2 +-
 cls/SourceControl/Git/Settings.cls             |  2 +-
 cls/SourceControl/Git/Util/Buffer.cls          |  2 +-
 .../Git/Util/ProductionConflictResolver.cls    |  2 +-
 cls/SourceControl/Git/Util/Singleton.cls       |  2 +-
 cls/SourceControl/Git/WebUIDriver.cls          |  2 +-
 .../share/git-webui/webui/css/git-webui.css    | 14 +++++++-------
 .../share/git-webui/webui/js/git-webui.js      |  5 +++--
 .../share/git-webui/webui/css/git-webui.less   | 18 ++++++++----------
 .../src/share/git-webui/webui/js/git-webui.js  |  7 ++++---
 16 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/cls/SourceControl/Git/Build.cls b/cls/SourceControl/Git/Build.cls
index c017de30..02d93165 100644
--- a/cls/SourceControl/Git/Build.cls
+++ b/cls/SourceControl/Git/Build.cls
@@ -14,4 +14,4 @@ ClassMethod BuildUIForDevMode(devMode As %Boolean, rootDirectory As %String)
     write !, $zf(-100, "/SHELL", "npm", "run", "build", "--prefix", webUIDirectory)
 }
 
-}
+}
\ No newline at end of file
diff --git a/cls/SourceControl/Git/File.cls b/cls/SourceControl/Git/File.cls
index 2b5de296..951b8446 100644
--- a/cls/SourceControl/Git/File.cls
+++ b/cls/SourceControl/Git/File.cls
@@ -68,4 +68,4 @@ Storage Default
 <Type>%Storage.Persistent</Type>
 }
 
-}
+}
\ No newline at end of file
diff --git a/cls/SourceControl/Git/Modification.cls b/cls/SourceControl/Git/Modification.cls
index faf4e360..3c1798bb 100644
--- a/cls/SourceControl/Git/Modification.cls
+++ b/cls/SourceControl/Git/Modification.cls
@@ -11,4 +11,4 @@ Property internalName As %String;
 /// Type of change (A|C|D|M|R|T|U|X|B). See git diff documentation.
 Property changeType As %String;
 
-}
+}
\ No newline at end of file
diff --git a/cls/SourceControl/Git/PackageManagerContext.cls b/cls/SourceControl/Git/PackageManagerContext.cls
index 4dba02e2..c75ea4b0 100644
--- a/cls/SourceControl/Git/PackageManagerContext.cls
+++ b/cls/SourceControl/Git/PackageManagerContext.cls
@@ -50,4 +50,4 @@ Method Dump()
     write !?4,"Git-enabled? ",$select(..IsInGitEnabledPackage:"Yes",1:"No"),!
 }
 
-}
+}
\ No newline at end of file
diff --git a/cls/SourceControl/Git/PullEventHandler.cls b/cls/SourceControl/Git/PullEventHandler.cls
index 66728728..8f1bded1 100644
--- a/cls/SourceControl/Git/PullEventHandler.cls
+++ b/cls/SourceControl/Git/PullEventHandler.cls
@@ -44,4 +44,4 @@ ClassMethod ForInternalNames(InternalName As %String) As %Status
     quit ..ForModifications(.files)
 }
 
-}
+}
\ No newline at end of file
diff --git a/cls/SourceControl/Git/PullEventHandler/Default.cls b/cls/SourceControl/Git/PullEventHandler/Default.cls
index 71044970..9a72a8ad 100644
--- a/cls/SourceControl/Git/PullEventHandler/Default.cls
+++ b/cls/SourceControl/Git/PullEventHandler/Default.cls
@@ -15,4 +15,4 @@ Method OnPull() As %Status
     quit ##class(SourceControl.Git.PullEventHandler.IncrementalLoad)$this.OnPull()
 }
 
-}
+}
\ No newline at end of file
diff --git a/cls/SourceControl/Git/PullEventHandler/PackageManager.cls b/cls/SourceControl/Git/PullEventHandler/PackageManager.cls
index 37a35f54..357c6a85 100644
--- a/cls/SourceControl/Git/PullEventHandler/PackageManager.cls
+++ b/cls/SourceControl/Git/PullEventHandler/PackageManager.cls
@@ -11,4 +11,4 @@ Method OnPull() As %Status
     quit ##class(%ZPM.PackageManager).Shell("load "_..LocalRoot)
 }
 
-}
+}
\ No newline at end of file
diff --git a/cls/SourceControl/Git/Settings.cls b/cls/SourceControl/Git/Settings.cls
index e05fab93..5e4324e0 100644
--- a/cls/SourceControl/Git/Settings.cls
+++ b/cls/SourceControl/Git/Settings.cls
@@ -302,4 +302,4 @@ Method OnAfterConfigure() As %Boolean
     }
 }
 
-}
+}
\ No newline at end of file
diff --git a/cls/SourceControl/Git/Util/Buffer.cls b/cls/SourceControl/Git/Util/Buffer.cls
index 8134e516..d1601f9b 100644
--- a/cls/SourceControl/Git/Util/Buffer.cls
+++ b/cls/SourceControl/Git/Util/Buffer.cls
@@ -280,4 +280,4 @@ Method UsePreviousDeviceAndSettings() [ Internal, Private ]
 	}
 }
 
-}
+}
\ No newline at end of file
diff --git a/cls/SourceControl/Git/Util/ProductionConflictResolver.cls b/cls/SourceControl/Git/Util/ProductionConflictResolver.cls
index ec29a1a9..2825b2e6 100644
--- a/cls/SourceControl/Git/Util/ProductionConflictResolver.cls
+++ b/cls/SourceControl/Git/Util/ProductionConflictResolver.cls
@@ -153,4 +153,4 @@ ClassMethod ResolveStream(stream As %Stream.Object)
     Quit 1
 }
 
-}
+}
\ No newline at end of file
diff --git a/cls/SourceControl/Git/Util/Singleton.cls b/cls/SourceControl/Git/Util/Singleton.cls
index 4f7432a1..6b9d0132 100644
--- a/cls/SourceControl/Git/Util/Singleton.cls
+++ b/cls/SourceControl/Git/Util/Singleton.cls
@@ -166,4 +166,4 @@ Method %RemoveOref() As %Status [ CodeMode = objectgenerator, Final, Internal, P
 	Quit $$$OK
 }
 
-}
+}
\ No newline at end of file
diff --git a/cls/SourceControl/Git/WebUIDriver.cls b/cls/SourceControl/Git/WebUIDriver.cls
index ba491abe..5f631d5d 100644
--- a/cls/SourceControl/Git/WebUIDriver.cls
+++ b/cls/SourceControl/Git/WebUIDriver.cls
@@ -246,7 +246,6 @@ ClassMethod HandleRequest(pagePath As %String, InternalName As %String = "", Out
                             set isFile = 1
                         }
                     }
-                    do ##class(SourceControl.Git.Change).RefreshUncommitted(,,,1)
                 }
 
                 set argsArr = ""
@@ -278,6 +277,7 @@ ClassMethod HandleRequest(pagePath As %String, InternalName As %String = "", Out
                 do %data.WriteLine("Git-Stderr-Length: " _ (errStream.Size + nLines))
                 do %data.Write("Git-Return-Code: " _ returnCode) // No ending newline expected
                 do %data.Rewind()
+                do ##class(SourceControl.Git.Change).RefreshUncommitted(,,,1)
                 set handled = 1
             } elseif (pathStart = "restore-discarded") {
                 merge data = %request.Data 
diff --git a/git-webui/release/share/git-webui/webui/css/git-webui.css b/git-webui/release/share/git-webui/webui/css/git-webui.css
index cfa54a90..954993af 100644
--- a/git-webui/release/share/git-webui/webui/css/git-webui.css
+++ b/git-webui/release/share/git-webui/webui/css/git-webui.css
@@ -991,9 +991,10 @@ body {
 #discardedView header .discard-date {
   margin-left: auto;
 }
-#discardedView .external-name {
-  font-size: 1rem;
-  padding: 20px 15px 0 0;
+#discardedView .restore-discarded {
+  padding-top: 15px;
+  margin-left: 15px;
+  margin-right: 15px;
 }
 #discardedView .contents-menu {
   display: flex;
@@ -1001,10 +1002,9 @@ body {
   min-height: 0;
   min-width: 0;
 }
-#discardedView .contents-menu .restore-discarded {
-  padding-top: 15px;
-  margin-left: auto;
-  margin-right: 15px;
+#discardedView .contents-menu .external-name {
+  font-size: 1rem;
+  padding: 20px 15px 0 0;
 }
 #discardedView .has-items {
   padding-bottom: 20px;
diff --git a/git-webui/release/share/git-webui/webui/js/git-webui.js b/git-webui/release/share/git-webui/webui/js/git-webui.js
index 4e909a66..34dca5a3 100644
--- a/git-webui/release/share/git-webui/webui/js/git-webui.js
+++ b/git-webui/release/share/git-webui/webui/js/git-webui.js
@@ -1961,8 +1961,9 @@ webui.DiscardedView = function(mainView) {
         discardedList.innerHTML = '';
         $('.file-contents').html('');
         $('.contents-menu').removeClass("has-items");
-        $('.external-name').text('');
         $('.restore-discarded').html('');
+        $('.external-name').text('');
+        
 
         // TODO: Empty the discarded list properly
         $.get("discarded-states", function(discarded) {
@@ -2037,8 +2038,8 @@ webui.DiscardedView = function(mainView) {
             '</div>' +
             '<div class="col-sm-5">' +
                 '<div class="contents-menu">' +
-                    '<div class="nav-item external-name"></div>' +
                     '<div class="nav-item restore-discarded"></div>' +
+                    '<div class="nav-item external-name"></div>' +
                 '</div>' +
                 '<div class="container file-contents">' +
 
diff --git a/git-webui/src/share/git-webui/webui/css/git-webui.less b/git-webui/src/share/git-webui/webui/css/git-webui.less
index 1cb8e839..36a49463 100644
--- a/git-webui/src/share/git-webui/webui/css/git-webui.less
+++ b/git-webui/src/share/git-webui/webui/css/git-webui.less
@@ -1009,24 +1009,22 @@ body {
         }
     }
 
-    .external-name {
-        font-size: 1rem;
-        padding: 20px 15px 0 0;
-    }
 
+    .restore-discarded {
+        padding-top: 15px;
+        margin-left: 15px;
+        margin-right: 15px;
+    }
     
 
     .contents-menu {
         .display-flex();
 
-        .restore-discarded {
-            padding-top: 15px;
-            margin-left: auto;
-            margin-right: 15px;
+        .external-name {
+            font-size: 1rem;
+            padding: 20px 15px 0 0;
         }
 
-        
-       
     }
 
     .has-items {
diff --git a/git-webui/src/share/git-webui/webui/js/git-webui.js b/git-webui/src/share/git-webui/webui/js/git-webui.js
index 4e909a66..7c3ecb8e 100644
--- a/git-webui/src/share/git-webui/webui/js/git-webui.js
+++ b/git-webui/src/share/git-webui/webui/js/git-webui.js
@@ -1961,8 +1961,9 @@ webui.DiscardedView = function(mainView) {
         discardedList.innerHTML = '';
         $('.file-contents').html('');
         $('.contents-menu').removeClass("has-items");
-        $('.external-name').text('');
         $('.restore-discarded').html('');
+        $('.external-name').text('');
+        
 
         // TODO: Empty the discarded list properly
         $.get("discarded-states", function(discarded) {
@@ -2032,13 +2033,13 @@ webui.DiscardedView = function(mainView) {
 
     self.element = $(
         '<div class="row" id="discardedView">' +
-            '<div class="col-sm-7">' +
+            '<div class="col-sm-5">' +
                 '<div id="discardedList"></div>' +
             '</div>' +
             '<div class="col-sm-5">' +
                 '<div class="contents-menu">' +
-                    '<div class="nav-item external-name"></div>' +
                     '<div class="nav-item restore-discarded"></div>' +
+                    '<div class="nav-item external-name"></div>' +
                 '</div>' +
                 '<div class="container file-contents">' +
 

From 10aa94411f97c2aac4c72af9f5b4ecc01983f398 Mon Sep 17 00:00:00 2001
From: Elijah Tamarchenko <etamarch@intersystems.com>
Date: Thu, 26 Sep 2024 11:32:31 -0400
Subject: [PATCH 12/18] Fix restore files after discard

---
 cls/SourceControl/Git/WebUIDriver.cls | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cls/SourceControl/Git/WebUIDriver.cls b/cls/SourceControl/Git/WebUIDriver.cls
index 5f631d5d..2e8b2eda 100644
--- a/cls/SourceControl/Git/WebUIDriver.cls
+++ b/cls/SourceControl/Git/WebUIDriver.cls
@@ -286,6 +286,7 @@ ClassMethod HandleRequest(pagePath As %String, InternalName As %String = "", Out
                 set %data = ##class(%Stream.TmpCharacter).%New()
 
                 set discardState = ##class(SourceControl.Git.DiscardState).%OpenId(fileId)
+                do ##class(SourceControl.Git.Change).RefreshUncommitted(,,,1)
                 if ##class(SourceControl.Git.Change).IsUncommitted(discardState.FullExternalName) {
                     do %data.WriteLine("Please commit changes to file before restoring discarded state")
                 } else {

From 31862a857d273ddbb3659f33bde3e6fd7c3dbb28 Mon Sep 17 00:00:00 2001
From: Elijah Tamarchenko <etamarch@intersystems.com>
Date: Thu, 26 Sep 2024 11:49:00 -0400
Subject: [PATCH 13/18] Remove from uncommitted queue after discard

---
 cls/SourceControl/Git/WebUIDriver.cls                   | 7 ++++++-
 git-webui/release/share/git-webui/webui/js/git-webui.js | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/cls/SourceControl/Git/WebUIDriver.cls b/cls/SourceControl/Git/WebUIDriver.cls
index 2e8b2eda..2c0d7687 100644
--- a/cls/SourceControl/Git/WebUIDriver.cls
+++ b/cls/SourceControl/Git/WebUIDriver.cls
@@ -241,12 +241,18 @@ ClassMethod HandleRequest(pagePath As %String, InternalName As %String = "", Out
                         if isFile {
                             set internalName = ##class(SourceControl.Git.Utils).NameToInternalName(value)
                             do ##class(SourceControl.Git.DiscardState).SaveDiscardState(internalName, value)
+                            if (internalName) {
+                                set externalName = ##class(Source.Git.Utils).FullExternalName(internalName)
+                                $$$ThrowOnError(##class(SourceControl.Git.Change).RemoveUncommitted(externalName,0,1))
+                            }
+
                         }
                         if value = "--"{
                             set isFile = 1
                         }
                     }
                 }
+                $$$ThrowOnError(##class(SourceControl.Git.Change).RefreshUncommitted(0,1,,1))
 
                 set argsArr = ""
                 set argsArr($increment(argsArr)) = "color.ui=true"
@@ -277,7 +283,6 @@ ClassMethod HandleRequest(pagePath As %String, InternalName As %String = "", Out
                 do %data.WriteLine("Git-Stderr-Length: " _ (errStream.Size + nLines))
                 do %data.Write("Git-Return-Code: " _ returnCode) // No ending newline expected
                 do %data.Rewind()
-                do ##class(SourceControl.Git.Change).RefreshUncommitted(,,,1)
                 set handled = 1
             } elseif (pathStart = "restore-discarded") {
                 merge data = %request.Data 
diff --git a/git-webui/release/share/git-webui/webui/js/git-webui.js b/git-webui/release/share/git-webui/webui/js/git-webui.js
index 34dca5a3..7c3ecb8e 100644
--- a/git-webui/release/share/git-webui/webui/js/git-webui.js
+++ b/git-webui/release/share/git-webui/webui/js/git-webui.js
@@ -2033,7 +2033,7 @@ webui.DiscardedView = function(mainView) {
 
     self.element = $(
         '<div class="row" id="discardedView">' +
-            '<div class="col-sm-7">' +
+            '<div class="col-sm-5">' +
                 '<div id="discardedList"></div>' +
             '</div>' +
             '<div class="col-sm-5">' +

From 89dd12bcabebd7d6950225e33be86c8a0639c109 Mon Sep 17 00:00:00 2001
From: Elijah Tamarchenko <etamarch@intersystems.com>
Date: Thu, 26 Sep 2024 15:47:04 -0400
Subject: [PATCH 14/18] Fix discarded items still in uncommitted queue

---
 cls/SourceControl/Git/WebUIDriver.cls | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/cls/SourceControl/Git/WebUIDriver.cls b/cls/SourceControl/Git/WebUIDriver.cls
index 2c0d7687..8c930ff0 100644
--- a/cls/SourceControl/Git/WebUIDriver.cls
+++ b/cls/SourceControl/Git/WebUIDriver.cls
@@ -234,6 +234,7 @@ ClassMethod HandleRequest(pagePath As %String, InternalName As %String = "", Out
 
                 set gitCmd = command.%Get(0)
 
+                set discardedFiles = []
                 if gitCmd = "restore" {
                     set iter = command.%GetIterator()
                     set isFile = 0
@@ -241,9 +242,10 @@ ClassMethod HandleRequest(pagePath As %String, InternalName As %String = "", Out
                         if isFile {
                             set internalName = ##class(SourceControl.Git.Utils).NameToInternalName(value)
                             do ##class(SourceControl.Git.DiscardState).SaveDiscardState(internalName, value)
-                            if (internalName) {
-                                set externalName = ##class(Source.Git.Utils).FullExternalName(internalName)
+                            if (internalName'="") {
+                                set externalName = ##class(SourceControl.Git.Utils).FullExternalName(internalName)
                                 $$$ThrowOnError(##class(SourceControl.Git.Change).RemoveUncommitted(externalName,0,1))
+                                do discardedFiles.%Push(externalName)
                             }
 
                         }
@@ -284,6 +286,14 @@ ClassMethod HandleRequest(pagePath As %String, InternalName As %String = "", Out
                 do %data.Write("Git-Return-Code: " _ returnCode) // No ending newline expected
                 do %data.Rewind()
                 set handled = 1
+
+                // Make sure discarded items are not in the uncommitted queue
+                set item = discardedFiles.%Pop()
+                while (item '= "") {
+                    do ##class(SourceControl.Git.Change).RemoveUncommitted(externalName,0,1)
+                    set item = discardedFiles.%Pop()
+                }
+                
             } elseif (pathStart = "restore-discarded") {
                 merge data = %request.Data 
                 set fileId = data("file",1)

From ec6e5a5c5734e73435ba3ad6fd47dac18123e599 Mon Sep 17 00:00:00 2001
From: Elijah Tamarchenko <etamarch@intersystems.com>
Date: Thu, 26 Sep 2024 16:02:59 -0400
Subject: [PATCH 15/18] typo

---
 cls/SourceControl/Git/WebUIDriver.cls | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cls/SourceControl/Git/WebUIDriver.cls b/cls/SourceControl/Git/WebUIDriver.cls
index 8c930ff0..51809b9b 100644
--- a/cls/SourceControl/Git/WebUIDriver.cls
+++ b/cls/SourceControl/Git/WebUIDriver.cls
@@ -290,7 +290,7 @@ ClassMethod HandleRequest(pagePath As %String, InternalName As %String = "", Out
                 // Make sure discarded items are not in the uncommitted queue
                 set item = discardedFiles.%Pop()
                 while (item '= "") {
-                    do ##class(SourceControl.Git.Change).RemoveUncommitted(externalName,0,1)
+                    do ##class(SourceControl.Git.Change).RemoveUncommitted(item,0,1)
                     set item = discardedFiles.%Pop()
                 }
                 

From 078d56e324754bdb2c3567f4404f474a0d8aa688 Mon Sep 17 00:00:00 2001
From: Elijah Tamarchenko <etamarch@intersystems.com>
Date: Thu, 26 Sep 2024 16:07:59 -0400
Subject: [PATCH 16/18] Bump version

---
 CHANGELOG.md | 2 +-
 module.xml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1449d243..822bc82b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [2.5.1] - Unreleased
+## [2.6.0] - Unreleased
 
 ### Added
 - Discards safeguarded by discard stash and warning modal (#455)
diff --git a/module.xml b/module.xml
index 9374fb5c..f8bc2027 100644
--- a/module.xml
+++ b/module.xml
@@ -3,7 +3,7 @@
   <Document name="git-source-control.ZPM">
     <Module>
       <Name>git-source-control</Name>
-      <Version>2.5.1</Version>
+      <Version>2.6.0</Version>
       <Description>Server-side source control extension for use of Git on InterSystems platforms</Description>
       <Keywords>git source control studio vscode</Keywords>
       <Packaging>module</Packaging>

From bf99a2d8b8eba43655bab6d829bc42c8a06814e7 Mon Sep 17 00:00:00 2001
From: Elijah Tamarchenko <etamarch@intersystems.com>
Date: Fri, 27 Sep 2024 14:34:03 -0400
Subject: [PATCH 17/18] Fix issues

---
 cls/SourceControl/Git/DiscardState.cls                  | 6 ++++--
 cls/SourceControl/Git/WebUIDriver.cls                   | 2 +-
 git-webui/release/share/git-webui/webui/js/git-webui.js | 4 ----
 git-webui/src/share/git-webui/webui/js/git-webui.js     | 4 ----
 4 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/cls/SourceControl/Git/DiscardState.cls b/cls/SourceControl/Git/DiscardState.cls
index 26b9746b..c6d47167 100644
--- a/cls/SourceControl/Git/DiscardState.cls
+++ b/cls/SourceControl/Git/DiscardState.cls
@@ -5,7 +5,7 @@ Property FullExternalName As %String(MAXLEN = "") [ Required ];
 
 Property Name As %String [ Required ];
 
-Property Contents As %Stream.GlobalCharacter(LOCATION = "^DiscardStateContents");
+Property Contents As %Stream.GlobalCharacter(LOCATION = "^SourceControl.Git.DiscardS");
 
 Property Username As %String [ Required ];
 
@@ -15,6 +15,8 @@ Property Timestamp As %TimeStamp [ Required ];
 
 Property ExternalFile As %Boolean [ Required ];
 
+Index BranchMap On Branch [ Type = bitmap ];
+
 Method RestoreToFileTree()
 {
     // Make sure directory for file exists
@@ -45,7 +47,7 @@ ClassMethod SaveDiscardState(InternalName As %String, name As %String) As %Statu
         
         if (InternalName = "") {
             // If not in IRIS
-            set externalName = ##class(%File).Construct($Get(^SYS("SourceControl","Git","settings","namespaceTemp")),name)
+            set externalName = ##class(%File).Construct(##class(SourceControl.Git.Utils).DefaultTempFolder(),name)
             set discardState.FullExternalName = externalName
             set discardState.Name = name
             set discardState.ExternalFile = 1
diff --git a/cls/SourceControl/Git/WebUIDriver.cls b/cls/SourceControl/Git/WebUIDriver.cls
index 51809b9b..db52ad04 100644
--- a/cls/SourceControl/Git/WebUIDriver.cls
+++ b/cls/SourceControl/Git/WebUIDriver.cls
@@ -139,7 +139,7 @@ ClassMethod HandleRequest(pagePath As %String, InternalName As %String = "", Out
                 set handled = 1
             } elseif (pathStart = "discarded-states") {
                 set discardsInBranch = ##class(SourceControl.Git.DiscardState).DiscardStatesInBranch()
-                do %data.Write(discardsInBranch.%ToJSON())
+                do discardsInBranch.%ToJSON(%data)
                 set handled = 1
             } elseif (pathStart = "contexts") {
                 set contexts = ##class(SourceControl.Git.Utils).GetContexts()
diff --git a/git-webui/release/share/git-webui/webui/js/git-webui.js b/git-webui/release/share/git-webui/webui/js/git-webui.js
index 7c3ecb8e..4f87e34e 100644
--- a/git-webui/release/share/git-webui/webui/js/git-webui.js
+++ b/git-webui/release/share/git-webui/webui/js/git-webui.js
@@ -1964,8 +1964,6 @@ webui.DiscardedView = function(mainView) {
         $('.restore-discarded').html('');
         $('.external-name').text('');
         
-
-        // TODO: Empty the discarded list properly
         $.get("discarded-states", function(discarded) {
             self.discarded = JSON.parse(discarded);
             if (self.discarded.length == 0) {
@@ -1978,8 +1976,6 @@ webui.DiscardedView = function(mainView) {
         
     }
 
-        
-
     self.populateUiWithDiscardedStates = function() {
         self.discarded.forEach((discardedState, ind) => {
             var discardedListEntry = $(
diff --git a/git-webui/src/share/git-webui/webui/js/git-webui.js b/git-webui/src/share/git-webui/webui/js/git-webui.js
index 7c3ecb8e..4f87e34e 100644
--- a/git-webui/src/share/git-webui/webui/js/git-webui.js
+++ b/git-webui/src/share/git-webui/webui/js/git-webui.js
@@ -1964,8 +1964,6 @@ webui.DiscardedView = function(mainView) {
         $('.restore-discarded').html('');
         $('.external-name').text('');
         
-
-        // TODO: Empty the discarded list properly
         $.get("discarded-states", function(discarded) {
             self.discarded = JSON.parse(discarded);
             if (self.discarded.length == 0) {
@@ -1978,8 +1976,6 @@ webui.DiscardedView = function(mainView) {
         
     }
 
-        
-
     self.populateUiWithDiscardedStates = function() {
         self.discarded.forEach((discardedState, ind) => {
             var discardedListEntry = $(

From b8b143c948db8ba361937b3cbc30d3bda1138dfe Mon Sep 17 00:00:00 2001
From: Elijah Tamarchenko <etamarch@intersystems.com>
Date: Wed, 2 Oct 2024 09:54:20 -0400
Subject: [PATCH 18/18] Compile discarded classes and fix file contents

Replaced HTML characters with escaped versions, made sure discarded files are compiled after import
---
 cls/SourceControl/Git/DiscardState.cls                  | 2 +-
 git-webui/release/share/git-webui/webui/js/git-webui.js | 3 ++-
 git-webui/src/share/git-webui/webui/js/git-webui.js     | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/cls/SourceControl/Git/DiscardState.cls b/cls/SourceControl/Git/DiscardState.cls
index c6d47167..fc48d999 100644
--- a/cls/SourceControl/Git/DiscardState.cls
+++ b/cls/SourceControl/Git/DiscardState.cls
@@ -33,7 +33,7 @@ Method RestoreToFileTree()
 
     // Add file to source-control / IRIS
     if '..ExternalFile {
-        do ##class(SourceControl.Git.Utils).ImportItem(..Name, 1, 1)
+        do ##class(SourceControl.Git.Utils).ImportItem(..Name, 1, 1, 1)
         do ##class(SourceControl.Git.Utils).AddToServerSideSourceControl(..Name)
     }
 
diff --git a/git-webui/release/share/git-webui/webui/js/git-webui.js b/git-webui/release/share/git-webui/webui/js/git-webui.js
index 4c79ec0c..1ec81055 100644
--- a/git-webui/release/share/git-webui/webui/js/git-webui.js
+++ b/git-webui/release/share/git-webui/webui/js/git-webui.js
@@ -2019,6 +2019,7 @@ webui.DiscardedView = function(mainView) {
                 var discardElement = $('.restore-discarded')[0];
                 discardElement.innerHTML = '';
                 discardElement.appendChild(btn);
+                var contents = discardedState.Contents.replace(/&/g, "&amp;").replace(/>/g, "&gt;").replace(/</g, "&lt;").replace(/"/g, "&quot;");
 
                 $('.restore-discarded-btn').off("click").on("click", function() {
                     $.post("restore-discarded", {file: discardedState.Id}, function(message) {
@@ -2032,7 +2033,7 @@ webui.DiscardedView = function(mainView) {
                     });
                 });
 
-                $('.file-contents').html('<pre>' + discardedState.Contents + '</pre>');
+                $('.file-contents').html('<pre>' + contents + '</pre>');
             });
 
             
diff --git a/git-webui/src/share/git-webui/webui/js/git-webui.js b/git-webui/src/share/git-webui/webui/js/git-webui.js
index 4c79ec0c..1ec81055 100644
--- a/git-webui/src/share/git-webui/webui/js/git-webui.js
+++ b/git-webui/src/share/git-webui/webui/js/git-webui.js
@@ -2019,6 +2019,7 @@ webui.DiscardedView = function(mainView) {
                 var discardElement = $('.restore-discarded')[0];
                 discardElement.innerHTML = '';
                 discardElement.appendChild(btn);
+                var contents = discardedState.Contents.replace(/&/g, "&amp;").replace(/>/g, "&gt;").replace(/</g, "&lt;").replace(/"/g, "&quot;");
 
                 $('.restore-discarded-btn').off("click").on("click", function() {
                     $.post("restore-discarded", {file: discardedState.Id}, function(message) {
@@ -2032,7 +2033,7 @@ webui.DiscardedView = function(mainView) {
                     });
                 });
 
-                $('.file-contents').html('<pre>' + discardedState.Contents + '</pre>');
+                $('.file-contents').html('<pre>' + contents + '</pre>');
             });