Merge branch 'release/v8.24'

Author: love-linger

.github/workflows/ci.yml

@@ -99,3 +99,41 @@ jobs:
         with:
           name: sourcegit.linux-x64
           path: sourcegit.linux-x64.tar
+  build-linux-arm64:
+    name: Build Linux (arm64)
+    runs-on: ubuntu-20.04
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: 8.0.x
+      - name: Configure arm64 packages
+        run: |
+          sudo dpkg --add-architecture arm64
+          echo 'deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ focal main restricted
+          deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ focal-updates main restricted
+          deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports/ focal-backports main restricted' \
+          | sudo tee /etc/apt/sources.list.d/arm64.list
+          sudo sed -i -e 's/^deb http/deb [arch=amd64] http/g' /etc/apt/sources.list
+          sudo sed -i -e 's/^deb mirror/deb [arch=amd64] mirror/g' /etc/apt/sources.list
+      - name: Install cross-compiling dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install clang llvm gcc-aarch64-linux-gnu zlib1g-dev:arm64
+      - name: Build
+        run: dotnet build -c Release
+      - name: Publish
+        run: dotnet publish src/SourceGit.csproj -c Release -o publish -r linux-arm64
+      - name: Rename Executable File
+        run: mv publish/SourceGit publish/sourcegit
+      - name: Packing Program
+        run: tar -cvf sourcegit.linux-arm64.tar -C publish/ .
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: sourcegit.linux-arm64
+          path: sourcegit.linux-arm64.tar

README.md

@@ -7,7 +7,7 @@ Opensource Git GUI client.
 * Supports Windows/macOS/Linux
 * Opensource/Free
 * Fast
-* English/简体中文/繁體中文
+* English/German/Português/简体中文/繁體中文
 * Built-in light/dark themes
 * Customize theme
 * Visual commit graph
@@ -110,6 +110,8 @@ This app supports open repository in external tools listed in the table below.
 
 ## 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`.
+
 Thanks to all the people who contribute.
 
 [![Contributors](https://contrib.rocks/image?repo=sourcegit-scm/sourcegit&columns=10)](https://github.com/sourcegit-scm/sourcegit/graphs/contributors)

VERSION

@@ -1 +1 @@
-8.23
+8.24

build/resources/_common/applications/sourcegit.desktop

@@ -5,4 +5,5 @@ Exec=/opt/sourcegit/sourcegit
 Icon=/usr/share/icons/sourcegit.png
 Terminal=false
 Type=Application
-Categories=Development
+Categories=Development
+MimeType=inode/directory;

src/App.axaml

@@ -11,7 +11,9 @@
         <ResourceInclude Source="/Resources/Themes.axaml"/>
       </ResourceDictionary.MergedDictionaries>
 
+      <ResourceInclude x:Key="de_DE" Source="/Resources/Locales/de_DE.axaml"/>
       <ResourceInclude x:Key="en_US" Source="/Resources/Locales/en_US.axaml"/>
+      <ResourceInclude x:Key="pt_BR" Source="/Resources/Locales/pt_BR.axaml"/>
       <ResourceInclude x:Key="zh_CN" Source="/Resources/Locales/zh_CN.axaml"/>
       <ResourceInclude x:Key="zh_TW" Source="/Resources/Locales/zh_TW.axaml"/>
     </ResourceDictionary>

src/App.axaml.cs

@@ -208,8 +208,8 @@ public static async void CopyText(string data)
         {
             if (Current?.ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
             {
-                if (desktop.MainWindow?.Clipboard is { } clipbord)
-                    await clipbord.SetTextAsync(data);
+                if (desktop.MainWindow?.Clipboard is { } clipboard)
+                    await clipboard.SetTextAsync(data);
             }
         }
 

src/Commands/Blame.cs

@@ -6,7 +6,6 @@ namespace SourceGit.Commands
 {
     public partial class Blame : Command
     {
-
         [GeneratedRegex(@"^\^?([0-9a-f]+)\s+.*\((.*)\s+(\d+)\s+[\-\+]?\d+\s+\d+\) (.*)")]
         private static partial Regex REG_FORMAT();
 

src/Commands/Config.cs

@@ -50,24 +50,16 @@ public bool Set(string key, string value, bool allowEmpty = false)
             if (!allowEmpty && string.IsNullOrWhiteSpace(value))
             {
                 if (string.IsNullOrEmpty(WorkingDirectory))
-                {
                     Args = $"config --global --unset {key}";
-                }
                 else
-                {
                     Args = $"config --unset {key}";
-                }
             }
             else
             {
                 if (string.IsNullOrWhiteSpace(WorkingDirectory))
-                {
                     Args = $"config --global {key} \"{value}\"";
-                }
                 else
-                {
                     Args = $"config {key} \"{value}\"";
-                }
             }
 
             return Exec();

src/Commands/Diff.cs

@@ -38,13 +38,9 @@ public Models.DiffResult Result()
                 ProcessInlineHighlights();
 
                 if (_result.TextDiff.Lines.Count == 0)
-                {
                     _result.TextDiff = null;
-                }
                 else
-                {
                     _result.TextDiff.MaxLineNumber = Math.Max(_newLine, _oldLine);
-                }
             }
 
             return _result;

src/Commands/Discard.cs

@@ -11,21 +11,17 @@ public static void All(string repo)
             new Clean(repo).Exec();
         }
 
-        public static void ChangesInWorkTree(string repo, List<Models.Change> changes)
+        public static void Changes(string repo, List<Models.Change> changes)
         {
             var needClean = new List<string>();
             var needCheckout = new List<string>();
 
             foreach (var c in changes)
             {
                 if (c.WorkTree == Models.ChangeState.Untracked || c.WorkTree == Models.ChangeState.Added)
-                {
                     needClean.Add(c.Path);
-                }
                 else
-                {
                     needCheckout.Add(c.Path);
-                }
             }
 
             for (int i = 0; i < needClean.Count; i += 10)
@@ -40,17 +36,5 @@ public static void ChangesInWorkTree(string repo, List<Models.Change> changes)
                 new Restore(repo, needCheckout.GetRange(i, count), "--worktree --recurse-submodules").Exec();
             }
         }
-
-        public static void ChangesInStaged(string repo, List<Models.Change> changes)
-        {
-            for (int i = 0; i < changes.Count; i += 10)
-            {
-                var count = Math.Min(10, changes.Count - i);
-                var files = new List<string>();
-                for (int j = 0; j < count; j++)
-                    files.Add(changes[i + j].Path);
-                new Restore(repo, files, "--staged --worktree --recurse-submodules").Exec();
-            }
-        }
     }
 }