Merge pull request #12 from intersystems/fix-git-push-tim

Properly use ssh when possible

Author: isc-svelury

cls/SourceControl/Git/Utils.cls

@@ -79,6 +79,11 @@ ClassMethod GitUserEmail() As %String
     Quit $Get(@..#Storage@("settings","user",$username,"gitUserEmail"))
 }
 
+ClassMethod PrivateKeyFile() As %String
+{
+    Quit $Get(@..#Storage@("settings","ssh","privateKeyFile"))
+}
+
 ClassMethod NeedSettings() As %Boolean [ CodeMode = expression ]
 {
 (..DefaultTemp() = "") ||  (..GitBinPath() = "") ||  (..GitBinPath() = """")
@@ -110,6 +115,7 @@ ClassMethod UpdateSettings(ByRef settings) As %Status
     set @..#Storage@("settings","groupByFolder") = $case(settings("groupByFolder"), "":"", :1)
     set @..#Storage@("settings","user",$username,"gitUserName") = settings("gitUserName")
     set @..#Storage@("settings","user",$username,"gitUserEmail") = settings("gitUserEmail")
+    set @..#Storage@("settings","ssh","privateKeyFile") = settings("privateKeyFile")
 
     quit $$$OK
 }
@@ -282,10 +288,11 @@ ClassMethod Commit(InternalName As %String, Message As %String = "example commit
 	quit $$$OK
 }
 
-ClassMethod Push() As %Status
+ClassMethod Push(remote As %String = "origin") As %Status
 {
-	do ..RunGitCommand("push", .errStream, .outStream)
-	w "git push"
+    do ##class(SourceControl.Git.Utils).RunGitCommandWithInput("branch",,.errStream,.outstream,"--show-current")
+    set branchName = outstream.ReadLine(outstream.Size)
+	do ..RunGitWithArgs(.errStream, .outStream, "push", remote, branchName)
 	do errStream.OutputToDevice()
 	do outStream.OutputToDevice()
 	quit $$$OK
@@ -303,6 +310,8 @@ ClassMethod Fetch(ByRef diffFiles) As %Status
     while (outStream.AtEnd = 0) {
         set diffFiles = diffFiles_$lb(outStream.ReadLine())
     }
+    do outStream.Rewind()
+    do outStream.OutputToDevice()
 	quit $$$OK
 }
 
@@ -311,33 +320,6 @@ ClassMethod Pull() As %Status
 	quit $$$OK
 }
 
-ClassMethod ConfigureGitAuthentication(Username As %String, Password As %String)
-{
-	//git config credential.helper store
-	//write !,"git config --system credential.helper manager"
-	//git config credential.helper '!f() { printf "%s\n" "username=$USER" "password=$PASS"; };f'
-	do ..RunGitCommand("config", .errStream, .outStream, "--global", "credential.helper", "store")
-	do errStream.OutputToDevice()
-	do outStream.OutputToDevice()
-	/*
-	write !,"git config --global credential.modalPrompt false"
-	do ..RunGitCommand("config", .errStream, .outStream, "--global","credential.modalPrompt", "false")
-	do errStream.OutputToDevice()
-	do outStream.OutputToDevice()
-	*/
-	/*
-	set file = ##class(%Stream.FileCharacter).%New()
-	do file.WriteLine(Username)
-	do file.WriteLine(Password)
-	$$$ThrowOnError(file.%Save())
-	set file.RemoveOnClose = 1
-	*/
-	write !,"git fetch"
-	do ..RunGitCommand("fetch", .errStream, .outStream)
-	do errStream.OutputToDevice()
-	do outStream.OutputToDevice()
-}
-
 ClassMethod IsNamespaceInGit() As %Boolean [ CodeMode = expression ]
 {
 ##class(%File).Exists(..TempFolder()_".git")
@@ -1093,6 +1075,17 @@ ClassMethod RunGitCommandWithInput(command As %String, inFile As %String = "", O
 	set newArgs($i(newArgs)) = "-C"
     set newArgs($i(newArgs)) = ..TempFolder()
 
+    set privateKeyFile = ..PrivateKeyFile()
+    if (privateKeyFile '= "") {
+        if $$$isWINDOWS {
+            // Escape slashes
+            set privateKeyFile = $Replace(privateKeyFile,"\","\\")
+        }
+        set newArgs($i(newArgs)) = "-c"
+        // StrictHostKeyChecking=accept-new for good behavior on first connection
+        set newArgs($i(newArgs)) = "core.sshCommand=ssh -F /dev/null -o StrictHostKeyChecking=accept-new -i "_privateKeyFile
+    }
+
     set username = ..GitUserName()
 	set email = ..GitUserEmail()
 
@@ -1110,10 +1103,12 @@ ClassMethod RunGitCommandWithInput(command As %String, inFile As %String = "", O
         }
 
     }
-    
+
     set outLog = ##class(%Library.File).TempFilename()
     set errLog = ##class(%Library.File).TempFilename()
+
     set returnCode = $zf(-100,"/STDOUT="_$$$QUOTE(outLog)_" /STDERR="_$$$QUOTE(errLog)_$Case(inFile, "":"", :" /STDIN="_inFile),"git",newArgs...)
+
     set errStream = ##class(%Stream.FileCharacter).%OpenId(errLog,,.sc)
     set outStream = ##class(%Stream.FileCharacter).%OpenId(outLog,,.sc)
     for stream=errStream,outStream {
@@ -1306,3 +1301,4 @@ ClassMethod NameToInternalName(Name, IgnorePercent = 1, IgnoreNonexistent = 1) A
 }
 
 }
+

csp/gitprojectsettings.csp

@@ -20,7 +20,7 @@
  set $namespace = namespace
  if $Data(%request.Data("gitsettings",1)) {
      kill settings
-     for param="gitBinPath","defaultTemp","namespaceTemp","groupByFolder","gitUserName","gitUserEmail" {
+     for param="gitBinPath","defaultTemp","namespaceTemp","groupByFolder","privateKeyFile","gitUserName","gitUserEmail" {
          set settings(param) = $Get(%request.Data(param,1))
      } 
      do ##class(SourceControl.Git.Utils).UpdateSettings(.settings)
@@ -29,6 +29,7 @@
  set defaultTemp = ##class(SourceControl.Git.Utils).DefaultTemp()
  set namespaceTemp = ##class(SourceControl.Git.Utils).TempFolder()
  set groupByFolder = ##class(SourceControl.Git.Utils).GroupByFolder()
+ set privateKeyFile = ##class(SourceControl.Git.Utils).PrivateKeyFile()
  set gitUserName = ##class(SourceControl.Git.Utils).GitUserName()
  set gitUserEmail = ##class(SourceControl.Git.Utils).GitUserEmail()
  set:defaultTemp="" defaultTemp =  "c:\temp\"
@@ -65,6 +66,13 @@
             </div>
         </div>
 
+        <div class="form-group row">
+            <label for="privateKeyFile" class="col-sm-4 col-form-label">SSH Private Key File</label>
+            <div class="col-sm-8">
+                <input type="text" class="form-control" id="privateKeyFile" name="privateKeyFile" value='#(..EscapeHTML(privateKeyFile))#'/>
+            </div>
+        </div>
+
         <!--
         <div class="form-group row">
             <label for="groupByFolder" class="col-sm-4 col-form-label">Group all items by folders</label>