Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit 4a3ef62

Browse files
Merge branch 'release/v8.42'
2 parents 790e1f6 + 3196bd4 commit 4a3ef62

34 files changed

+828
-128
lines changed
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
name: Publish to Buildkite
2+
on:
3+
workflow_call:
4+
secrets:
5+
BUILDKITE_TOKEN:
6+
required: true
7+
jobs:
8+
publish:
9+
name: Publish to Buildkite
10+
runs-on: ubuntu-latest
11+
strategy:
12+
matrix:
13+
runtime: [linux-x64, linux-arm64]
14+
steps:
15+
- name: Download package artifacts
16+
uses: actions/download-artifact@v4
17+
with:
18+
name: package.${{ matrix.runtime }}
19+
path: packages
20+
21+
- name: Publish DEB package
22+
env:
23+
BUILDKITE_TOKEN: ${{ secrets.BUILDKITE_TOKEN }}
24+
run: |
25+
FILE=$(echo packages/*.deb)
26+
curl -X POST https://api.buildkite.com/v2/packages/organizations/sourcegit/registries/sourcegit-deb/packages \
27+
-H "Authorization: Bearer $BUILDKITE_TOKEN" \
28+
-F "file=@$FILE" \
29+
--fail
30+
31+
- name: Publish RPM package
32+
env:
33+
BUILDKITE_TOKEN: ${{ secrets.BUILDKITE_TOKEN }}
34+
run: |
35+
FILE=$(echo packages/*.rpm)
36+
curl -X POST https://api.buildkite.com/v2/packages/organizations/sourcegit/registries/sourcegit-rpm/packages \
37+
-H "Authorization: Bearer $BUILDKITE_TOKEN" \
38+
-F "file=@$FILE" \
39+
--fail

‎.github/workflows/release.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,11 @@ jobs:
2424
uses: ./.github/workflows/package.yml
2525
with:
2626
version: ${{ needs.version.outputs.version }}
27+
publish-packages:
28+
name: Publish Packages
29+
uses: ./.github/workflows/publish-packages.yml
30+
secrets:
31+
BUILDKITE_TOKEN: ${{ secrets.BUILDKITE_TOKEN }}
2732
release:
2833
needs: [package, version]
2934
name: Release

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
4848
## Translation Status
4949

50-
[![en_US](https://img.shields.io/badge/en__US-100%25-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-99.86%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-97.87%25-yellow)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-97.30%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-97.73%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-99.15%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-100.00%25-brightgreen)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-100.00%25-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-100.00%25-brightgreen)](TRANSLATION.md)
50+
[![en_US](https://img.shields.io/badge/en__US-100%25-brightgreen)](TRANSLATION.md) [![de__DE](https://img.shields.io/badge/de__DE-99.58%25-yellow)](TRANSLATION.md) [![es__ES](https://img.shields.io/badge/es__ES-99.86%25-yellow)](TRANSLATION.md) [![fr__FR](https://img.shields.io/badge/fr__FR-97.03%25-yellow)](TRANSLATION.md) [![it__IT](https://img.shields.io/badge/it__IT-97.45%25-yellow)](TRANSLATION.md) [![pt__BR](https://img.shields.io/badge/pt__BR-98.87%25-yellow)](TRANSLATION.md) [![ru__RU](https://img.shields.io/badge/ru__RU-100.00%25-brightgreen)](TRANSLATION.md) [![zh__CN](https://img.shields.io/badge/zh__CN-100.00%25-brightgreen)](TRANSLATION.md) [![zh__TW](https://img.shields.io/badge/zh__TW-100.00%25-brightgreen)](TRANSLATION.md)
5151

5252
## How to Use
5353

‎SourceGit.sln‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{
1818
.github\workflows\package.yml = .github\workflows\package.yml
1919
.github\workflows\release.yml = .github\workflows\release.yml
2020
.github\workflows\localization-check.yml = .github\workflows\localization-check.yml
21+
.github\workflows\publish-packages.yml = .github\workflows\publish-packages.yml
2122
EndProjectSection
2223
EndProject
2324
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{49A7C2D6-558C-4FAA-8F5D-EEE81497AED7}"

‎TRANSLATION.md‎

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,26 @@
1-
### de_DE.axaml: 99.86%
1+
### de_DE.axaml: 99.58%
22

33

44
<details>
55
<summary>Missing Keys</summary>
66

7+
- Text.CommitDetail.Files.Search
8+
- Text.Diff.UseBlockNavigation
79
- Text.WorkingCopy.CommitToEdit
810

911
</details>
1012

11-
### es_ES.axaml: 97.87%
13+
### es_ES.axaml: 99.86%
1214

1315

1416
<details>
1517
<summary>Missing Keys</summary>
1618

17-
- Text.CommitDetail.Info.Children
18-
- Text.Fetch.Force
19-
- Text.Preference.Appearance.FontSize
20-
- Text.Preference.Appearance.FontSize.Default
21-
- Text.Preference.Appearance.FontSize.Editor
22-
- Text.Preference.General.ShowChildren
23-
- Text.Repository.FilterCommits
24-
- Text.Repository.FilterCommits.Default
25-
- Text.Repository.FilterCommits.Exclude
26-
- Text.Repository.FilterCommits.Include
27-
- Text.Repository.HistoriesOrder
28-
- Text.Repository.HistoriesOrder.ByDate
29-
- Text.Repository.HistoriesOrder.Topo
30-
- Text.SHALinkCM.NavigateTo
31-
- Text.WorkingCopy.CommitToEdit
19+
- Text.Diff.UseBlockNavigation
3220

3321
</details>
3422

35-
### fr_FR.axaml: 97.30%
23+
### fr_FR.axaml: 97.03%
3624

3725

3826
<details>
@@ -41,6 +29,8 @@
4129
- Text.CherryPick.AppendSourceToMessage
4230
- Text.CherryPick.Mainline.Tips
4331
- Text.CommitCM.CherryPickMultiple
32+
- Text.CommitDetail.Files.Search
33+
- Text.Diff.UseBlockNavigation
4434
- Text.Fetch.Force
4535
- Text.Preference.Appearance.FontSize
4636
- Text.Preference.Appearance.FontSize.Default
@@ -60,16 +50,18 @@
6050

6151
</details>
6252

63-
### it_IT.axaml: 97.73%
53+
### it_IT.axaml: 97.45%
6454

6555

6656
<details>
6757
<summary>Missing Keys</summary>
6858

59+
- Text.CommitDetail.Files.Search
6960
- Text.CommitDetail.Info.Children
7061
- Text.Configure.IssueTracker.AddSampleGitLabMergeRequest
7162
- Text.Configure.OpenAI.Preferred
7263
- Text.Configure.OpenAI.Preferred.Tip
64+
- Text.Diff.UseBlockNavigation
7365
- Text.Fetch.Force
7466
- Text.Preference.General.ShowChildren
7567
- Text.Repository.FilterCommits
@@ -85,13 +77,15 @@
8577

8678
</details>
8779

88-
### pt_BR.axaml: 99.15%
80+
### pt_BR.axaml: 98.87%
8981

9082

9183
<details>
9284
<summary>Missing Keys</summary>
9385

86+
- Text.CommitDetail.Files.Search
9487
- Text.CommitDetail.Info.Children
88+
- Text.Diff.UseBlockNavigation
9589
- Text.Fetch.Force
9690
- Text.Preference.General.ShowChildren
9791
- Text.Repository.FilterCommits

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8.41
1+
8.42

‎build/resources/rpm/SPECS/build.spec‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ URL: https://sourcegit-scm.github.io/
77
Source: https://github.com/sourcegit-scm/sourcegit/archive/refs/tags/v%_version.tar.gz
88
Requires: libX11.so.6()(%{__isa_bits}bit)
99
Requires: libSM.so.6()(%{__isa_bits}bit)
10+
Requires: libicu
1011

1112
%define _build_id_links none
1213

‎src/App.axaml.cs‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,12 @@ public static void SetTheme(string theme, string themeOverridesFile)
164164
var resDic = new ResourceDictionary();
165165
var overrides = JsonSerializer.Deserialize(File.ReadAllText(themeOverridesFile), JsonCodeGen.Default.ThemeOverrides);
166166
foreach (var kv in overrides.BasicColors)
167-
resDic[$"Color.{kv.Key}"] = kv.Value;
167+
{
168+
if (kv.Key.Equals("SystemAccentColor", StringComparison.Ordinal))
169+
resDic["SystemAccentColor"] = kv.Value;
170+
else
171+
resDic[$"Color.{kv.Key}"] = kv.Value;
172+
}
168173

169174
if (overrides.GraphColors.Count > 0)
170175
Models.CommitGraph.SetPens(overrides.GraphColors, overrides.GraphPenThickness);

‎src/Commands/QueryCurrentRevisionFiles.cs‎ renamed to ‎src/Commands/QueryRevisionFileNames.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
namespace SourceGit.Commands
22
{
3-
public class QueryCurrentRevisionFiles : Command
3+
public class QueryRevisionFileNames : Command
44
{
5-
public QueryCurrentRevisionFiles(string repo)
5+
public QueryRevisionFileNames(string repo,stringrevision)
66
{
77
WorkingDirectory = repo;
88
Context = repo;
9-
Args = "ls-tree -r --name-only HEAD";
9+
Args = $"ls-tree -r -z --name-only {revision}";
1010
}
1111

1212
public string[] Result()
1313
{
1414
var rs = ReadToEnd();
1515
if (rs.IsSuccess)
16-
return rs.StdOut.Split('\n', System.StringSplitOptions.RemoveEmptyEntries);
16+
return rs.StdOut.Split('\0', System.StringSplitOptions.RemoveEmptyEntries);
1717

1818
return [];
1919
}

‎src/Commands/QueryRevisionObjects.cs‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,35 @@ public QueryRevisionObjects(string repo, string sha, string parentFolder)
1212
{
1313
WorkingDirectory = repo;
1414
Context = repo;
15-
Args = $"ls-tree {sha}";
15+
Args = $"ls-tree -z {sha}";
1616

1717
if (!string.IsNullOrEmpty(parentFolder))
1818
Args += $" -- \"{parentFolder}\"";
1919
}
2020

2121
public List<Models.Object> Result()
2222
{
23-
Exec();
23+
var rs = ReadToEnd();
24+
if (rs.IsSuccess)
25+
{
26+
var start = 0;
27+
var end = rs.StdOut.IndexOf('0円', start);
28+
while (end > 0)
29+
{
30+
var line = rs.StdOut.Substring(start, end - start);
31+
Parse(line);
32+
start = end + 1;
33+
end = rs.StdOut.IndexOf('0円', start);
34+
}
35+
36+
if (start < rs.StdOut.Length)
37+
Parse(rs.StdOut.Substring(start));
38+
}
39+
2440
return _objects;
2541
}
2642

27-
protectedoverridevoid OnReadline(string line)
43+
privatevoid Parse(string line)
2844
{
2945
var match = REG_FORMAT().Match(line);
3046
if (!match.Success)

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /