Merge branch 'release/v8.28'

Author: love-linger

README.md

@@ -7,7 +7,7 @@ Opensource Git GUI client.
 * Supports Windows/macOS/Linux
 * Opensource/Free
 * Fast
-* English/German/Português/简体中文/繁體中文
+* English/Français/Deutsch/Português/简体中文/繁體中文
 * Built-in light/dark themes
 * Customize theme
 * Visual commit graph

VERSION

@@ -1 +1 @@
-8.27
+8.28

screenshots/theme_dark.png

@@ -43,7 +43,7 @@ public ParameterCommand(Action<object> action)
 
             private Action<object> _action = null;
         }
-        
+
         public static readonly SimpleCommand OpenPreferenceCommand = new SimpleCommand(() => OpenDialog(new Views.Preference()));
         public static readonly SimpleCommand OpenHotkeysCommand = new SimpleCommand(() => OpenDialog(new Views.Hotkeys()));
         public static readonly SimpleCommand OpenAppDataDirCommand = new SimpleCommand(() => Native.OS.OpenInFileManager(Native.OS.DataDir));

screenshots/theme_light.png

@@ -22,7 +22,6 @@
 
   <Application.Styles>
     <FluentTheme />
-    <StyleInclude Source="avares://Avalonia.Controls.DataGrid/Themes/Fluent.xaml"/>
     <StyleInclude Source="avares://AvaloniaEdit/Themes/Fluent/AvaloniaEdit.xaml" />
     <StyleInclude Source="/Resources/Styles.axaml"/>
   </Application.Styles>

src/App.Commands.cs

@@ -98,7 +98,7 @@ public override void OnFrameworkInitializationCompleted()
 
         public static void OpenDialog(Window window)
         {
-            if (Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime { MainWindow: { } owner})
+            if (Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime { MainWindow: { } owner })
                 window.ShowDialog(owner);
         }
 

src/App.axaml

@@ -58,7 +58,7 @@ public bool UseMine(List<string> files)
 
         public bool FileWithRevision(string file, string revision)
         {
-            Args = $"checkout {revision} -- \"{file}\"";
+            Args = $"checkout --no-overlay {revision} -- \"{file}\"";
             return Exec();
         }
 

src/App.axaml.cs

@@ -2,12 +2,12 @@
 {
     public class CherryPick : Command
     {
-        public CherryPick(string repo, string commit, bool noCommit)
+        public CherryPick(string repo, string commits, bool noCommit)
         {
             var mode = noCommit ? "-n" : "--ff";
             WorkingDirectory = repo;
             Context = repo;
-            Args = $"cherry-pick {mode} {commit}";
+            Args = $"cherry-pick {mode} {commits}";
         }
     }
 }

src/Commands/Checkout.cs

@@ -17,8 +17,9 @@ public class CancelToken
 
         public class ReadToEndResult
         {
-            public bool IsSuccess { get; set; }
-            public string StdOut { get; set; }
+            public bool IsSuccess { get; set; } = false;
+            public string StdOut { get; set; } = "";
+            public string StdErr { get; set; } = "";
         }
 
         public enum EditorType
@@ -198,18 +199,20 @@ public ReadToEndResult ReadToEnd()
             {
                 proc.Start();
             }
-            catch
+            catch (Exception e)
             {
                 return new ReadToEndResult()
                 {
                     IsSuccess = false,
                     StdOut = string.Empty,
+                    StdErr = e.Message,
                 };
             }
 
             var rs = new ReadToEndResult()
             {
                 StdOut = proc.StandardOutput.ReadToEnd(),
+                StdErr = proc.StandardError.ReadToEnd(),
             };
 
             proc.WaitForExit();