Skip to content

Commit fcc8928

Browse files
love-lingerlove-linger
committed
Merge branch 'release/v2025.34'
2 parents ab4ef4f + 58e26f0 commit fcc8928

File tree

116 files changed

+2315
-793
lines changed

Some content is hidden

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

116 files changed

+2315
-793
lines changed

‎THIRD-PARTY-LICENSES.md

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ The project uses the following third-party libraries or assets
77
### AvaloniaUI
88

99
- **Source**: https://github.com/AvaloniaUI/Avalonia
10-
- **Version**: 11.3.3
10+
- **Version**: 11.3.5
1111
- **License**: MIT License
1212
- **License Link**: https://github.com/AvaloniaUI/Avalonia/blob/master/licence.md
1313

@@ -42,7 +42,7 @@ The project uses the following third-party libraries or assets
4242
### Azure.AI.OpenAI
4343

4444
- **Source**: https://github.com/Azure/azure-sdk-for-net
45-
- **Version**: 2.2.0-beta.5
45+
- **Version**: 2.3.0-beta.2
4646
- **License**: MIT License
4747
- **License Link**: https://github.com/Azure/azure-sdk-for-net/blob/main/LICENSE.txt
4848

@@ -98,3 +98,10 @@ The project uses the following third-party libraries or assets
9898
- **Commit**: 0e89ecdb13650dbbe5a1e85b47b2e1530bf2f355
9999
- **License**: MIT License
100100
- **License Link**: https://github.com/samuel-weinhardt/vscode-jsp-lang/blob/0e89ecdb13650dbbe5a1e85b47b2e1530bf2f355/LICENSE
101+
102+
### vuejs-language-tools
103+
104+
- **Source**: https://github.com/vuejs/language-tools
105+
- **Commit**: 68d98dc57f8486c2946ae28dc86bf8e91d45da4d
106+
- **License**: MIT License
107+
- **License Link**: https://github.com/vuejs/language-tools/blob/68d98dc57f8486c2946ae28dc86bf8e91d45da4d/LICENSE

‎TRANSLATION.md

Lines changed: 46 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -6,35 +6,31 @@ 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-97.96%25-yellow)
9+
### ![de__DE](https://img.shields.io/badge/de__DE-99.55%25-yellow)
1010

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

14-
- Text.BranchCM.SwitchToWorktree
15-
- Text.BranchTree.Ahead
16-
- Text.BranchTree.AheadBehind
17-
- Text.BranchTree.Behind
18-
- Text.BranchTree.Status
19-
- Text.BranchTree.Worktree
20-
- Text.CommitMessageTextBox.PasteAndReplaceAll
21-
- Text.DirtyState.HasLocalChanges
22-
- Text.DirtyState.HasPendingPullOrPush
23-
- Text.DirtyState.UpToDate
24-
- Text.Preferences.AI.ReadApiKeyFromEnv
25-
- Text.Preferences.Appearance.UseAutoHideScrollBars
26-
- Text.Preferences.General.ShowChangesPageByDefault
27-
- Text.ScanRepositories.UseCustomDir
28-
- Text.WorkingCopy.ClearCommitHistories
29-
- Text.WorkingCopy.ClearCommitHistories.Confirm
30-
- Text.WorkingCopy.NoVerify
31-
- Text.Worktree.Open
14+
- Text.CommitDetail.Info.CopyEmail
15+
- Text.CommitDetail.Info.CopyName
16+
- Text.CommitDetail.Info.CopyNameAndEmail
17+
- Text.Preferences.General.ShowChangesTabInCommitDetailByDefault
3218

3319
</details>
3420

35-
### ![es__ES](https://img.shields.io/badge/es__ES-%E2%88%9A-brightgreen)
21+
### ![es__ES](https://img.shields.io/badge/es__ES-99.55%25-yellow)
22+
23+
<details>
24+
<summary>Missing keys in es_ES.axaml</summary>
25+
26+
- Text.CommitDetail.Info.CopyEmail
27+
- Text.CommitDetail.Info.CopyName
28+
- Text.CommitDetail.Info.CopyNameAndEmail
29+
- Text.Preferences.General.ShowChangesTabInCommitDetailByDefault
30+
31+
</details>
3632

37-
### ![fr__FR](https://img.shields.io/badge/fr__FR-78.68%25-yellow)
33+
### ![fr__FR](https://img.shields.io/badge/fr__FR-78.33%25-yellow)
3834

