Merge pull request #427 from intersystems/webui-new-repo-bugs

Webui new repo bugs

Author: isc-hwojnick

cls/SourceControl/Git/Settings.cls

@@ -88,9 +88,10 @@ Method %Save() As %Status
 
     set ..namespaceTemp = ##class(%Library.File).NormalizeDirectory(..namespaceTemp)
     set @storage@("settings","namespaceTemp") = ..namespaceTemp
-    if ('##class(%File).DirectoryExists(@storage@("settings","namespaceTemp"))){
-        do ##class(%Library.File).CreateDirectoryChain(@storage@("settings","namespaceTemp"))
-    }
+    set workMgr = $System.WorkMgr.%New("")
+    $$$ThrowOnError(workMgr.Queue("##class(SourceControl.Git.Settings).CreateNamespaceTempFolder"))
+    $$$ThrowOnError(workMgr.WaitForComplete())
+
     set @storage@("settings","user",$username,"gitUserName") = ..gitUserName
 
     set @storage@("settings","user",$username,"gitUserEmail") = ..gitUserEmail
@@ -117,6 +118,16 @@ Method %Save() As %Status
     quit $$$OK
 }
 
+ClassMethod CreateNamespaceTempFolder() As %Status
+{
+    set storage = ##class(SourceControl.Git.Utils).#Storage
+    if ('##class(%File).DirectoryExists(@storage@("settings","namespaceTemp"))){ 
+        do ##class(%Library.File).CreateDirectoryChain(@storage@("settings","namespaceTemp"))
+    }
+
+    return $$$OK
+}
+
 ClassMethod Configure() As %Boolean [ CodeMode = objectgenerator ]
 {
     do %code.WriteLine(" set inst = ..%New()")
@@ -188,10 +199,18 @@ Method OnAfterConfigure() As %Boolean
             }
         }
         if (value = 1) {
+            set settings = ##class(SourceControl.Git.Settings).%New()
+            set repoRootFolder = settings.namespaceTemp
+            if ($extract(repoRootFolder, $length(repoRootFolder)) = "\") || ($extract(repoRootFolder, $length(repoRootFolder)) = "/") {
+                set repoRootFolder = $extract(settings.namespaceTemp, 1, $length(settings.namespaceTemp) - 1)
+            }
+            set repoRootFolder = $translate(repoRootFolder, "\", "/")
+            do ##class(SourceControl.Git.Utils).RunGitCommandWithInput("config",,,,"--global", "--add", "safe.directory", repoRootFolder)
              // using work queue manager ensures proper OS user context/file ownership
             set workMgr = $System.WorkMgr.%New("")
             $$$ThrowOnError(workMgr.Queue("##class(SourceControl.Git.Utils).Init"))
             $$$ThrowOnError(workMgr.WaitForComplete())
+            
             do ##class(SourceControl.Git.Utils).EmptyInitialCommit()
         } elseif (value = 2) {
             set response = ##class(%Library.Prompt).GetString("Git remote URL (note: if authentication is required, use SSH, not HTTPS):",.remote,,,,defaultPromptFlag)

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

@@ -1304,8 +1304,11 @@ webui.DiffView = function(sideBySide, hunkSelectionAllowed, parent, stashedCommi
                 self.gitFile = "\"" + file + "\"";
                 self.noIndex = ""
                 if(path.length == 0 && file != undefined){
-                    self.gitFile = " /dev/null " + "\"" + file + "\"";
-                    self.noIndex = " --no-index "
+                    self.gitFile = " /dev/null " + file;
+                    self.noIndex = " --no-index ";
+                    if (self.gitDiffOpts == "--cached") {
+                        self.gitDiffOpts = "";
+                    } 
                 }
                 if (self.gitCmd) {
                     var fullCmd = self.gitCmd;

git-webui/src/share/git-webui/webui/js/git-webui.js

@@ -1304,8 +1304,11 @@ webui.DiffView = function(sideBySide, hunkSelectionAllowed, parent, stashedCommi
                 self.gitFile = "\"" + file + "\"";
                 self.noIndex = ""
                 if(path.length == 0 && file != undefined){
-                    self.gitFile = " /dev/null " + "\"" + file + "\"";
-                    self.noIndex = " --no-index "
+                    self.gitFile = " /dev/null " + file;
+                    self.noIndex = " --no-index ";
+                    if (self.gitDiffOpts == "--cached") {
+                        self.gitDiffOpts = "";
+                    } 
                 }
                 if (self.gitCmd) {
                     var fullCmd = self.gitCmd;