Merge branch 'release/v2025.20'

Author: love-linger

README.md

@@ -54,7 +54,7 @@ You can find the current translation status in [TRANSLATION.md](https://github.c
 
 ## How to Use
 
-**To use this tool, you need to install Git(>=2.23.0) first.**
+**To use this tool, you need to install Git(>=2.25.1) first.**
 
 You can download the latest stable from [Releases](https://github.com/sourcegit-scm/sourcegit/releases/latest) or download workflow artifacts from [Github Actions](https://github.com/sourcegit-scm/sourcegit/actions) to try this app based on latest commits.
 

TRANSLATION.md

@@ -6,7 +6,7 @@ This document shows the translation status of each locale file in the repository
 
 ### ![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)
 
-### ![de__DE](https://img.shields.io/badge/de__DE-96.75%25-yellow)
+### ![de__DE](https://img.shields.io/badge/de__DE-96.50%25-yellow)
 
 <details>
 <summary>Missing keys in de_DE.axaml</summary>
@@ -26,6 +26,7 @@ This document shows the translation status of each locale file in the repository
 - Text.Launcher.Workspaces
 - Text.Launcher.Pages
 - Text.Pull.RecurseSubmodules
+- Text.Repository.ClearStashes
 - Text.Repository.ShowSubmodulesAsTree
 - Text.ResetWithoutCheckout
 - Text.ResetWithoutCheckout.MoveTo
@@ -37,19 +38,13 @@ This document shows the translation status of each locale file in the repository
 - Text.Submodule.Status.RevisionChanged
 - Text.Submodule.Status.Unmerged
 - Text.Submodule.URL
+- Text.WorkingCopy.ResetAuthor
 
 </details>
 
-### ![es__ES](https://img.shields.io/badge/es__ES-99.87%25-yellow)
+### ![es__ES](https://img.shields.io/badge/es__ES-%E2%88%9A-brightgreen)
 
-<details>
-<summary>Missing keys in es_ES.axaml</summary>
-
-- Text.CreateBranch.OverwriteExisting
-
-</details>
-
-### ![fr__FR](https://img.shields.io/badge/fr__FR-92.62%25-yellow)
+### ![fr__FR](https://img.shields.io/badge/fr__FR-92.38%25-yellow)
 
 <details>
 <summary>Missing keys in fr_FR.axaml</summary>
@@ -90,6 +85,7 @@ This document shows the translation status of each locale file in the repository
 - Text.Repository.BranchSort
 - Text.Repository.BranchSort.ByCommitterDate
 - Text.Repository.BranchSort.ByName
+- Text.Repository.ClearStashes
 - Text.Repository.Search.ByContent
 - Text.Repository.ShowSubmodulesAsTree
 - Text.Repository.ViewLogs
@@ -113,10 +109,11 @@ This document shows the translation status of each locale file in the repository
 - Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts
 - Text.WorkingCopy.Conflicts.UseMine
 - Text.WorkingCopy.Conflicts.UseTheirs
+- Text.WorkingCopy.ResetAuthor
 
 </details>
 
-### ![it__IT](https://img.shields.io/badge/it__IT-98.00%25-yellow)
+### ![it__IT](https://img.shields.io/badge/it__IT-97.75%25-yellow)
 
 <details>
 <summary>Missing keys in it_IT.axaml</summary>
@@ -133,14 +130,16 @@ This document shows the translation status of each locale file in the repository
 - Text.Launcher.Workspaces
 - Text.Launcher.Pages
 - Text.Pull.RecurseSubmodules
+- Text.Repository.ClearStashes
 - Text.ResetWithoutCheckout
 - Text.ResetWithoutCheckout.MoveTo
 - Text.ResetWithoutCheckout.Target
 - Text.Submodule.Deinit
+- Text.WorkingCopy.ResetAuthor
 
 </details>
 
-### ![ja__JP](https://img.shields.io/badge/ja__JP-92.37%25-yellow)
+### ![ja__JP](https://img.shields.io/badge/ja__JP-92.01%25-yellow)
 
 <details>
 <summary>Missing keys in ja_JP.axaml</summary>
@@ -152,6 +151,7 @@ This document shows the translation status of each locale file in the repository
 - Text.Bisect.Good
 - Text.Bisect.Skip
 - Text.Bisect.WaitingForRange
+- Text.BranchCM.CompareWithCurrent
 - Text.BranchCM.ResetToSelectedCommit
 - Text.Checkout.RecurseSubmodules
 - Text.CommitCM.CopyAuthor
@@ -181,6 +181,7 @@ This document shows the translation status of each locale file in the repository
 - Text.Repository.BranchSort
 - Text.Repository.BranchSort.ByCommitterDate
 - Text.Repository.BranchSort.ByName
+- Text.Repository.ClearStashes
 - Text.Repository.FilterCommits
 - Text.Repository.Search.ByContent
 - Text.Repository.ShowSubmodulesAsTree
@@ -206,10 +207,11 @@ This document shows the translation status of each locale file in the repository
 - Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts
 - Text.WorkingCopy.Conflicts.UseMine
 - Text.WorkingCopy.Conflicts.UseTheirs
+- Text.WorkingCopy.ResetAuthor
 
 </details>
 
-### ![pt__BR](https://img.shields.io/badge/pt__BR-84.23%25-yellow)
+### ![pt__BR](https://img.shields.io/badge/pt__BR-84.02%25-yellow)
 
 <details>
 <summary>Missing keys in pt_BR.axaml</summary>
@@ -294,6 +296,7 @@ This document shows the translation status of each locale file in the repository
 - Text.Repository.BranchSort
 - Text.Repository.BranchSort.ByCommitterDate
 - Text.Repository.BranchSort.ByName
+- Text.Repository.ClearStashes
 - Text.Repository.FilterCommits
 - Text.Repository.HistoriesLayout
 - Text.Repository.HistoriesLayout.Horizontal
@@ -339,13 +342,23 @@ This document shows the translation status of each locale file in the repository
 - Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts
 - Text.WorkingCopy.Conflicts.UseMine
 - Text.WorkingCopy.Conflicts.UseTheirs
+- Text.WorkingCopy.ResetAuthor
 - Text.WorkingCopy.SignOff
 
 </details>
 
-### ![ru__RU](https://img.shields.io/badge/ru__RU-%E2%88%9A-brightgreen)
+### ![ru__RU](https://img.shields.io/badge/ru__RU-99.63%25-yellow)
+
+<details>
+<summary>Missing keys in ru_RU.axaml</summary>
+
+- Text.BranchCM.CompareWithCurrent
+- Text.Repository.ClearStashes
+- Text.WorkingCopy.ResetAuthor
+
+</details>
 
-### ![ta__IN](https://img.shields.io/badge/ta__IN-92.62%25-yellow)
+### ![ta__IN](https://img.shields.io/badge/ta__IN-92.26%25-yellow)
 
 <details>
 <summary>Missing keys in ta_IN.axaml</summary>
@@ -357,6 +370,7 @@ This document shows the translation status of each locale file in the repository
 - Text.Bisect.Good
 - Text.Bisect.Skip
 - Text.Bisect.WaitingForRange
+- Text.BranchCM.CompareWithCurrent
 - Text.BranchCM.ResetToSelectedCommit
 - Text.Checkout.RecurseSubmodules
 - Text.CommitCM.CopyAuthor
@@ -386,6 +400,7 @@ This document shows the translation status of each locale file in the repository
 - Text.Repository.BranchSort
 - Text.Repository.BranchSort.ByCommitterDate
 - Text.Repository.BranchSort.ByName
+- Text.Repository.ClearStashes
 - Text.Repository.Search.ByContent
 - Text.Repository.ShowSubmodulesAsTree
 - Text.Repository.ViewLogs
@@ -409,10 +424,11 @@ This document shows the translation status of each locale file in the repository
 - Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts
 - Text.WorkingCopy.Conflicts.UseMine
 - Text.WorkingCopy.Conflicts.UseTheirs
+- Text.WorkingCopy.ResetAuthor
 
 </details>
 
-### ![uk__UA](https://img.shields.io/badge/uk__UA-93.74%25-yellow)
+### ![uk__UA](https://img.shields.io/badge/uk__UA-93.51%25-yellow)
 
 <details>
 <summary>Missing keys in uk_UA.axaml</summary>
@@ -449,6 +465,7 @@ This document shows the translation status of each locale file in the repository
 - Text.Repository.BranchSort
 - Text.Repository.BranchSort.ByCommitterDate
 - Text.Repository.BranchSort.ByName
+- Text.Repository.ClearStashes
 - Text.Repository.Search.ByContent
 - Text.Repository.ShowSubmodulesAsTree
 - Text.Repository.ViewLogs
@@ -467,6 +484,7 @@ This document shows the translation status of each locale file in the repository
 - Text.ViewLogs.Clear
 - Text.ViewLogs.CopyLog
 - Text.ViewLogs.Delete
+- Text.WorkingCopy.ResetAuthor
 
 </details>
 

VERSION

@@ -1 +1 @@
-2025.19
+2025.20

src/App.axaml.cs

@@ -393,7 +393,17 @@ public override void OnFrameworkInitializationCompleted()
                 _ipcChannel = new Models.IpcChannel();
                 if (!_ipcChannel.IsFirstInstance)
                 {
-                    _ipcChannel.SendToFirstInstance(desktop.Args is { Length: 1 } ? desktop.Args[0] : string.Empty);
+                    var arg = desktop.Args is { Length: > 0 } ? desktop.Args[0].Trim() : string.Empty;
+                    if (!string.IsNullOrEmpty(arg))
+                    {
+                        if (arg.StartsWith('"') && arg.EndsWith('"'))
+                            arg = arg.Substring(1, arg.Length - 2).Trim();
+
+                        if (arg.Length > 0 && !Path.IsPathFullyQualified(arg))
+                            arg = Path.GetFullPath(arg);
+                    }
+
+                    _ipcChannel.SendToFirstInstance(arg);
                     Environment.Exit(0);
                 }
                 else

src/Commands/Add.cs

@@ -1,7 +1,4 @@
-using System.Collections.Generic;
-using System.Text;
-
-namespace SourceGit.Commands
+namespace SourceGit.Commands
 {
     public class Add : Command
     {
@@ -12,20 +9,11 @@ public Add(string repo, bool includeUntracked)
             Args = includeUntracked ? "add ." : "add -u .";
         }
 
-        public Add(string repo, List<string> changes)
+        public Add(string repo, Models.Change change)
         {
             WorkingDirectory = repo;
             Context = repo;
-
-            var builder = new StringBuilder();
-            builder.Append("add --");
-            foreach (var c in changes)
-            {
-                builder.Append(" \"");
-                builder.Append(c);
-                builder.Append("\"");
-            }
-            Args = builder.ToString();
+            Args = $"add -- \"{change.Path}\"";
         }
 
         public Add(string repo, string pathspecFromFile)

src/Commands/Checkout.cs

@@ -27,9 +27,9 @@ public bool Branch(string branch, string basedOn, bool force, bool allowOverwrit
         {
             var builder = new StringBuilder();
             builder.Append("checkout --progress ");
-            builder.Append(allowOverwrite ? "-B " : "-b ");
             if (force)
                 builder.Append("--force ");
+            builder.Append(allowOverwrite ? "-B " : "-b ");
             builder.Append(branch);
             builder.Append(" ");
             builder.Append(basedOn);

src/Commands/Commit.cs

@@ -4,18 +4,18 @@ namespace SourceGit.Commands
 {
     public class Commit : Command
     {
-        public Commit(string repo, string message, bool amend, bool signOff)
+        public Commit(string repo, string message, bool signOff, bool amend, bool resetAuthor)
         {
             _tmpFile = Path.GetTempFileName();
             File.WriteAllText(_tmpFile, message);
 
             WorkingDirectory = repo;
             Context = repo;
             Args = $"commit --allow-empty --file=\"{_tmpFile}\"";
-            if (amend)
-                Args += " --amend --no-edit";
             if (signOff)
                 Args += " --signoff";
+            if (amend)
+                Args += resetAuthor ? " --amend --reset-author --no-edit" : " --amend --no-edit";
         }
 
         public bool Run()

src/Commands/Discard.cs

@@ -8,6 +8,12 @@ namespace SourceGit.Commands
 {
     public static class Discard
     {
+        /// <summary>
+        ///     Discard all local changes (unstaged & staged)
+        /// </summary>
+        /// <param name="repo"></param>
+        /// <param name="includeIgnored"></param>
+        /// <param name="log"></param>
         public static void All(string repo, bool includeIgnored, Models.ICommandLog log)
         {
             var changes = new QueryLocalChanges(repo).Result();
@@ -36,11 +42,18 @@ public static void All(string repo, bool includeIgnored, Models.ICommandLog log)
                 });
             }
 
-            new Restore(repo) { Log = log }.Exec();
+            new Reset(repo, "HEAD", "--hard") { Log = log }.Exec();
+
             if (includeIgnored)
                 new Clean(repo) { Log = log }.Exec();
         }
 
+        /// <summary>
+        ///     Discard selected changes (only unstaged).
+        /// </summary>
+        /// <param name="repo"></param>
+        /// <param name="changes"></param>
+        /// <param name="log"></param>
         public static void Changes(string repo, List<Models.Change> changes, Models.ICommandLog log)
         {
             var restores = new List<string>();
@@ -71,10 +84,12 @@ public static void Changes(string repo, List<Models.Change> changes, Models.ICom
                 });
             }
 
-            for (int i = 0; i < restores.Count; i += 10)
+            if (restores.Count > 0)
             {
-                var count = Math.Min(10, restores.Count - i);
-                new Restore(repo, restores.GetRange(i, count), "--worktree --recurse-submodules") { Log = log }.Exec();
+                var pathSpecFile = Path.GetTempFileName();
+                File.WriteAllLines(pathSpecFile, restores);
+                new Restore(repo, pathSpecFile, false) { Log = log }.Exec();
+                File.Delete(pathSpecFile);
             }
         }
     }

src/Commands/FormatPatch.cs

@@ -6,6 +6,7 @@ public FormatPatch(string repo, string commit, string saveTo)
         {
             WorkingDirectory = repo;
             Context = repo;
+            Editor = EditorType.None;
             Args = $"format-patch {commit} -1 --output=\"{saveTo}\"";
         }
     }

src/Commands/QueryBranches.cs

@@ -58,7 +58,7 @@ public QueryBranches(string repo)
 
                         if (b.TrackStatus == null)
                             b.TrackStatus = new Models.BranchTrackStatus();
-                    }                        
+                    }
                 }
             }
 

src/Commands/QueryLocalChanges.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
+
 using Avalonia.Threading;
 
 namespace SourceGit.Commands
@@ -121,19 +122,32 @@ public QueryLocalChanges(string repo, bool includeUntracked = true)
                     case "CD":
                         change.Set(Models.ChangeState.Copied, Models.ChangeState.Deleted);
                         break;
-                    case "DR":
-                        change.Set(Models.ChangeState.Deleted, Models.ChangeState.Renamed);
-                        break;
-                    case "DC":
-                        change.Set(Models.ChangeState.Deleted, Models.ChangeState.Copied);
-                        break;
                     case "DD":
+                        change.ConflictReason = Models.ConflictReason.BothDeleted;
+                        change.Set(Models.ChangeState.None, Models.ChangeState.Conflicted);
+                        break;
                     case "AU":
+                        change.ConflictReason = Models.ConflictReason.AddedByUs;
+                        change.Set(Models.ChangeState.None, Models.ChangeState.Conflicted);
+                        break;
                     case "UD":
+                        change.ConflictReason = Models.ConflictReason.DeletedByThem;
+                        change.Set(Models.ChangeState.None, Models.ChangeState.Conflicted);
+                        break;
                     case "UA":
+                        change.ConflictReason = Models.ConflictReason.AddedByThem;
+                        change.Set(Models.ChangeState.None, Models.ChangeState.Conflicted);
+                        break;
                     case "DU":
+                        change.ConflictReason = Models.ConflictReason.DeletedByUs;
+                        change.Set(Models.ChangeState.None, Models.ChangeState.Conflicted);
+                        break;
                     case "AA":
+                        change.ConflictReason = Models.ConflictReason.BothAdded;
+                        change.Set(Models.ChangeState.None, Models.ChangeState.Conflicted);
+                        break;
                     case "UU":
+                        change.ConflictReason = Models.ConflictReason.BothModified;
                         change.Set(Models.ChangeState.None, Models.ChangeState.Conflicted);
                         break;
                     case "??":