Merge branch 'release/v2025.31'

Author: love-linger

TRANSLATION.md

@@ -1 +1 @@
-2025.30
+2025.31

VERSION

@@ -1,6 +1,8 @@
 using System;
 using System.Windows.Input;
+
 using Avalonia.Controls;
+using Avalonia.Controls.ApplicationLifetimes;
 
 namespace SourceGit
 {
@@ -53,5 +55,17 @@ public static bool IsCheckForUpdateCommandVisible
             else if (!string.IsNullOrEmpty(textBlock.Text))
                 await CopyTextAsync(textBlock.Text);
         });
+
+        public static readonly Command HideAppCommand = new Command(_ =>
+        {
+            if (Current is App app && app.TryGetFeature(typeof(IActivatableLifetime)) is IActivatableLifetime lifetime)
+                lifetime.TryEnterBackground();
+        });
+
+        public static readonly Command ShowAppCommand = new Command(_ =>
+        {
+            if (Current is App app && app.TryGetFeature(typeof(IActivatableLifetime)) is IActivatableLifetime lifetime)
+                lifetime.TryLeaveBackground();
+        });
     }
 }

src/App.Commands.cs

@@ -42,6 +42,9 @@
       <NativeMenuItem Header="{DynamicResource Text.Preferences}" Command="{x:Static s:App.OpenPreferencesCommand}" Gesture="⌘+,"/>
       <NativeMenuItem Header="{DynamicResource Text.OpenAppDataDir}" Command="{x:Static s:App.OpenAppDataDirCommand}"/>
       <NativeMenuItemSeparator/>
+      <NativeMenuItem Header="{DynamicResource Text.App.Hide}" Command="{x:Static s:App.HideAppCommand}" Gesture="⌘+H"/>
+      <NativeMenuItem Header="{DynamicResource Text.App.ShowAll}" Command="{x:Static s:App.ShowAppCommand}"/>
+      <NativeMenuItemSeparator/>
       <NativeMenuItem Header="{DynamicResource Text.Quit}" Command="{x:Static s:App.QuitCommand}" Gesture="⌘+Q"/>
     </NativeMenu>
   </NativeMenu.Menu>

src/App.axaml

@@ -158,13 +158,12 @@ public static void ShowWindow(object data)
             }
         }
 
