mirror of
https://github.com/sourcegit-scm/sourcegit.git
synced 2024-12-25 21:07:20 -08:00
code_style: move the code to initialize informations to spawn git sub-process to function Models.Command.CreateGitStartInfo
This commit is contained in:
leo
parent
a8685f2047
commit
28c59ee0ab
1 changed files with 65 additions and 67 deletions
|
|
@ -40,59 +40,7 @@ namespace SourceGit.Commands
|
||||||
|
|
||||||
public bool Exec()
|
public bool Exec()
|
||||||
{
|
{
|
||||||
var start = new ProcessStartInfo();
|
var start = CreateGitStartInfo();
|
||||||
start.FileName = Native.OS.GitExecutable;
|
|
||||||
start.Arguments = "--no-pager -c core.quotepath=off -c credential.helper=manager ";
|
|
||||||
start.UseShellExecute = false;
|
|
||||||
start.CreateNoWindow = true;
|
|
||||||
start.RedirectStandardOutput = true;
|
|
||||||
start.RedirectStandardError = true;
|
|
||||||
start.StandardOutputEncoding = Encoding.UTF8;
|
|
||||||
start.StandardErrorEncoding = Encoding.UTF8;
|
|
||||||
|
|
||||||
// Force using this app as SSH askpass program
|
|
||||||
var selfExecFile = Process.GetCurrentProcess().MainModule!.FileName;
|
|
||||||
if (!OperatingSystem.IsLinux())
|
|
||||||
start.Environment.Add("DISPLAY", "required");
|
|
||||||
start.Environment.Add("SSH_ASKPASS", selfExecFile); // Can not use parameter here, because it invoked by SSH with `exec`
|
|
||||||
start.Environment.Add("SSH_ASKPASS_REQUIRE", "prefer");
|
|
||||||
start.Environment.Add("SOURCEGIT_LAUNCH_AS_ASKPASS", "TRUE");
|
|
||||||
|
|
||||||
// If an SSH private key was provided, sets the environment.
|
|
||||||
if (!string.IsNullOrEmpty(SSHKey))
|
|
||||||
start.Environment.Add("GIT_SSH_COMMAND", $"ssh -o StrictHostKeyChecking=accept-new -i '{SSHKey}'");
|
|
||||||
else
|
|
||||||
start.Environment.Add("GIT_SSH_COMMAND", $"ssh -o StrictHostKeyChecking=accept-new");
|
|
||||||
|
|
||||||
// Force using en_US.UTF-8 locale to avoid GCM crash
|
|
||||||
if (OperatingSystem.IsLinux())
|
|
||||||
start.Environment.Add("LANG", "en_US.UTF-8");
|
|
||||||
|
|
||||||
// Fix sometimes `LSEnvironment` not working on macOS
|
|
||||||
if (OperatingSystem.IsMacOS())
|
|
||||||
start.Environment.Add("PATH", "/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin");
|
|
||||||
|
|
||||||
// Force using this app as git editor.
|
|
||||||
switch (Editor)
|
|
||||||
{
|
|
||||||
case EditorType.CoreEditor:
|
|
||||||
start.Arguments += $"-c core.editor=\"\\\"{selfExecFile}\\\" --core-editor\" ";
|
|
||||||
break;
|
|
||||||
case EditorType.RebaseEditor:
|
|
||||||
start.Arguments += $"-c core.editor=\"\\\"{selfExecFile}\\\" --rebase-message-editor\" -c sequence.editor=\"\\\"{selfExecFile}\\\" --rebase-todo-editor\" -c rebase.abbreviateCommands=true ";
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
start.Arguments += "-c core.editor=true ";
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Append command args
|
|
||||||
start.Arguments += Args;
|
|
||||||
|
|
||||||
// Working directory
|
|
||||||
if (!string.IsNullOrEmpty(WorkingDirectory))
|
|
||||||
start.WorkingDirectory = WorkingDirectory;
|
|
||||||
|
|
||||||
var errs = new List<string>();
|
var errs = new List<string>();
|
||||||
var proc = new Process() { StartInfo = start };
|
var proc = new Process() { StartInfo = start };
|
||||||
var isCancelled = false;
|
var isCancelled = false;
|
||||||
|
|
@ -186,20 +134,9 @@ namespace SourceGit.Commands
|
||||||
|
|
||||||
public ReadToEndResult ReadToEnd()
|
public ReadToEndResult ReadToEnd()
|
||||||
{
|
{
|
||||||
var start = new ProcessStartInfo();
|
var start = CreateGitStartInfo();
|
||||||
start.FileName = Native.OS.GitExecutable;
|
|
||||||
start.Arguments = "--no-pager -c core.quotepath=off " + Args;
|
|
||||||
start.UseShellExecute = false;
|
|
||||||
start.CreateNoWindow = true;
|
|
||||||
start.RedirectStandardOutput = true;
|
|
||||||
start.RedirectStandardError = true;
|
|
||||||
start.StandardOutputEncoding = Encoding.UTF8;
|
|
||||||
start.StandardErrorEncoding = Encoding.UTF8;
|
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(WorkingDirectory))
|
|
||||||
start.WorkingDirectory = WorkingDirectory;
|
|
||||||
|
|
||||||
var proc = new Process() { StartInfo = start };
|
var proc = new Process() { StartInfo = start };
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
proc.Start();
|
proc.Start();
|
||||||
|
|
@ -227,7 +164,68 @@ namespace SourceGit.Commands
|
||||||
return rs;
|
return rs;
|
||||||
}
|
}
|
||||||
|
|
||||||
protected virtual void OnReadline(string line) { }
|
protected virtual void OnReadline(string line)
|
||||||
|
{
|
||||||
|
// Implemented by derived class
|
||||||
|
}
|
||||||
|
|
||||||
|
private ProcessStartInfo CreateGitStartInfo()
|
||||||
|
{
|
||||||
|
var start = new ProcessStartInfo();
|
||||||
|
start.FileName = Native.OS.GitExecutable;
|
||||||
|
start.Arguments = "--no-pager -c core.quotepath=off -c credential.helper=manager ";
|
||||||
|
start.UseShellExecute = false;
|
||||||
|
start.CreateNoWindow = true;
|
||||||
|
start.RedirectStandardOutput = true;
|
||||||
|
start.RedirectStandardError = true;
|
||||||
|
start.StandardOutputEncoding = Encoding.UTF8;
|
||||||
|
start.StandardErrorEncoding = Encoding.UTF8;
|
||||||
|
|
||||||
|
// Force using this app as SSH askpass program
|
||||||
|
var selfExecFile = Process.GetCurrentProcess().MainModule!.FileName;
|
||||||
|
if (!OperatingSystem.IsLinux())
|
||||||
|
start.Environment.Add("DISPLAY", "required");
|
||||||
|
start.Environment.Add("SSH_ASKPASS", selfExecFile); // Can not use parameter here, because it invoked by SSH with `exec`
|
||||||
|
start.Environment.Add("SSH_ASKPASS_REQUIRE", "prefer");
|
||||||
|
start.Environment.Add("SOURCEGIT_LAUNCH_AS_ASKPASS", "TRUE");
|
||||||
|
|
||||||
|
// If an SSH private key was provided, sets the environment.
|
||||||
|
if (!string.IsNullOrEmpty(SSHKey))
|
||||||
|
start.Environment.Add("GIT_SSH_COMMAND", $"ssh -o StrictHostKeyChecking=accept-new -i '{SSHKey}'");
|
||||||
|
else
|
||||||
|
start.Environment.Add("GIT_SSH_COMMAND", $"ssh -o StrictHostKeyChecking=accept-new");
|
||||||
|
|
||||||
|
// Force using en_US.UTF-8 locale to avoid GCM crash
|
||||||
|
if (OperatingSystem.IsLinux())
|
||||||
|
start.Environment.Add("LANG", "en_US.UTF-8");
|
||||||
|
|
||||||
|
// Fix sometimes `LSEnvironment` not working on macOS
|
||||||
|
if (OperatingSystem.IsMacOS())
|
||||||
|
start.Environment.Add("PATH", "/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin");
|
||||||
|
|
||||||
|
// Force using this app as git editor.
|
||||||
|
switch (Editor)
|
||||||
|
{
|
||||||
|
case EditorType.CoreEditor:
|
||||||
|
start.Arguments += $"-c core.editor=\"\\\"{selfExecFile}\\\" --core-editor\" ";
|
||||||
|
break;
|
||||||
|
case EditorType.RebaseEditor:
|
||||||
|
start.Arguments += $"-c core.editor=\"\\\"{selfExecFile}\\\" --rebase-message-editor\" -c sequence.editor=\"\\\"{selfExecFile}\\\" --rebase-todo-editor\" -c rebase.abbreviateCommands=true ";
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
start.Arguments += "-c core.editor=true ";
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Append command args
|
||||||
|
start.Arguments += Args;
|
||||||
|
|
||||||
|
// Working directory
|
||||||
|
if (!string.IsNullOrEmpty(WorkingDirectory))
|
||||||
|
start.WorkingDirectory = WorkingDirectory;
|
||||||
|
|
||||||
|
return start;
|
||||||
|
}
|
||||||
|
|
||||||
[GeneratedRegex(@"\d+%")]
|
[GeneratedRegex(@"\d+%")]
|
||||||
private static partial Regex REG_PROGRESS();
|
private static partial Regex REG_PROGRESS();
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue