Merge branch 'release/v2025.22'

Author: love-linger

.editorconfig

@@ -100,7 +100,7 @@ dotnet_naming_symbols.private_internal_fields.applicable_kinds = field
 dotnet_naming_symbols.private_internal_fields.applicable_accessibilities = private, internal
 
 dotnet_naming_style.camel_case_underscore_style.required_prefix = _
-dotnet_naming_style.camel_case_underscore_style.capitalization = camel_case 
+dotnet_naming_style.camel_case_underscore_style.capitalization = camel_case
 
 # use accessibility modifiers
 dotnet_style_require_accessibility_modifiers = for_non_interface_members:suggestion

TRANSLATION.md

@@ -6,13 +6,15 @@ 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.38%25-yellow)
+### ![de__DE](https://img.shields.io/badge/de__DE-96.14%25-yellow)
 
 <details>
 <summary>Missing keys in de_DE.axaml</summary>
 
 - Text.Avatar.Load
 - Text.BranchCM.ResetToSelectedCommit
+- Text.Checkout.WithFastForward
+- Text.Checkout.WithFastForward.Upstream
 - Text.CommitDetail.Changes.Count
 - Text.CreateBranch.OverwriteExisting
 - Text.DeinitSubmodule
@@ -43,16 +45,9 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![es__ES](https://img.shields.io/badge/es__ES-99.88%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.Avatar.Load
-
-</details>
-
-### ![fr__FR](https://img.shields.io/badge/fr__FR-92.26%25-yellow)
+### ![fr__FR](https://img.shields.io/badge/fr__FR-92.03%25-yellow)
 
 <details>
 <summary>Missing keys in fr_FR.axaml</summary>
@@ -67,6 +62,8 @@ This document shows the translation status of each locale file in the repository
 - Text.Bisect.WaitingForRange
 - Text.BranchCM.ResetToSelectedCommit
 - Text.Checkout.RecurseSubmodules
+- Text.Checkout.WithFastForward
+- Text.Checkout.WithFastForward.Upstream
 - Text.CommitCM.CopyAuthor
 - Text.CommitCM.CopyCommitter
 - Text.CommitCM.CopySubject
@@ -122,13 +119,15 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![it__IT](https://img.shields.io/badge/it__IT-97.63%25-yellow)
+### ![it__IT](https://img.shields.io/badge/it__IT-97.38%25-yellow)
 
 <details>
 <summary>Missing keys in it_IT.axaml</summary>
 
 - Text.Avatar.Load
 - Text.BranchCM.ResetToSelectedCommit
+- Text.Checkout.WithFastForward
+- Text.Checkout.WithFastForward.Upstream
 - Text.CommitDetail.Changes.Count
 - Text.CreateBranch.OverwriteExisting
 - Text.DeinitSubmodule
@@ -149,7 +148,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![ja__JP](https://img.shields.io/badge/ja__JP-92.01%25-yellow)
+### ![ja__JP](https://img.shields.io/badge/ja__JP-91.78%25-yellow)
 
 <details>
 <summary>Missing keys in ja_JP.axaml</summary>
@@ -165,6 +164,8 @@ This document shows the translation status of each locale file in the repository
 - Text.BranchCM.CompareWithCurrent
 - Text.BranchCM.ResetToSelectedCommit
 - Text.Checkout.RecurseSubmodules
+- Text.Checkout.WithFastForward
+- Text.Checkout.WithFastForward.Upstream
 - Text.CommitCM.CopyAuthor
 - Text.CommitCM.CopyCommitter
 - Text.CommitCM.CopySubject
@@ -221,7 +222,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![pt__BR](https://img.shields.io/badge/pt__BR-84.02%25-yellow)
+### ![pt__BR](https://img.shields.io/badge/pt__BR-83.81%25-yellow)
 
 <details>
 <summary>Missing keys in pt_BR.axaml</summary>
@@ -245,6 +246,8 @@ This document shows the translation status of each locale file in the repository
 - Text.BranchCM.ResetToSelectedCommit
 - Text.BranchUpstreamInvalid
 - Text.Checkout.RecurseSubmodules
+- Text.Checkout.WithFastForward
+- Text.Checkout.WithFastForward.Upstream
 - Text.Clone.RecurseSubmodules
 - Text.CommitCM.CopyAuthor
 - Text.CommitCM.CopyCommitter
@@ -357,9 +360,17 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![ru__RU](https://img.shields.io/badge/ru__RU-%E2%88%9A-brightgreen)
+### ![ru__RU](https://img.shields.io/badge/ru__RU-99.75%25-yellow)
+
+<details>
+<summary>Missing keys in ru_RU.axaml</summary>
+
+- Text.Checkout.WithFastForward
+- Text.Checkout.WithFastForward.Upstream
+
+</details>
 
-### ![ta__IN](https://img.shields.io/badge/ta__IN-92.13%25-yellow)
+### ![ta__IN](https://img.shields.io/badge/ta__IN-91.91%25-yellow)
 
 <details>
 <summary>Missing keys in ta_IN.axaml</summary>
@@ -375,6 +386,8 @@ This document shows the translation status of each locale file in the repository
 - Text.BranchCM.CompareWithCurrent
 - Text.BranchCM.ResetToSelectedCommit
 - Text.Checkout.RecurseSubmodules
+- Text.Checkout.WithFastForward
+- Text.Checkout.WithFastForward.Upstream
 - Text.CommitCM.CopyAuthor
 - Text.CommitCM.CopyCommitter
 - Text.CommitCM.CopySubject
@@ -430,7 +443,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![uk__UA](https://img.shields.io/badge/uk__UA-93.38%25-yellow)
+### ![uk__UA](https://img.shields.io/badge/uk__UA-93.15%25-yellow)
 
 <details>
 <summary>Missing keys in uk_UA.axaml</summary>
@@ -445,6 +458,8 @@ This document shows the translation status of each locale file in the repository
 - Text.Bisect.WaitingForRange
 - Text.BranchCM.ResetToSelectedCommit
 - Text.Checkout.RecurseSubmodules
+- Text.Checkout.WithFastForward
+- Text.Checkout.WithFastForward.Upstream
 - Text.CommitCM.CopyAuthor
 - Text.CommitCM.CopyCommitter
 - Text.CommitCM.CopySubject

VERSION

@@ -1 +1 @@
-2025.21
+2025.22

src/App.axaml.cs

@@ -301,7 +301,7 @@ public static async Task<string> GetClipboardTextAsync()
                     return await clipboard.GetTextAsync();
                 }
             }
-            return default;
+            return null;
         }
 
         public static string Text(string key, params object[] args)
@@ -323,8 +323,7 @@ public static Avalonia.Controls.Shapes.Path CreateMenuIcon(string key)
             icon.Height = 12;
             icon.Stretch = Stretch.Uniform;
 
-            var geo = Current?.FindResource(key) as StreamGeometry;
-            if (geo != null)
+            if (Current?.FindResource(key) is StreamGeometry geo)
                 icon.Data = geo;
 
             return icon;
@@ -682,8 +681,7 @@ private string FixFontFamilyName(string input)
                 }
 
                 var name = sb.ToString();
-                var idx = name.IndexOf('#');
-                if (idx >= 0)
+                if (name.Contains('#', StringComparison.Ordinal))
                 {
                     if (!name.Equals("fonts:Inter#Inter", StringComparison.Ordinal) &&
                         !name.Equals("fonts:SourceGit#JetBrains Mono", StringComparison.Ordinal))

src/Commands/Blame.cs

@@ -51,7 +51,7 @@ public Models.BlameData Result()
 
         private void ParseLine(string line)
         {
-            if (line.IndexOf('\0', StringComparison.Ordinal) >= 0)
+            if (line.Contains('\0', StringComparison.Ordinal))
             {
                 _result.IsBinary = true;
                 _result.LineInfos.Clear();

src/Commands/Command.cs

@@ -194,7 +194,7 @@ private ProcessStartInfo CreateGitStartInfo()
 
         private void HandleOutput(string line, List<string> errs)
         {
-            line = line ?? string.Empty;
+            line ??= string.Empty;
             Log?.AppendLine(line);
 
             // Lines to hide in error message.

src/Commands/Commit.cs

@@ -34,6 +34,6 @@ public bool Run()
             return succ;
         }
 
-        private string _tmpFile = string.Empty;
+        private readonly string _tmpFile;
     }
 }

src/Commands/CompareRevisions.cs

@@ -39,7 +39,7 @@ public CompareRevisions(string repo, string start, string end, string path)
             foreach (var line in lines)
                 ParseLine(line);
 
-            _changes.Sort((l, r) => string.Compare(l.Path, r.Path, StringComparison.Ordinal));
+            _changes.Sort((l, r) => Models.NumericSort.Compare(l.Path, r.Path));
             return _changes;
         }
 

src/Commands/LFS.cs

@@ -10,7 +10,7 @@ public partial class LFS
         [GeneratedRegex(@"^(.+)\s+([\w.]+)\s+\w+:(\d+)$")]
         private static partial Regex REG_LOCK();
 
-        class SubCmd : Command
+        private class SubCmd : Command
         {
             public SubCmd(string repo, string args, Models.ICommandLog log)
             {

src/Commands/QueryCommitsForInteractiveRebase.cs

@@ -90,6 +90,6 @@ private void ParseParent(string data)
 
         private List<Models.InteractiveCommit> _commits = [];
         private Models.InteractiveCommit _current = null;
-        private string _boundary = "";
+        private readonly string _boundary;
     }
 }