Merge pull request #410 from intersystems/git-update-uncommitted

update uncommitted now removes other user's uncommitted files if they're committed

Author: isc-tleavitt

cls/SourceControl/Git/Change.cls

@@ -44,9 +44,7 @@ ClassMethod RemoveUncommitted(FileList, Display = 1, Revert = 0, ActiveCommit =
             set changeSourceClass=##class(%Studio.SourceControl.Interface).SourceControlClassGet()
         }
         if ('$get(^SYS("SourceControl","ChangeConfig","KeepHistory")))||(Revert) {
-            if (obj.ChangedBy = $username) {
-                set sc=..%DeleteId(obj.%Id())
-            }
+            set sc=..%DeleteId(obj.%Id())
         } else {
             if $get(CommitCCR)'="" set obj.CCR=CommitCCR
             set obj.P4Issued=$zdatetime($h,3)
@@ -112,6 +110,7 @@ ClassMethod GetOtherDeveloperChanges() As %Boolean
 /// Goes through Uncommitted queue and removes any items of action 'edit' or 'add' which are ReadOnly or non-existent on the filesystem
 ClassMethod RefreshUncommitted(Display = 0, IncludeRevert = 0, Output gitFiles, Force As %Boolean = 0) As %Status
 {
+    
     set lock = $System.AutoLock.Lock("^SourceControl.Git.Refresh",,10)
     if lock = $$$NULLOREF {
         quit $$$ERROR($$$GeneralError,"Unable to get exclusive lock for refresh of uncommitted changes.")

cls/SourceControl/Git/Utils.cls

@@ -2544,3 +2544,4 @@ ClassMethod BaselineExport(pCommitMessage = "", pPushToRemote = "") As %Status
 }
 
 }
+

cls/SourceControl/Git/WebUIDriver.cls

@@ -159,7 +159,7 @@ ClassMethod HandleRequest(pagePath As %String, InternalName As %String = "", Out
                 do %data.Write("Git-Return-Code: " _ returnCode) // No ending newline expected
                 do %data.Rewind()
                 if '$listfind(readOnlyCommands,baseCommand) {
-                    do ##class(SourceControl.Git.Change).RefreshUncommitted()
+                    do ##class(SourceControl.Git.Change).RefreshUncommitted(,,,1)
                 }
                 set handled = 1
             }

git-webui/release/share/git-webui/webui/js/git-webui.js

@@ -90,6 +90,7 @@ webui.showWarning = function(message) {
     var messageBox = $("#message-box");
     messageBox.empty();
 
+    // convert links in message into actual html links
     var messageAsArr = message.split(" ");
     messageAsArr = messageAsArr.map(function(messagePart){
         if (messagePart.startsWith("https://")) {
@@ -99,6 +100,8 @@ webui.showWarning = function(message) {
         }
     });
     message = messageAsArr.join(" ")
+
+
     $(  '<div class="alert alert-warning alert-dismissible" role="alert">' +
             '<button type="button" class="btn btn-default close" data-dismiss="alert">' +
             webui.largeXIcon+