Skip to content

Commit 01625ad

Browse files
love-lingerlove-linger
committed
Merge branch 'release/v2025.17'
2 parents a960e14 + 88dc122 commit 01625ad

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+883
-348
lines changed

‎TRANSLATION.md

+51-45
Original file line numberDiff line numberDiff line change
@@ -6,55 +6,19 @@ This document shows the translation status of each locale file in the repository
66

77
### ![en_US](https://img.shields.io/badge/en__US-%E2%88%9A-brightgreen)
88

9-
### ![de__DE](https://img.shields.io/badge/de__DE-95.07%25-yellow)
9+
### ![de__DE](https://img.shields.io/badge/de__DE-99.74%25-yellow)
1010

1111
<details>
1212
<summary>Missing keys in de_DE.axaml</summary>
1313

14-
- Text.Bisect
15-
- Text.Bisect.Abort
16-
- Text.Bisect.Bad
17-
- Text.Bisect.Detecting
18-
- Text.Bisect.Good
19-
- Text.Bisect.Skip
20-
- Text.Bisect.WaitingForRange
21-
- Text.BranchUpstreamInvalid
22-
- Text.CommitCM.CopyAuthor
23-
- Text.CommitCM.CopyCommitter
24-
- Text.CommitCM.CopySubject
25-
- Text.CommitMessageTextBox.SubjectCount
26-
- Text.Configure.CustomAction.WaitForExit
27-
- Text.Configure.Git.PreferredMergeMode
28-
- Text.Configure.IssueTracker.AddSampleAzure
29-
- Text.ConfirmEmptyCommit.Continue
30-
- Text.ConfirmEmptyCommit.NoLocalChanges
31-
- Text.ConfirmEmptyCommit.StageAllThenCommit
32-
- Text.ConfirmEmptyCommit.WithLocalChanges
33-
- Text.CopyFullPath
34-
- Text.Diff.First
35-
- Text.Diff.Last
36-
- Text.Preferences.AI.Streaming
37-
- Text.Preferences.Appearance.EditorTabWidth
38-
- Text.Preferences.General.ShowTagsInGraph
39-
- Text.Preferences.Git.IgnoreCRAtEOLInDiff
40-
- Text.Repository.Search.ByContent
41-
- Text.Repository.ViewLogs
42-
- Text.StashCM.SaveAsPatch
43-
- Text.ViewLogs
44-
- Text.ViewLogs.Clear
45-
- Text.ViewLogs.CopyLog
46-
- Text.ViewLogs.Delete
47-
- Text.WorkingCopy.ConfirmCommitWithFilter
48-
- Text.WorkingCopy.Conflicts.OpenExternalMergeTool
49-
- Text.WorkingCopy.Conflicts.OpenExternalMergeToolAllConflicts
50-
- Text.WorkingCopy.Conflicts.UseMine
51-
- Text.WorkingCopy.Conflicts.UseTheirs
14+
- Text.GitFlow.FinishWithPush
15+
- Text.GitFlow.FinishWithSquash
5216

5317
</details>
5418

5519
### ![es__ES](https://img.shields.io/badge/es__ES-%E2%88%9A-brightgreen)
5620

57-
### ![fr__FR](https://img.shields.io/badge/fr__FR-96.37%25-yellow)
21+
### ![fr__FR](https://img.shields.io/badge/fr__FR-95.50%25-yellow)
5822

5923
<details>
6024
<summary>Missing keys in fr_FR.axaml</summary>
@@ -66,6 +30,7 @@ This document shows the translation status of each locale file in the repository
6630
- Text.Bisect.Good
6731
- Text.Bisect.Skip
6832
- Text.Bisect.WaitingForRange
33+
- Text.Checkout.RecurseSubmodules
6934
- Text.CommitCM.CopyAuthor
7035
- Text.CommitCM.CopyCommitter
7136
- Text.CommitCM.CopySubject
@@ -75,9 +40,15 @@ This document shows the translation status of each locale file in the repository
7540
- Text.ConfirmEmptyCommit.NoLocalChanges
7641
- Text.ConfirmEmptyCommit.StageAllThenCommit
7742
- Text.ConfirmEmptyCommit.WithLocalChanges
43+
- Text.GitFlow.FinishWithPush
44+
- Text.GitFlow.FinishWithSquash
7845
- Text.Preferences.Git.IgnoreCRAtEOLInDiff
46+
- Text.Repository.BranchSort
47+
- Text.Repository.BranchSort.ByCommitterDate
48+
- Text.Repository.BranchSort.ByName
7949
- Text.Repository.Search.ByContent
8050
- Text.Repository.ViewLogs
51+
- Text.Repository.Visit
8152
- Text.ViewLogs
8253
- Text.ViewLogs.Clear
8354
- Text.ViewLogs.CopyLog
@@ -90,7 +61,7 @@ This document shows the translation status of each locale file in the repository
9061

9162
</details>
9263

93-
### ![it__IT](https://img.shields.io/badge/it__IT-96.11%25-yellow)
64+
### ![it__IT](https://img.shields.io/badge/it__IT-95.24%25-yellow)
9465

9566
<details>
9667
<summary>Missing keys in it_IT.axaml</summary>
@@ -102,6 +73,7 @@ This document shows the translation status of each locale file in the repository
10273
- Text.Bisect.Good
10374
- Text.Bisect.Skip
10475
- Text.Bisect.WaitingForRange
76+
- Text.Checkout.RecurseSubmodules
10577
- Text.CommitCM.CopyAuthor
10678
- Text.CommitCM.CopyCommitter
10779
- Text.CommitCM.CopySubject
@@ -112,10 +84,16 @@ This document shows the translation status of each locale file in the repository
11284
- Text.ConfirmEmptyCommit.StageAllThenCommit
11385
- Text.ConfirmEmptyCommit.WithLocalChanges
11486
- Text.CopyFullPath
87+
- Text.GitFlow.FinishWithPush
88+
- Text.GitFlow.FinishWithSquash
11589
- Text.Preferences.General.ShowTagsInGraph
11690
- Text.Preferences.Git.IgnoreCRAtEOLInDiff
91+
- Text.Repository.BranchSort
92+
- Text.Repository.BranchSort.ByCommitterDate
93+
- Text.Repository.BranchSort.ByName
11794
- Text.Repository.Search.ByContent
11895
- Text.Repository.ViewLogs
96+
- Text.Repository.Visit
11997
- Text.ViewLogs
12098
- Text.ViewLogs.Clear
12199
- Text.ViewLogs.CopyLog
@@ -128,7 +106,7 @@ This document shows the translation status of each locale file in the repository
128106

129107
</details>
130108

131-
### ![ja__JP](https://img.shields.io/badge/ja__JP-96.11%25-yellow)
109+
### ![ja__JP](https://img.shields.io/badge/ja__JP-95.24%25-yellow)
132110

133111
<details>
134112
<summary>Missing keys in ja_JP.axaml</summary>
@@ -140,6 +118,7 @@ This document shows the translation status of each locale file in the repository
140118
- Text.Bisect.Good
141119
- Text.Bisect.Skip
142120
- Text.Bisect.WaitingForRange
121+
- Text.Checkout.RecurseSubmodules
143122
- Text.CommitCM.CopyAuthor
144123
- Text.CommitCM.CopyCommitter
145124
- Text.CommitCM.CopySubject
@@ -149,11 +128,17 @@ This document shows the translation status of each locale file in the repository
149128
- Text.ConfirmEmptyCommit.NoLocalChanges
150129
- Text.ConfirmEmptyCommit.StageAllThenCommit
151130
- Text.ConfirmEmptyCommit.WithLocalChanges
131+
- Text.GitFlow.FinishWithPush
132+
- Text.GitFlow.FinishWithSquash
152133
- Text.Preferences.Git.IgnoreCRAtEOLInDiff
134+
- Text.Repository.BranchSort
135+
- Text.Repository.BranchSort.ByCommitterDate
136+
- Text.Repository.BranchSort.ByName
153137
- Text.Repository.FilterCommits
154138
- Text.Repository.Search.ByContent
155139
- Text.Repository.Tags.OrderByNameDes
156140
- Text.Repository.ViewLogs
141+
- Text.Repository.Visit
157142
- Text.ViewLogs
158143
- Text.ViewLogs.Clear
159144
- Text.ViewLogs.CopyLog
@@ -166,7 +151,7 @@ This document shows the translation status of each locale file in the repository
166151

167152
</details>
168153

169-
### ![pt__BR](https://img.shields.io/badge/pt__BR-87.68%25-yellow)
154+
### ![pt__BR](https://img.shields.io/badge/pt__BR-86.89%25-yellow)
170155