3935
<details>
4036
<summary>Missing keys in fr_FR.axaml</summary>
@@ -86,6 +82,9 @@ This document shows the translation status of each locale file in the repository
8682
- Text.CommitCM.Rebase
8783
- Text.CommitCM.Reset
8884
- Text.CommitDetail.Changes.Count
85+
- Text.CommitDetail.Info.CopyEmail
86+
- Text.CommitDetail.Info.CopyName
87+
- Text.CommitDetail.Info.CopyNameAndEmail
8988
- Text.CommitDetail.Info.Key
9089
- Text.CommitDetail.Info.Signer
9190
- Text.CommitMessageTextBox.PasteAndReplaceAll
@@ -151,6 +150,7 @@ This document shows the translation status of each locale file in the repository
151150
- Text.Preferences.Appearance.UseAutoHideScrollBars
152151
- Text.Preferences.General.EnableCompactFolders
153152
- Text.Preferences.General.ShowChangesPageByDefault
153+
- Text.Preferences.General.ShowChangesTabInCommitDetailByDefault
154154
- Text.Preferences.Git.IgnoreCRAtEOLInDiff
155155
- Text.Preferences.Git.UseLibsecret
156156
- Text.Pull.RecurseSubmodules
@@ -230,7 +230,7 @@ This document shows the translation status of each locale file in the repository
230230

231231
</details>
232232

233-
### ![it__IT](https://img.shields.io/badge/it__IT-97.85%25-yellow)
233+
### ![it__IT](https://img.shields.io/badge/it__IT-97.40%25-yellow)
234234

235235
<details>
236236
<summary>Missing keys in it_IT.axaml</summary>
@@ -241,6 +241,9 @@ This document shows the translation status of each locale file in the repository
241241
- Text.BranchTree.Behind
242242
- Text.BranchTree.Status
243243
- Text.BranchTree.Worktree
244+
- Text.CommitDetail.Info.CopyEmail
245+
- Text.CommitDetail.Info.CopyName
246+
- Text.CommitDetail.Info.CopyNameAndEmail
244247
- Text.CommitMessageTextBox.PasteAndReplaceAll
245248
- Text.DirtyState.HasLocalChanges
246249
- Text.DirtyState.HasPendingPullOrPush
@@ -249,6 +252,7 @@ This document shows the translation status of each locale file in the repository
249252
- Text.Preferences.Appearance.UseAutoHideScrollBars
250253
- Text.Preferences.General.EnableCompactFolders
251254
- Text.Preferences.General.ShowChangesPageByDefault
255+
- Text.Preferences.General.ShowChangesTabInCommitDetailByDefault
252256
- Text.ScanRepositories.UseCustomDir
253257
- Text.WorkingCopy.ClearCommitHistories
254258
- Text.WorkingCopy.ClearCommitHistories.Confirm
@@ -257,7 +261,7 @@ This document shows the translation status of each locale file in the repository
257261

258262
</details>
259263

260-
### ![ja__JP](https://img.shields.io/badge/ja__JP-78.68%25-yellow)
264+
### ![ja__JP](https://img.shields.io/badge/ja__JP-78.33%25-yellow)
261265

262266
<details>
263267
<summary>Missing keys in ja_JP.axaml</summary>
@@ -310,6 +314,9 @@ This document shows the translation status of each locale file in the repository
310314
- Text.CommitCM.Rebase
311315
- Text.CommitCM.Reset
312316
- Text.CommitDetail.Changes.Count
317+
- Text.CommitDetail.Info.CopyEmail
318+
- Text.CommitDetail.Info.CopyName
319+
- Text.CommitDetail.Info.CopyNameAndEmail
313320
- Text.CommitDetail.Info.Key
314321
- Text.CommitDetail.Info.Signer
315322
- Text.CommitMessageTextBox.PasteAndReplaceAll
@@ -375,6 +382,7 @@ This document shows the translation status of each locale file in the repository
375382
- Text.Preferences.Appearance.UseAutoHideScrollBars
376383
- Text.Preferences.General.EnableCompactFolders
377384
- Text.Preferences.General.ShowChangesPageByDefault
385+
- Text.Preferences.General.ShowChangesTabInCommitDetailByDefault
378386
- Text.Preferences.Git.IgnoreCRAtEOLInDiff
379387
- Text.Preferences.Git.UseLibsecret
380388
- Text.Pull.RecurseSubmodules
@@ -453,7 +461,7 @@ This document shows the translation status of each locale file in the repository
453461

454462
</details>
455463

456-
### ![pt__BR](https://img.shields.io/badge/pt__BR-72.22%25-red)
464+
### ![pt__BR](https://img.shields.io/badge/pt__BR-71.90%25-red)
457465

