Merge branch 'release/v2025.39'

Author: love-linger

.github/workflows/build.yml

@@ -43,7 +43,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 9.0.x
+          dotnet-version: 10.0.x
       - name: Configure arm64 packages
         if: matrix.runtime == 'linux-arm64'
         run: |

.github/workflows/format-check.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Set up .NET
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 9.0.x
+          dotnet-version: 10.0.x
 
       - name: Run formatting check
         run: dotnet format --verify-no-changes

README.md

@@ -6,6 +6,20 @@
 [![latest](https://img.shields.io/github/v/release/sourcegit-scm/sourcegit.svg)](https://github.com/sourcegit-scm/sourcegit/releases/latest)
 [![downloads](https://img.shields.io/github/downloads/sourcegit-scm/sourcegit/total)](https://github.com/sourcegit-scm/sourcegit/releases)
 
+## Screenshots
+
+* Dark Theme
+
+  ![Theme Dark](./screenshots/theme_dark.png)
+
+* Light Theme
+
+  ![Theme Light](./screenshots/theme_light.png)
+
+* Custom
+
+  You can find custom themes from [sourcegit-theme](https://github.com/sourcegit-scm/sourcegit-theme.git). And welcome to share your own themes.
+
 ## Highlights
 
 * Supports Windows/macOS/Linux
@@ -201,20 +215,6 @@ You can define your own conventional commit types (per-repository) by following
 ```
 2. Configure the `Conventional Commit Types` in repository configuration window.  
 
-## Screenshots
-
-* Dark Theme
-
-  ![Theme Dark](./screenshots/theme_dark.png)
-
-* Light Theme
-
-  ![Theme Light](./screenshots/theme_light.png)
-
-* Custom
-
-  You can find custom themes from [sourcegit-theme](https://github.com/sourcegit-scm/sourcegit-theme.git). And welcome to share your own themes.
-
 ## Contributing
 
 Everyone is welcome to submit a PR. Please make sure your PR is based on the latest `develop` branch and the target branch of PR is `develop`.

THIRD-PARTY-LICENSES.md

@@ -7,7 +7,7 @@ The project uses the following third-party libraries or assets
 ### AvaloniaUI
 
 - **Source**: https://github.com/AvaloniaUI/Avalonia
-- **Version**: 11.3.8
+- **Version**: 11.3.9
 - **License**: MIT License
 - **License Link**: https://github.com/AvaloniaUI/Avalonia/blob/master/licence.md
 

TRANSLATION.md

@@ -10,17 +10,21 @@ This document shows the translation status of each locale file in the repository
 
 ### ![es__ES](https://img.shields.io/badge/es__ES-%E2%88%9A-brightgreen)
 
-### ![fr__FR](https://img.shields.io/badge/fr__FR-99.78%25-yellow)
+### ![fr__FR](https://img.shields.io/badge/fr__FR-99.34%25-yellow)
 
 <details>
 <summary>Missing keys in fr_FR.axaml</summary>
 
+- Text.BranchCM.EditDescription
 - Text.CommitMessageTextBox.Placeholder
+- Text.EditBranchDescription
+- Text.EditBranchDescription.Target
 - Text.FileCM.CustomAction
+- Text.OpenFile
 
 </details>
 
-### ![id__ID](https://img.shields.io/badge/id__ID-97.56%25-yellow)
+### ![id__ID](https://img.shields.io/badge/id__ID-97.14%25-yellow)
 
 <details>
 <summary>Missing keys in id_ID.axaml</summary>
@@ -29,6 +33,7 @@ This document shows the translation status of each locale file in the repository
 - Text.Blame.BlameOnPreviousRevision
 - Text.BranchCM.CreatePR
 - Text.BranchCM.CreatePRForUpstream
+- Text.BranchCM.EditDescription
 - Text.CommitCM.Drop
 - Text.CommitMessageTextBox.Placeholder
 - Text.Configure.CommitMessageTemplate.BuiltinVars
@@ -37,6 +42,8 @@ This document shows the translation status of each locale file in the repository
 - Text.DropHead
 - Text.DropHead.Commit
 - Text.DropHead.NewHead
+- Text.EditBranchDescription
+- Text.EditBranchDescription.Target
 - Text.FileCM.CustomAction
 - Text.GitLFS.Locks.UnlockAllMyLocks
 - Text.GitLFS.Locks.UnlockAllMyLocks.Confirm
@@ -45,12 +52,13 @@ This document shows the translation status of each locale file in the repository
 - Text.Launcher.OpenRepository
 - Text.Open
 - Text.Open.SystemDefaultEditor
+- Text.OpenFile
 - Text.PushToNewBranch
 - Text.PushToNewBranch.Title
 
 </details>
 
-### ![it__IT](https://img.shields.io/badge/it__IT-94.91%25-yellow)
+### ![it__IT](https://img.shields.io/badge/it__IT-94.49%25-yellow)
 
 <details>
 <summary>Missing keys in it_IT.axaml</summary>
@@ -59,6 +67,7 @@ This document shows the translation status of each locale file in the repository
 - Text.Blame.BlameOnPreviousRevision
 - Text.BranchCM.CreatePR
 - Text.BranchCM.CreatePRForUpstream
+- Text.BranchCM.EditDescription
 - Text.BranchCM.SwitchToWorktree
 - Text.BranchTree.Ahead
 - Text.BranchTree.AheadBehind
@@ -80,6 +89,8 @@ This document shows the translation status of each locale file in the repository
 - Text.DropHead
 - Text.DropHead.Commit
 - Text.DropHead.NewHead
+- Text.EditBranchDescription
+- Text.EditBranchDescription.Target
 - Text.FileCM.CustomAction
 - Text.GitLFS.Locks.UnlockAllMyLocks
 - Text.GitLFS.Locks.UnlockAllMyLocks.Confirm
@@ -88,6 +99,7 @@ This document shows the translation status of each locale file in the repository
 - Text.Launcher.OpenRepository
 - Text.Open
 - Text.Open.SystemDefaultEditor
+- Text.OpenFile
 - Text.Preferences.AI.ReadApiKeyFromEnv
 - Text.Preferences.Appearance.UseAutoHideScrollBars
 - Text.Preferences.General.EnableCompactFolders
@@ -104,7 +116,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![ja__JP](https://img.shields.io/badge/ja__JP-76.30%25-yellow)
+### ![ja__JP](https://img.shields.io/badge/ja__JP-75.99%25-yellow)
 
 <details>
 <summary>Missing keys in ja_JP.axaml</summary>
@@ -128,6 +140,7 @@ This document shows the translation status of each locale file in the repository
 - Text.BranchCM.CompareWithCurrent
 - Text.BranchCM.CreatePR
 - Text.BranchCM.CreatePRForUpstream
+- Text.BranchCM.EditDescription
 - Text.BranchCM.ResetToSelectedCommit
 - Text.BranchCM.SwitchToWorktree
 - Text.BranchTree.Ahead
@@ -219,6 +232,8 @@ This document shows the translation status of each locale file in the repository
 - Text.DropHead
 - Text.DropHead.Commit
 - Text.DropHead.NewHead
+- Text.EditBranchDescription
+- Text.EditBranchDescription.Target
 - Text.ExecuteCustomAction.Target
 - Text.ExecuteCustomAction.Repository
 - Text.FileCM.CustomAction
@@ -240,6 +255,7 @@ This document shows the translation status of each locale file in the repository
 - Text.MoveSubmodule.Submodule
 - Text.Open
 - Text.Open.SystemDefaultEditor
+- Text.OpenFile
 - Text.Preferences.AI.ReadApiKeyFromEnv
 - Text.Preferences.Appearance.UseAutoHideScrollBars
 - Text.Preferences.General.EnableCompactFolders
@@ -326,7 +342,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![ko__KR](https://img.shields.io/badge/ko__KR-98.01%25-yellow)
+### ![ko__KR](https://img.shields.io/badge/ko__KR-97.47%25-yellow)
 
 <details>
 <summary>Missing keys in ko_KR.axaml</summary>
@@ -335,9 +351,12 @@ This document shows the translation status of each locale file in the repository
 - Text.Blame.TypeNotSupported
 - Text.BranchCM.CreatePR
 - Text.BranchCM.CreatePRForUpstream
+- Text.BranchCM.EditDescription
 - Text.CommitMessageTextBox.Placeholder
 - Text.Configure.Git.ConventionalTypesOverride
 - Text.ConfigureCustomActionControls.StringValue.Tip
+- Text.EditBranchDescription
+- Text.EditBranchDescription.Target
 - Text.FileCM.CustomAction
 - Text.GitLFS.Locks.UnlockAllMyLocks
 - Text.GitLFS.Locks.UnlockAllMyLocks.Confirm
@@ -346,13 +365,15 @@ This document shows the translation status of each locale file in the repository
 - Text.Launcher.OpenRepository
 - Text.Open
 - Text.Open.SystemDefaultEditor
+- Text.OpenFile
+- Text.Preferences.Appearance.UseFixedTabWidth
 - Text.PushToNewBranch
 - Text.PushToNewBranch.Title
 - Text.Submodule.Status.Unmerged
 
 </details>
 
-### ![pt__BR](https://img.shields.io/badge/pt__BR-69.99%25-red)
+### ![pt__BR](https://img.shields.io/badge/pt__BR-69.71%25-red)
 
 <details>
 <summary>Missing keys in pt_BR.axaml</summary>
@@ -382,6 +403,7 @@ This document shows the translation status of each locale file in the repository
 - Text.BranchCM.CreatePR
 - Text.BranchCM.CreatePRForUpstream
 - Text.BranchCM.CustomAction
+- Text.BranchCM.EditDescription
 - Text.BranchCM.MergeMultiBranches
 - Text.BranchCM.ResetToSelectedCommit
 - Text.BranchCM.SwitchToWorktree
@@ -489,6 +511,8 @@ This document shows the translation status of each locale file in the repository
 - Text.DropHead
 - Text.DropHead.Commit
 - Text.DropHead.NewHead
+- Text.EditBranchDescription
+- Text.EditBranchDescription.Target
 - Text.ExecuteCustomAction.Target
 - Text.ExecuteCustomAction.Repository
 - Text.Fetch.Force
@@ -522,6 +546,7 @@ This document shows the translation status of each locale file in the repository
 - Text.MoveSubmodule.Submodule
 - Text.Open
 - Text.Open.SystemDefaultEditor
+- Text.OpenFile
 - Text.Preferences.AI.ReadApiKeyFromEnv
 - Text.Preferences.AI.Streaming
 - Text.Preferences.Appearance.EditorTabWidth
@@ -633,7 +658,7 @@ This document shows the translation status of each locale file in the repository
 
 ### ![ru__RU](https://img.shields.io/badge/ru__RU-%E2%88%9A-brightgreen)
 
-### ![ta__IN](https://img.shields.io/badge/ta__IN-76.41%25-yellow)
+### ![ta__IN](https://img.shields.io/badge/ta__IN-76.10%25-yellow)
 
 <details>
 <summary>Missing keys in ta_IN.axaml</summary>
@@ -657,6 +682,7 @@ This document shows the translation status of each locale file in the repository
 - Text.BranchCM.CompareWithCurrent
 - Text.BranchCM.CreatePR
 - Text.BranchCM.CreatePRForUpstream
+- Text.BranchCM.EditDescription
 - Text.BranchCM.ResetToSelectedCommit
 - Text.BranchCM.SwitchToWorktree
 - Text.BranchTree.Ahead
@@ -748,6 +774,8 @@ This document shows the translation status of each locale file in the repository
 - Text.DropHead
 - Text.DropHead.Commit
 - Text.DropHead.NewHead
+- Text.EditBranchDescription
+- Text.EditBranchDescription.Target
 - Text.ExecuteCustomAction.Target
 - Text.ExecuteCustomAction.Repository
 - Text.FileCM.CustomAction
@@ -769,6 +797,7 @@ This document shows the translation status of each locale file in the repository
 - Text.MoveSubmodule.Submodule
 - Text.Open
 - Text.Open.SystemDefaultEditor
+- Text.OpenFile
 - Text.Preferences.AI.ReadApiKeyFromEnv
 - Text.Preferences.Appearance.UseAutoHideScrollBars
 - Text.Preferences.General.EnableCompactFolders
@@ -854,7 +883,7 @@ This document shows the translation status of each locale file in the repository
 
 </details>
 
-### ![uk__UA](https://img.shields.io/badge/uk__UA-77.52%25-yellow)
+### ![uk__UA](https://img.shields.io/badge/uk__UA-77.20%25-yellow)
 
 <details>
 <summary>Missing keys in uk_UA.axaml</summary>
@@ -877,6 +906,7 @@ This document shows the translation status of each locale file in the repository
 - Text.Blame.BlameOnPreviousRevision
 - Text.BranchCM.CreatePR
 - Text.BranchCM.CreatePRForUpstream
+- Text.BranchCM.EditDescription
 - Text.BranchCM.ResetToSelectedCommit
 - Text.BranchCM.SwitchToWorktree
 - Text.BranchTree.Ahead
@@ -964,6 +994,8 @@ This document shows the translation status of each locale file in the repository
 - Text.DropHead
 - Text.DropHead.Commit
 - Text.DropHead.NewHead
+- Text.EditBranchDescription
+- Text.EditBranchDescription.Target
 - Text.ExecuteCustomAction.Target
 - Text.ExecuteCustomAction.Repository
 - Text.FileCM.CustomAction
@@ -985,6 +1017,7 @@ This document shows the translation status of each locale file in the repository
 - Text.MoveSubmodule.Submodule
 - Text.Open
 - Text.Open.SystemDefaultEditor
+- Text.OpenFile
 - Text.Preferences.AI.ReadApiKeyFromEnv
 - Text.Preferences.Appearance.UseAutoHideScrollBars
 - Text.Preferences.General.EnableCompactFolders

VERSION

@@ -1 +1 @@
-2025.38
+2025.39

build/README.md

@@ -5,7 +5,7 @@
 
 ## How to build this project manually
 
-1. Make sure [.NET SDK 9](https://dotnet.microsoft.com/en-us/download) is installed on your machine.
+1. Make sure [.NET SDK 10](https://dotnet.microsoft.com/en-us/download) is installed on your machine.
 2. Clone this project
 3. Run the follow command under the project root dir
 ```sh

global.json

@@ -1,7 +1,7 @@
 {
   "sdk": {
-    "version": "9.0.0",
+    "version": "10.0.0",
     "rollForward": "latestMajor",
     "allowPrerelease": false
   }
-}
+}

src/Commands/CompareRevisions.cs

@@ -39,7 +39,7 @@ public CompareRevisions(string repo, string start, string end, string path)
                 proc.StartInfo = CreateGitStartInfo(true);
                 proc.Start();
 
-                while (await proc.StandardOutput.ReadLineAsync() is { } line)
+                while (await proc.StandardOutput.ReadLineAsync().ConfigureAwait(false) is { } line)
                 {
                     var match = REG_FORMAT().Match(line);
                     if (!match.Success)

src/Commands/Diff.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Text;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 
@@ -25,12 +26,16 @@ public Diff(string repo, Models.DiffOption opt, int unified, bool ignoreWhitespa
             WorkingDirectory = repo;
             Context = repo;
 
+            var builder = new StringBuilder(256);
+            builder.Append("diff --no-color --no-ext-diff --patch ");
+            if (Models.DiffOption.IgnoreCRAtEOL)
+                builder.Append("--ignore-cr-at-eol ");
             if (ignoreWhitespace)
-                Args = $"diff --no-ext-diff --patch --ignore-all-space --unified={unified} {opt}";
-            else if (Models.DiffOption.IgnoreCRAtEOL)
-                Args = $"diff --no-ext-diff --patch --ignore-cr-at-eol --unified={unified} {opt}";
-            else
-                Args = $"diff --no-ext-diff --patch --unified={unified} {opt}";
+                builder.Append("--ignore-space-change ");
+            builder.Append("--unified=").Append(unified).Append(' ');
+            builder.Append(opt.ToString());
+
+            Args = builder.ToString();
         }
 
         public async Task<Models.DiffResult> ReadAsync()
@@ -41,7 +46,7 @@ public Diff(string repo, Models.DiffOption opt, int unified, bool ignoreWhitespa
                 proc.StartInfo = CreateGitStartInfo(true);
                 proc.Start();
 
-                while (await proc.StandardOutput.ReadLineAsync() is { } line)
+                while (await proc.StandardOutput.ReadLineAsync().ConfigureAwait(false) is { } line)
                     ParseLine(line);
 
                 await proc.WaitForExitAsync().ConfigureAwait(false);