-        public static async Task<bool> AskConfirmAsync(string message, Action onSure)
+        public static async Task<bool> AskConfirmAsync(string message)
         {
             if (Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime { MainWindow: { } owner })
             {
                 var confirm = new Views.Confirm();
                 confirm.Message.Text = message;
-                confirm.OnSure = onSure;
                 return await confirm.ShowDialog<bool>(owner);
             }
 
@@ -578,7 +577,7 @@ private void TryOpenRepository(string repo)
         {
             if (!string.IsNullOrEmpty(repo) && Directory.Exists(repo))
             {
-                var test = new Commands.QueryRepositoryRootPath(repo).GetResultAsync().Result;
+                var test = new Commands.QueryRepositoryRootPath(repo).GetResult();
                 if (test.IsSuccess && !string.IsNullOrEmpty(test.StdOut))
                 {
                     Dispatcher.UIThread.Invoke(() =>

src/App.axaml.cs

@@ -37,19 +37,6 @@ public enum EditorType
         public bool RaiseError { get; set; } = true;
         public Models.ICommandLog Log { get; set; } = null;
 
-        public void Exec()
-        {
-            try
-            {
-                var start = CreateGitStartInfo(false);
-                Process.Start(start);
-            }
-            catch (Exception ex)
-            {
-                App.RaiseException(Context, ex.Message);
-            }
-        }
-
         public async Task<bool> ExecAsync()
         {
             Log?.AppendLine($"$ git {Args}\n");
@@ -127,6 +114,28 @@ public async Task<bool> ExecAsync()
             return true;
         }
 
+        protected Result ReadToEnd()
+        {
+            using var proc = new Process() { StartInfo = CreateGitStartInfo(true) };
+
+            try
+            {
+                proc.Start();
+            }
+            catch (Exception e)
+            {
+                return Result.Failed(e.Message);
+            }
+
+            var rs = new Result() { IsSuccess = true };
+            rs.StdOut = proc.StandardOutput.ReadToEnd();
+            rs.StdErr = proc.StandardError.ReadToEnd();
+            proc.WaitForExit();
+
+            rs.IsSuccess = proc.ExitCode == 0;
+            return rs;
+        }
+
         protected async Task<Result> ReadToEndAsync()
         {
             using var proc = new Process() { StartInfo = CreateGitStartInfo(true) };
@@ -149,7 +158,7 @@ protected async Task<Result> ReadToEndAsync()
             return rs;
         }
 
-        private ProcessStartInfo CreateGitStartInfo(bool redirect)
+        protected ProcessStartInfo CreateGitStartInfo(bool redirect)
         {
             var start = new ProcessStartInfo();
             start.FileName = Native.OS.GitExecutable;
@@ -167,8 +176,10 @@ private ProcessStartInfo CreateGitStartInfo(bool redirect)
             // Force using this app as SSH askpass program
             var selfExecFile = Process.GetCurrentProcess().MainModule!.FileName;
             start.Environment.Add("SSH_ASKPASS", selfExecFile); // Can not use parameter here, because it invoked by SSH with `exec`
-            start.Environment.Add("SSH_ASKPASS_REQUIRE", "force");
+            start.Environment.Add("SSH_ASKPASS_REQUIRE", "prefer");
             start.Environment.Add("SOURCEGIT_LAUNCH_AS_ASKPASS", "TRUE");
+            if (!OperatingSystem.IsLinux())
+                start.Environment.Add("DISPLAY", "required");
 
             // If an SSH private key was provided, sets the environment.
             if (!start.Environment.ContainsKey("GIT_SSH_COMMAND") && !string.IsNullOrEmpty(SSHKey))

src/Commands/Command.cs

@@ -20,6 +20,26 @@ public Config(string repository)
             }
         }
 
+        public Dictionary<string, string> ReadAll()
+        {
+            Args = "config -l";
+
+            var output = ReadToEnd();
+            var rs = new Dictionary<string, string>();
+            if (output.IsSuccess)
+            {
+                var lines = output.StdOut.Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries);
+                foreach (var line in lines)
+                {
+                    var parts = line.Split('=', 2);
+                    if (parts.Length == 2)
+                        rs[parts[0]] = parts[1];
+                }
+            }
+
+            return rs;
+        }
+
         public async Task<Dictionary<string, string>> ReadAllAsync()
         {
             Args = "config -l";
@@ -40,6 +60,12 @@ public async Task<Dictionary<string, string>> ReadAllAsync()
             return rs;
         }
 
+        public string Get(string key)
+        {
+            Args = $"config {key}";
+            return ReadToEnd().StdOut.Trim();
+        }
+
         public async Task<string> GetAsync(string key)
         {
             Args = $"config {key}";

src/Commands/Config.cs

@@ -1,4 +1,7 @@
-namespace SourceGit.Commands
+using System;
+using System.Diagnostics;
+
+namespace SourceGit.Commands
 {
     public class DiffTool : Command
     {
@@ -28,7 +31,14 @@ public void Open()
                 Args = $"-c difftool.sourcegit.cmd={cmd.Quoted()} difftool --tool=sourcegit --no-prompt {_option}";
             }
 
-            Exec();
+            try
+            {
+                Process.Start(CreateGitStartInfo(false));
+            }
+            catch (Exception ex)
+            {
+                App.RaiseException(Context, ex.Message);
+            }
         }
 
         private Models.DiffOption _option;

src/Commands/DiffTool.cs

@@ -21,7 +21,6 @@ public Fetch(string repo, string remote, bool noTags, bool force)
                 Args += "--force ";
 
             Args += remote;
-
         }
 
         public Fetch(string repo, Models.Branch local, Models.Branch remote)

src/Commands/Fetch.cs

@@ -11,6 +11,17 @@ public IsBareRepository(string path)
             Args = "rev-parse --is-bare-repository";
         }
 
+        public bool GetResult()
+        {
+            if (!Directory.Exists(Path.Combine(WorkingDirectory, "refs")) ||
+                !Directory.Exists(Path.Combine(WorkingDirectory, "objects")) ||
+                !File.Exists(Path.Combine(WorkingDirectory, "HEAD")))
+                return false;
+
+            var rs = ReadToEnd();
+            return rs.IsSuccess && rs.StdOut.Trim() == "true";
+        }
+
         public async Task<bool> GetResultAsync()
         {
             if (!Directory.Exists(Path.Combine(WorkingDirectory, "refs")) ||