458466
<details>
459467
<summary>Missing keys in pt_BR.axaml</summary>
@@ -518,6 +526,9 @@ This document shows the translation status of each locale file in the repository
518526
- Text.CommitDetail.Changes.Count
519527
- Text.CommitDetail.Files.Search
520528
- Text.CommitDetail.Info.Children
529+
- Text.CommitDetail.Info.CopyEmail
530+
- Text.CommitDetail.Info.CopyName
531+
- Text.CommitDetail.Info.CopyNameAndEmail
521532
- Text.CommitDetail.Info.Key
522533
- Text.CommitDetail.Info.Signer
523534
- Text.CommitMessageTextBox.PasteAndReplaceAll
@@ -608,6 +619,7 @@ This document shows the translation status of each locale file in the repository
608619
- Text.Preferences.General.DateFormat
609620
- Text.Preferences.General.EnableCompactFolders
610621
- Text.Preferences.General.ShowChangesPageByDefault
622+
- Text.Preferences.General.ShowChangesTabInCommitDetailByDefault
611623
- Text.Preferences.General.ShowChildren
612624
- Text.Preferences.General.ShowTagsInGraph
613625
- Text.Preferences.Git.IgnoreCRAtEOLInDiff
@@ -708,7 +720,7 @@ This document shows the translation status of each locale file in the repository
708720

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

711-
### ![ta__IN](https://img.shields.io/badge/ta__IN-78.80%25-yellow)
723+
### ![ta__IN](https://img.shields.io/badge/ta__IN-78.44%25-yellow)
712724

713725
<details>
714726
<summary>Missing keys in ta_IN.axaml</summary>
@@ -761,6 +773,9 @@ This document shows the translation status of each locale file in the repository
761773
- Text.CommitCM.Rebase
762774
- Text.CommitCM.Reset
763775
- Text.CommitDetail.Changes.Count
776+
- Text.CommitDetail.Info.CopyEmail
777+
- Text.CommitDetail.Info.CopyName
778+
- Text.CommitDetail.Info.CopyNameAndEmail
764779
- Text.CommitDetail.Info.Key
765780
- Text.CommitDetail.Info.Signer
766781
- Text.CommitMessageTextBox.PasteAndReplaceAll
@@ -826,6 +841,7 @@ This document shows the translation status of each locale file in the repository
826841
- Text.Preferences.Appearance.UseAutoHideScrollBars
827842
- Text.Preferences.General.EnableCompactFolders
828843
- Text.Preferences.General.ShowChangesPageByDefault
844+
- Text.Preferences.General.ShowChangesTabInCommitDetailByDefault
829845
- Text.Preferences.Git.IgnoreCRAtEOLInDiff
830846
- Text.Preferences.Git.UseLibsecret
831847
- Text.Pull.RecurseSubmodules
@@ -903,7 +919,7 @@ This document shows the translation status of each locale file in the repository
903919

904920
</details>
905921

906-
### ![uk__UA](https://img.shields.io/badge/uk__UA-79.93%25-yellow)
922+
### ![uk__UA](https://img.shields.io/badge/uk__UA-79.57%25-yellow)
907923

908924
<details>
909925
<summary>Missing keys in uk_UA.axaml</summary>
@@ -955,6 +971,9 @@ This document shows the translation status of each locale file in the repository
955971
- Text.CommitCM.Rebase
956972
- Text.CommitCM.Reset
957973
- Text.CommitDetail.Changes.Count
974+
- Text.CommitDetail.Info.CopyEmail
975+
- Text.CommitDetail.Info.CopyName
976+
- Text.CommitDetail.Info.CopyNameAndEmail
958977
- Text.CommitDetail.Info.Key
959978
- Text.CommitDetail.Info.Signer
960979
- Text.CommitMessageTextBox.PasteAndReplaceAll
@@ -1016,6 +1035,7 @@ This document shows the translation status of each locale file in the repository
10161035
- Text.Preferences.Appearance.UseAutoHideScrollBars
10171036
- Text.Preferences.General.EnableCompactFolders
10181037
- Text.Preferences.General.ShowChangesPageByDefault
1038+
- Text.Preferences.General.ShowChangesTabInCommitDetailByDefault
10191039
- Text.Preferences.Git.IgnoreCRAtEOLInDiff
10201040
- Text.Preferences.Git.UseLibsecret
10211041
- Text.Pull.RecurseSubmodules

‎VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2025.33
1+
2025.34

‎src/App.axaml.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,8 +247,6 @@ public static void SetTheme(string theme, string themeOverridesFile)
247247
else
248248
Models.CommitGraph.SetDefaultPens(overrides.GraphPenThickness);
249249

250-
Models.Commit.OpacityForNotMerged = overrides.OpacityForNotMergedCommits;
251-
252250
app.Resources.MergedDictionaries.Add(resDic);
253251
app._themeOverrides = resDic;
254252
}

‎src/Commands/CompareRevisions.cs

Lines changed: 50 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
using System;
2-
using System.Collections.Generic;
1+
using System.Collections.Generic;
2+
using System.Diagnostics;
33
using System.Text.RegularExpressions;
44
using System.Threading.Tasks;
55

