Skip to content

Commit 0fdb2c5

Browse files
committed
Merge branch 'release/v2026.04'
2 parents d156060 + ffc7c56 commit 0fdb2c5

38 files changed

+355
-195
lines changed

.github/workflows/build.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ jobs:
4040
sudo apt-get install -y curl wget git unzip zip libicu66 tzdata clang
4141
- name: Checkout sources
4242
uses: actions/checkout@v4
43+
with:
44+
submodules: true
4345
- name: Setup .NET
4446
uses: actions/setup-dotnet@v4
4547
with:

.github/workflows/format-check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ jobs:
2121
dotnet-version: 10.0.x
2222

2323
- name: Run formatting check
24-
run: dotnet format --verify-no-changes
24+
run: dotnet format --verify-no-changes src/SourceGit.csproj

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "depends/AvaloniaEdit"]
2+
path = depends/AvaloniaEdit
3+
url = https://github.com/love-linger/AvaloniaEdit.git

SourceGit.slnx

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,18 @@
4444
<File Path="build/scripts/localization-check.js"/>
4545
<File Path="build/scripts/package.linux.sh"/>
4646
<File Path="build/scripts/package.osx-app.sh"/>
47-
<File Path="build/scripts/package.windows.sh"/>
47+
<File Path="build/scripts/package.win.ps1"/>
4848
</Folder>
4949

5050
<Folder Name="/build/">
5151
<File Path="build/README.md"/>
5252
</Folder>
5353

54+
<Folder Name="/depends/">
55+
<Project Path="depends/AvaloniaEdit/src/AvaloniaEdit/AvaloniaEdit.csproj" />
56+
<Project Path="depends/AvaloniaEdit/src/AvaloniaEdit.TextMate/AvaloniaEdit.TextMate.csproj" />
57+
</Folder>
58+
5459
<Folder Name="/src/">
5560
<Project Path="src/SourceGit.csproj" />
5661
</Folder>

TRANSLATION.md

Lines changed: 37 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,9 @@ 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-99.48%25-yellow)
9+
### ![de__DE](https://img.shields.io/badge/de__DE-%E2%88%9A-brightgreen)
1010

11-
<details>
12-
<summary>Missing keys in de_DE.axaml</summary>
13-
14-
- Text.ChangeCM.ResetFileTo
15-
- Text.GotoParentSelector
16-
- Text.Histories.Header.DateTime
17-
- Text.Histories.ShowColumns
18-
- Text.Hotkeys.Repo.GoToParent
19-
20-
</details>
21-
22-
### ![es__ES](https://img.shields.io/badge/es__ES-99.48%25-yellow)
11+
### ![es__ES](https://img.shields.io/badge/es__ES-99.27%25-yellow)
2312

2413
<details>
2514
<summary>Missing keys in es_ES.axaml</summary>
@@ -29,10 +18,12 @@ This document shows the translation status of each locale file in the repository
2918
- Text.Histories.Header.DateTime
3019
- Text.Histories.ShowColumns
3120
- Text.Hotkeys.Repo.GoToParent
21+
- Text.SelfUpdate.CurrentVersion
22+
- Text.SelfUpdate.ReleaseDate
3223

3324
</details>
3425

35-
### ![fr__FR](https://img.shields.io/badge/fr__FR-93.82%25-yellow)
26+
### ![fr__FR](https://img.shields.io/badge/fr__FR-93.62%25-yellow)
3627

3728
<details>
3829
<summary>Missing keys in fr_FR.axaml</summary>
@@ -87,6 +78,8 @@ This document shows the translation status of each locale file in the repository
8778
- Text.Preferences.Shell.Args.Tip
8879
- Text.Repository.OpenAsFolder
8980
- Text.Repository.Resolve
81+
- Text.SelfUpdate.CurrentVersion
82+
- Text.SelfUpdate.ReleaseDate
9083
- Text.SquashOrFixup.Squash
9184
- Text.SquashOrFixup.Fixup
9285
- Text.SquashOrFixup.Into
@@ -99,7 +92,7 @@ This document shows the translation status of each locale file in the repository
9992

10093
</details>
10194

102-
### ![id__ID](https://img.shields.io/badge/id__ID-91.72%25-yellow)
95+
### ![id__ID](https://img.shields.io/badge/id__ID-91.53%25-yellow)
10396