171156
<details>
172157
<summary>Missing keys in pt_BR.axaml</summary>
@@ -187,6 +172,7 @@ This document shows the translation status of each locale file in the repository
187172
- Text.BranchCM.CustomAction
188173
- Text.BranchCM.MergeMultiBranches
189174
- Text.BranchUpstreamInvalid
175+
- Text.Checkout.RecurseSubmodules
190176
- Text.Clone.RecurseSubmodules
191177
- Text.CommitCM.CopyAuthor
192178
- Text.CommitCM.CopyCommitter
@@ -215,6 +201,8 @@ This document shows the translation status of each locale file in the repository
215201
- Text.Diff.UseBlockNavigation
216202
- Text.Fetch.Force
217203
- Text.FileCM.ResolveUsing
204+
- Text.GitFlow.FinishWithPush
205+
- Text.GitFlow.FinishWithSquash
218206
- Text.Hotkeys.Global.Clone
219207
- Text.InProgress.CherryPick.Head
220208
- Text.InProgress.Merge.Operating
@@ -232,6 +220,9 @@ This document shows the translation status of each locale file in the repository
232220
- Text.Preferences.General.ShowTagsInGraph
233221
- Text.Preferences.Git.IgnoreCRAtEOLInDiff
234222
- Text.Preferences.Git.SSLVerify
223+
- Text.Repository.BranchSort
224+
- Text.Repository.BranchSort.ByCommitterDate
225+
- Text.Repository.BranchSort.ByName
235226
- Text.Repository.FilterCommits
236227
- Text.Repository.HistoriesLayout
237228
- Text.Repository.HistoriesLayout.Horizontal
@@ -247,6 +238,7 @@ This document shows the translation status of each locale file in the repository
247238
- Text.Repository.Tags.Sort
248239
- Text.Repository.UseRelativeTimeInHistories
249240
- Text.Repository.ViewLogs
241+
- Text.Repository.Visit
250242
- Text.SetUpstream
251243
- Text.SetUpstream.Local
252244
- Text.SetUpstream.Unset
@@ -271,7 +263,7 @@ This document shows the translation status of each locale file in the repository
271263

272264
### ![ru__RU](https://img.shields.io/badge/ru__RU-%E2%88%9A-brightgreen)
273265

274-
### ![ta__IN](https://img.shields.io/badge/ta__IN-96.37%25-yellow)
266+
### ![ta__IN](https://img.shields.io/badge/ta__IN-95.50%25-yellow)
275267

276268
<details>
277269
<summary>Missing keys in ta_IN.axaml</summary>
@@ -283,6 +275,7 @@ This document shows the translation status of each locale file in the repository
283275
- Text.Bisect.Good
284276
- Text.Bisect.Skip
285277
- Text.Bisect.WaitingForRange
278+
- Text.Checkout.RecurseSubmodules
286279
- Text.CommitCM.CopyAuthor
287280
- Text.CommitCM.CopyCommitter
288281
- Text.CommitCM.CopySubject
@@ -292,9 +285,15 @@ This document shows the translation status of each locale file in the repository
292285
- Text.ConfirmEmptyCommit.NoLocalChanges
293286
- Text.ConfirmEmptyCommit.StageAllThenCommit
294287
- Text.ConfirmEmptyCommit.WithLocalChanges
288+
- Text.GitFlow.FinishWithPush
289+
- Text.GitFlow.FinishWithSquash
295290
- Text.Preferences.Git.IgnoreCRAtEOLInDiff
291+
- Text.Repository.BranchSort
292+
- Text.Repository.BranchSort.ByCommitterDate
293+
- Text.Repository.BranchSort.ByName
296294
- Text.Repository.Search.ByContent
297295
- Text.Repository.ViewLogs
296+
- Text.Repository.Visit
298297
- Text.UpdateSubmodules.Target
299298
- Text.ViewLogs
300299
- Text.ViewLogs.Clear
@@ -307,7 +306,7 @@ This document shows the translation status of each locale file in the repository
307306

308307
</details>
309308

310-
### ![uk__UA](https://img.shields.io/badge/uk__UA-97.54%25-yellow)
309+
### ![uk__UA](https://img.shields.io/badge/uk__UA-96.66%25-yellow)
311310

