Merge branch 'release/v8.31'

Author: love-linger

README.md

@@ -7,7 +7,7 @@ Opensource Git GUI client.
 * Supports Windows/macOS/Linux
 * Opensource/Free
 * Fast
-* English/Français/Deutsch/Português/简体中文/繁體中文
+* English/Français/Deutsch/Português/Русский/简体中文/繁體中文
 * Built-in light/dark themes
 * Customize theme
 * Visual commit graph
@@ -97,7 +97,7 @@ For `OpenAI`:
 
 For other AI service:
 
-* The `Server` should fill in a URL equivalent to OpenAI's `https://api.openai.com/v1/chat/completions`
+* The `Server` should fill in a URL equivalent to OpenAI's `https://api.openai.com/v1/chat/completions`. For example, when using `Ollama`, it should be `http://localhost:11434/v1/chat/completions` instead of `http://localhost:11434/api/generate`
 * The `API Key` is optional that depends on the service
 
 ## External Tools
@@ -111,6 +111,7 @@ This app supports open repository in external tools listed in the table below.
 | VSCodium                      | YES     | YES   | YES   | VSCODIUM                       |
 | JetBrains Fleet               | YES     | YES   | YES   | FLEET                          |
 | Sublime Text                  | YES     | YES   | YES   | SUBLIME_TEXT                   |
+| Zed                           | NO      | YES   | YES   | ZED                            |
 
 > [!NOTE]
 > This app will try to find those tools based on some pre-defined or expected locations automatically. If you are using one portable version of these tools, it will not be detected by this app.

VERSION

@@ -1 +1 @@
-8.30.1
+8.31

build/scripts/package.linux.sh

@@ -1,13 +1,16 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
+set -o
+set -u
+set pipefail
 
-if [ -z "$VERSION" ]; then
+if [[ -z "$VERSION" ]]; then
     echo "Provide the version as environment variable VERSION"
     exit 1
 fi
 
-if [ -z "$RUNTIME" ]; then
+if [[ -z "$RUNTIME" ]]; then
     echo "Provide the runtime as environment variable RUNTIME"
     exit 1
 fi
@@ -33,7 +36,7 @@ APPIMAGETOOL_URL=https://github.com/AppImage/appimagetool/releases/download/cont
 
 cd build
 
-if [ ! -f "appimagetool" ]; then
+if [[ ! -f "appimagetool" ]]; then
     curl -o appimagetool -L "$APPIMAGETOOL_URL"
     chmod +x appimagetool
 fi

build/scripts/package.osx-app.sh

@@ -1,13 +1,16 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
+set -o
+set -u
+set pipefail
 
-if [ -z "$VERSION" ]; then
+if [[ -z "$VERSION" ]]; then
     echo "Provide the version as environment variable VERSION"
     exit 1
 fi
 
-if [ -z "$RUNTIME" ]; then
+if [[ -z "$RUNTIME" ]]; then
     echo "Provide the runtime as environment variable RUNTIME"
     exit 1
 fi

build/scripts/package.windows-portable.sh

@@ -1,13 +1,16 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
+set -o
+set -u
+set pipefail
 
-if [ -z "$VERSION" ]; then
+if [[ -z "$VERSION" ]]; then
     echo "Provide the version as environment variable VERSION"
     exit 1
 fi
 
-if [ -z "$RUNTIME" ]; then
+if [[ -z "$RUNTIME" ]]; then
     echo "Provide the runtime as environment variable RUNTIME"
     exit 1
 fi

src/App.axaml

@@ -15,6 +15,7 @@
       <ResourceInclude x:Key="en_US" Source="/Resources/Locales/en_US.axaml"/>
       <ResourceInclude x:Key="fr_FR" Source="/Resources/Locales/fr_FR.axaml"/>
       <ResourceInclude x:Key="pt_BR" Source="/Resources/Locales/pt_BR.axaml"/>
+      <ResourceInclude x:Key="ru_RU" Source="/Resources/Locales/ru_RU.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

@@ -521,6 +521,9 @@ private bool TryLaunchedAsAskpass(IClassicDesktopStyleApplicationLifetime deskto
                 return false;
 
             var param = args[0];
+            if (Directory.Exists(param))
+                return false;
+
             if (!param.StartsWith("enter passphrase", StringComparison.OrdinalIgnoreCase) &&
                 !param.Contains(" password", StringComparison.OrdinalIgnoreCase))
                 return false;

src/Commands/Command.cs

@@ -59,9 +59,14 @@ public bool Exec()
 
             // If an SSH private key was provided, sets the environment.
             if (!string.IsNullOrEmpty(SSHKey))
+            {
                 start.Environment.Add("GIT_SSH_COMMAND", $"ssh -o StrictHostKeyChecking=accept-new -i '{SSHKey}'");
+            }
             else
+            {
+                start.Environment.Add("GIT_SSH_COMMAND", $"ssh -o StrictHostKeyChecking=accept-new");
                 start.Arguments += "-c credential.helper=manager ";
+            }
 
             // Force using en_US.UTF-8 locale to avoid GCM crash
             if (OperatingSystem.IsLinux())

src/Converters/PathConverters.cs

@@ -1,4 +1,5 @@
-using System.IO;
+using System;
+using System.IO;
 
 using Avalonia.Data.Converters;
 
@@ -7,9 +8,23 @@ namespace SourceGit.Converters
     public static class PathConverters
     {
         public static readonly FuncValueConverter<string, string> PureFileName =
-            new FuncValueConverter<string, string>(fullpath => Path.GetFileName(fullpath) ?? "");
+            new(v => Path.GetFileName(v) ?? "");
 
         public static readonly FuncValueConverter<string, string> PureDirectoryName =
-            new FuncValueConverter<string, string>(fullpath => Path.GetDirectoryName(fullpath) ?? "");
+            new(v => Path.GetDirectoryName(v) ?? "");
+
+        public static readonly FuncValueConverter<string, string> RelativeToHome =
+            new(v =>
+            {
+                if (OperatingSystem.IsWindows())
+                    return v;
+                
+                var home = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
+                var prefixLen = home.EndsWith('/') ? home.Length - 1 : home.Length;
+                if (v.StartsWith(home, StringComparison.Ordinal))
+                    return "~" + v.Substring(prefixLen);
+
+                return v;
+            });
     }
 }

src/Models/AutoFetchManager.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
 
@@ -20,6 +21,7 @@ public static AutoFetchManager Instance
 
         public class Job
         {
+            public string IndexLockFile = string.Empty;
             public Commands.Fetch Cmd = null;
             public DateTime NextRunTimepoint = DateTime.MinValue;
         }
@@ -75,8 +77,11 @@ public void Start()
 
                     foreach (var job in uptodate)
                     {
-                        job.Cmd.Exec();
-                        job.NextRunTimepoint = DateTime.Now.AddMinutes(Convert.ToDouble(Interval));
+                        if (!File.Exists(job.IndexLockFile))
+                        {
+                            job.Cmd.Exec();
+                            job.NextRunTimepoint = DateTime.Now.AddMinutes(Convert.ToDouble(Interval));
+                        }
                     }
 
                     Thread.Sleep(2000);
@@ -86,10 +91,11 @@ public void Start()
             });
         }
 
-        public void AddRepository(string repo)
+        public void AddRepository(string repo, string gitDir)
         {
             var job = new Job
             {
+                IndexLockFile = Path.Combine(gitDir, "index.lock"),
                 Cmd = new Commands.Fetch(repo, "--all", true, false, null) { RaiseError = false },
                 NextRunTimepoint = DateTime.Now.AddMinutes(Convert.ToDouble(Interval)),
             };