10497
<details>
10598
<summary>Missing keys in id_ID.axaml</summary>
@@ -174,6 +167,8 @@ This document shows the translation status of each locale file in the repository
174167
- Text.PushToNewBranch.Title
175168
- Text.Repository.OpenAsFolder
176169
- Text.Repository.Resolve
170+
- Text.SelfUpdate.CurrentVersion
171+
- Text.SelfUpdate.ReleaseDate
177172
- Text.SquashOrFixup.Squash
178173
- Text.SquashOrFixup.Fixup
179174
- Text.SquashOrFixup.Into
@@ -186,7 +181,7 @@ This document shows the translation status of each locale file in the repository
186181

187182
</details>
188183

189-
### ![it__IT](https://img.shields.io/badge/it__IT-99.48%25-yellow)
184+
### ![it__IT](https://img.shields.io/badge/it__IT-99.27%25-yellow)
190185

191186
<details>
192187
<summary>Missing keys in it_IT.axaml</summary>
@@ -196,10 +191,12 @@ This document shows the translation status of each locale file in the repository
196191
- Text.Histories.Header.DateTime
197192
- Text.Histories.ShowColumns
198193
- Text.Hotkeys.Repo.GoToParent
194+
- Text.SelfUpdate.CurrentVersion
195+
- Text.SelfUpdate.ReleaseDate
199196

200197
</details>
201198

202-
### ![ja__JP](https://img.shields.io/badge/ja__JP-71.91%25-red)
199+
### ![ja__JP](https://img.shields.io/badge/ja__JP-71.76%25-red)
203200

204201
<details>
205202
<summary>Missing keys in ja_JP.axaml</summary>
@@ -418,6 +415,8 @@ This document shows the translation status of each locale file in the repository
418415
- Text.ResetWithoutCheckout.MoveTo
419416
- Text.ResetWithoutCheckout.Target
420417
- Text.ScanRepositories.UseCustomDir
418+
- Text.SelfUpdate.CurrentVersion
419+
- Text.SelfUpdate.ReleaseDate
421420
- Text.SetSubmoduleBranch
422421
- Text.SetSubmoduleBranch.Submodule
423422
- Text.SetSubmoduleBranch.Current
@@ -475,7 +474,7 @@ This document shows the translation status of each locale file in the repository
475474

476475
</details>
477476

478-
### ![ko__KR](https://img.shields.io/badge/ko__KR-92.03%25-yellow)
477+
### ![ko__KR](https://img.shields.io/badge/ko__KR-91.84%25-yellow)
479478

480479
<details>
481480
<summary>Missing keys in ko_KR.axaml</summary>
@@ -546,6 +545,8 @@ This document shows the translation status of each locale file in the repository
546545
- Text.PushToNewBranch.Title
547546
- Text.Repository.OpenAsFolder
548547
- Text.Repository.Resolve
548+
- Text.SelfUpdate.CurrentVersion
549+
- Text.SelfUpdate.ReleaseDate
549550
- Text.SquashOrFixup.Squash
550551
- Text.SquashOrFixup.Fixup
551552
- Text.SquashOrFixup.Into
@@ -559,7 +560,7 @@ This document shows the translation status of each locale file in the repository
559560

560561
</details>
561562

562-
### ![pt__BR](https://img.shields.io/badge/pt__BR-69.71%25-red)
563+
### ![pt__BR](https://img.shields.io/badge/pt__BR-69.56%25-red)
563564

564565
<details>
565566
<summary>Missing keys in pt_BR.axaml</summary>
@@ -791,6 +792,8 @@ This document shows the translation status of each locale file in the repository
791792
- Text.ResetWithoutCheckout.MoveTo
792793
- Text.ResetWithoutCheckout.Target
793794
- Text.ScanRepositories.UseCustomDir
795+
- Text.SelfUpdate.CurrentVersion
796+
- Text.SelfUpdate.ReleaseDate
794797
- Text.SetSubmoduleBranch
795798
- Text.SetSubmoduleBranch.Submodule
796799
- Text.SetSubmoduleBranch.Current
@@ -856,9 +859,17 @@ This document shows the translation status of each locale file in the repository
856859

857860
</details>
858861

859-
### ![ru__RU](https://img.shields.io/badge/ru__RU-%E2%88%9A-brightgreen)
862+
### ![ru__RU](https://img.shields.io/badge/ru__RU-99.79%25-yellow)
863+
864+
<details>
865+
<summary>Missing keys in ru_RU.axaml</summary>
866+
867+
- Text.SelfUpdate.CurrentVersion
868+
- Text.SelfUpdate.ReleaseDate
869+
870+
</details>
860871