312311
<details>
313312
<summary>Missing keys in uk_UA.axaml</summary>
@@ -319,14 +318,21 @@ This document shows the translation status of each locale file in the repository
319318
- Text.Bisect.Good
320319
- Text.Bisect.Skip
321320
- Text.Bisect.WaitingForRange
321+
- Text.Checkout.RecurseSubmodules
322322
- Text.CommitCM.CopyAuthor
323323
- Text.CommitCM.CopyCommitter
324324
- Text.CommitCM.CopySubject
325325
- Text.CommitMessageTextBox.SubjectCount
326326
- Text.ConfigureWorkspace.Name
327+
- Text.GitFlow.FinishWithPush
328+
- Text.GitFlow.FinishWithSquash
327329
- Text.Preferences.Git.IgnoreCRAtEOLInDiff
330+
- Text.Repository.BranchSort
331+
- Text.Repository.BranchSort.ByCommitterDate
332+
- Text.Repository.BranchSort.ByName
328333
- Text.Repository.Search.ByContent
329334
- Text.Repository.ViewLogs
335+
- Text.Repository.Visit
330336
- Text.ViewLogs
331337
- Text.ViewLogs.Clear
332338
- Text.ViewLogs.CopyLog

‎VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2025.16
1+
2025.17

‎src/App.axaml.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ public static AppBuilder BuildAvaloniaApp()
7878
return builder;
7979
}
8080

81-
private static void LogException(Exception ex)
81+
public static void LogException(Exception ex)
8282
{
8383
if (ex == null)
8484
return;

‎src/Commands/Checkout.cs

+13-10
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,24 @@ public Checkout(string repo)
1111
Context = repo;
1212
}
1313

14-
public bool Branch(string branch)
14+
public bool Branch(string branch, bool force)
1515
{
16-
Args = $"checkout --recurse-submodules --progress {branch}";
16+
var option = force ? "--force" : string.Empty;
17+
Args = $"checkout {option} --progress {branch}";
1718
return Exec();
1819
}
1920

20-
public bool Branch(string branch, string basedOn)
21+
public bool Branch(string branch, string basedOn, bool force)
2122
{
22-
Args = $"checkout --recurse-submodules --progress -b {branch} {basedOn}";
23+
var option = force ? "--force" : string.Empty;
24+
Args = $"checkout --progress -b {branch} {basedOn}";
25+
return Exec();
26+
}
27+
28+
public bool Commit(string commitId, bool force)
29+
{
30+
var option = force ? "--force" : string.Empty;
31+
Args = $"checkout {option} --detach --progress {commitId}";
2332
return Exec();
2433
}
2534

@@ -56,11 +65,5 @@ public bool FileWithRevision(string file, string revision)
5665
Args = $"checkout --no-overlay {revision} -- \"{file}\"";
5766
return Exec();
5867
}
59-
60-
public bool Commit(string commitId)
61-
{
62-
Args = $"checkout --detach --progress {commitId}";
63-
return Exec();
64-
}
6568
}
6669
}

‎src/Commands/Clean.cs

+3-22
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,12 @@
1-
using System.Collections.Generic;
2-
using System.Text;
3-
4-
namespace SourceGit.Commands
1+
namespace SourceGit.Commands
52
{
63
public class Clean : Command
74
{
8-
public Clean(string repo, bool includeIgnored)
5+
public Clean(string repo)
96
{
107
WorkingDirectory = repo;
118
Context = repo;
12-
Args = includeIgnored ? "clean -qfdx" : "clean -qfd";
13-
}
14-
15-
public Clean(string repo, List<string> files)
16-
{
17-
var builder = new StringBuilder();
18-
builder.Append("clean -qfd --");
19-
foreach (var f in files)
20-
{
21-
builder.Append(" \"");
22-
builder.Append(f);
23-
builder.Append("\"");
24-
}
25-
26-
WorkingDirectory = repo;
27-
Context = repo;
28-
Args = builder.ToString();
9+
Args = "clean -qfdx";
2910
}
3011
}
3112
}

‎src/Commands/Diff.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,11 @@ public Diff(string repo, Models.DiffOption opt, int unified, bool ignoreWhitespa
2828
Context = repo;
2929

3030
if (ignoreWhitespace)
31-
Args = $"-c core.autocrlf=false diff --no-ext-diff --patch --ignore-all-space --unified={unified} {opt}";
31+
Args = $"diff --no-ext-diff --patch --ignore-all-space --unified={unified} {opt}";
3232
else if (Models.DiffOption.IgnoreCRAtEOL)
33-
Args = $"-c core.autocrlf=false diff --no-ext-diff --patch --ignore-cr-at-eol --unified={unified} {opt}";
33+
Args = $"diff --no-ext-diff --patch --ignore-cr-at-eol --unified={unified} {opt}";
3434
else
35-
Args = $"-c core.autocrlf=false diff --no-ext-diff --patch --unified={unified} {opt}";
35+
Args = $"diff --no-ext-diff --patch --unified={unified} {opt}";
3636
}
3737

3838
public Models.DiffResult Result()

0 commit comments

Comments
 (0)