@@ -33,56 +33,62 @@ public CompareRevisions(string repo, string start, string end, string path)
3333
public async Task<List<Models.Change>> ReadAsync()
3434
{
3535
var changes = new List<Models.Change>();
36-
var rs = await ReadToEndAsync().ConfigureAwait(false);
37-
if (!rs.IsSuccess)
38-
return changes;
36+
try
37+
{
38+
using var proc = new Process();
39+
proc.StartInfo = CreateGitStartInfo(true);
40+
proc.Start();
3941

40-
var lines = rs.StdOut.Split(['\r', '\n'], StringSplitOptions.RemoveEmptyEntries);
41-
foreach (var line in lines)
42-
ParseLine(changes, line);
42+
while (await proc.StandardOutput.ReadLineAsync() is { } line)
43+
{
44+
var match = REG_FORMAT().Match(line);
45+
if (!match.Success)
46+
{
47+
match = REG_RENAME_FORMAT().Match(line);
48+
if (match.Success)
49+
{
50+
var renamed = new Models.Change() { Path = match.Groups[1].Value };
51+
renamed.Set(Models.ChangeState.Renamed);
52+
changes.Add(renamed);
53+
}
4354

44-
changes.Sort((l, r) => Models.NumericSort.Compare(l.Path, r.Path));
45-
return changes;
46-
}
55+
continue;
56+
}
4757

48-
private void ParseLine(List<Models.Change> outs, string line)
49-
{
50-
var match = REG_FORMAT().Match(line);
51-
if (!match.Success)
52-
{
53-
match = REG_RENAME_FORMAT().Match(line);
54-
if (match.Success)
55-
{
56-
var renamed = new Models.Change() { Path = match.Groups[1].Value };
57-
renamed.Set(Models.ChangeState.Renamed);
58-
outs.Add(renamed);
59-
}
58+
var change = new Models.Change() { Path = match.Groups[2].Value };
59+
var status = match.Groups[1].Value;
6060

61-
return;
62-
}
61+
switch (status[0])
62+
{
63+
case 'M':
64+
change.Set(Models.ChangeState.Modified);
65+
changes.Add(change);
66+
break;
67+
case 'A':
68+
change.Set(Models.ChangeState.Added);
69+
changes.Add(change);
70+
break;
71+
case 'D':
72+
change.Set(Models.ChangeState.Deleted);
73+
changes.Add(change);
74+
break;
75+
case 'C':
76+
change.Set(Models.ChangeState.Copied);
77+
changes.Add(change);
78+
break;
79+
}
80+
}
6381

64-
var change = new Models.Change() { Path = match.Groups[2].Value };
65-
var status = match.Groups[1].Value;
82+
await proc.WaitForExitAsync().ConfigureAwait(false);
6683

67-
switch (status[0])
84+
changes.Sort((l, r) => Models.NumericSort.Compare(l.Path, r.Path));
85+
}
86+
catch
6887
{
69-
case 'M':
70-
change.Set(Models.ChangeState.Modified);
71-
outs.Add(change);
72-
break;
73-
case 'A':
74-
change.Set(Models.ChangeState.Added);
75-
outs.Add(change);
76-
break;
77-
case 'D':
78-
change.Set(Models.ChangeState.Deleted);
79-
outs.Add(change);
80-
break;
81-
case 'C':
82-
change.Set(Models.ChangeState.Copied);
83-
outs.Add(change);
84-
break;
88+
//ignore changes;
8589
}
90+
91+
return changes;
8692
}
8793
}
8894
}

‎src/Commands/Diff.cs

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
using System;
22
using System.Collections.Generic;
3-
using System.IO;
3+
using System.Diagnostics;
44
using System.Text.RegularExpressions;
55
using System.Threading.Tasks;
66

@@ -35,10 +35,21 @@ public Diff(string repo, Models.DiffOption opt, int unified, bool ignoreWhitespa
3535

3636
public async Task<Models.DiffResult> ReadAsync()
3737
{
38-
var rs = await ReadToEndAsync().ConfigureAwait(false);
39-
var sr = new StringReader(rs.StdOut);
40-
while (sr.ReadLine() is { } line)
41-
ParseLine(line);
38+
try
39+
{
40+
using var proc = new Process();
41+
proc.StartInfo = CreateGitStartInfo(true);
42+
proc.Start();
43+
44+
while (await proc.StandardOutput.ReadLineAsync() is { } line)
45+
ParseLine(line);
46+
47+
await proc.WaitForExitAsync().ConfigureAwait(false);
48+
}
49+
catch
50+
{
51+
// Ignore exceptions.
52+
}
4253

4354
if (_result.IsBinary || _result.IsLFS || _result.TextDiff.Lines.Count == 0)
4455
{

0 commit comments

Comments
 (0)