861-
### ![ta__IN](https://img.shields.io/badge/ta__IN-72.01%25-red)
872+
### ![ta__IN](https://img.shields.io/badge/ta__IN-71.86%25-red)
862873

863874
<details>
864875
<summary>Missing keys in ta_IN.axaml</summary>
@@ -1076,6 +1087,8 @@ This document shows the translation status of each locale file in the repository
10761087
- Text.ResetWithoutCheckout.MoveTo
10771088
- Text.ResetWithoutCheckout.Target
10781089
- Text.ScanRepositories.UseCustomDir
1090+
- Text.SelfUpdate.CurrentVersion
1091+
- Text.SelfUpdate.ReleaseDate
10791092
- Text.SetSubmoduleBranch
10801093
- Text.SetSubmoduleBranch.Submodule
10811094
- Text.SetSubmoduleBranch.Current
@@ -1133,7 +1146,7 @@ This document shows the translation status of each locale file in the repository
11331146

11341147
</details>
11351148

1136-
### ![uk__UA](https://img.shields.io/badge/uk__UA-72.85%25-red)
1149+
### ![uk__UA](https://img.shields.io/badge/uk__UA-72.70%25-red)
11371150

11381151
<details>
11391152
<summary>Missing keys in uk_UA.axaml</summary>
@@ -1347,6 +1360,8 @@ This document shows the translation status of each locale file in the repository
13471360
- Text.ResetWithoutCheckout.MoveTo
13481361
- Text.ResetWithoutCheckout.Target
13491362
- Text.ScanRepositories.UseCustomDir
1363+
- Text.SelfUpdate.CurrentVersion
1364+
- Text.SelfUpdate.ReleaseDate
13501365
- Text.SetSubmoduleBranch
13511366
- Text.SetSubmoduleBranch.Submodule
13521367
- Text.SetSubmoduleBranch.Current

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2026.03
1+
2026.04

build/scripts/package.linux.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ if [[ ! -f "appimagetool" ]]; then
3232
fi
3333

3434
rm -f SourceGit/*.dbg
35+
rm -f SourceGit/*.pdb
3536

3637
mkdir -p SourceGit.AppDir/opt
3738
mkdir -p SourceGit.AppDir/usr/share/metainfo

build/scripts/package.osx-app.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,6 @@ mv SourceGit SourceGit.app/Contents/MacOS
1212
cp resources/app/App.icns SourceGit.app/Contents/Resources/App.icns
1313
sed "s/SOURCE_GIT_VERSION/$VERSION/g" resources/app/App.plist > SourceGit.app/Contents/Info.plist
1414
rm -rf SourceGit.app/Contents/MacOS/SourceGit.dsym
15+
rm -f SourceGit.app/Contents/MacOS/*.pdb
1516

1617
zip "sourcegit_$VERSION.$RUNTIME.zip" -r SourceGit.app

depends/AvaloniaEdit

Submodule AvaloniaEdit added at 77f960a

src/App.Extensions.cs

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using System;
2+
using System.IO;
23

34
namespace SourceGit
45
{
@@ -23,4 +24,43 @@ public static T Use<T>(this T cmd, Models.ICommandLog log) where T : Commands.Co
2324
return cmd;
2425
}
2526
}
27+
28+
public static class DirectoryInfoExtension
29+
{
30+
public static void WalkFiles(this DirectoryInfo dir, Action<string> onFile, int maxDepth = 4)
31+
{
32+
try
33+
{
34+
var options = new EnumerationOptions()
35+
{
36+
IgnoreInaccessible = true,
37+
RecurseSubdirectories = false,
38+
};
39+
40+
foreach (var file in dir.GetFiles("*", options))
41+
onFile(file.FullName);
42+
43+
if (maxDepth > 0)
44+
{
45+
foreach (var subDir in dir.GetDirectories("*", options))
46+
{
47+
if (subDir.Name.StartsWith(".", StringComparison.Ordinal) ||
48+
subDir.Name.Equals("node_modules", StringComparison.OrdinalIgnoreCase))
49+
continue;
50+
51+
WalkFiles(subDir, onFile, maxDepth - 1);
52+
}
53+
}
54+
}
55+
catch
56+
{
57+
// Ignore exceptions.
58+
}
59+
}
60+
61+
public static string GetRelativePath(this DirectoryInfo dir, string fullpath)
62+
{
63+
return fullpath.Substring(dir.FullName.Length).TrimStart(Path.DirectorySeparatorChar);
64+
}
65+
}
2666
}

0 commit comments

Comments
 (0)