Merge branch 'release/v8.8'

Author: love-linger

.github/workflows/ci.yml

@@ -2,9 +2,9 @@ name: Continuous Integration
 on:
   push:
     branches:
-      - master
+      - develop
   pull_request:
-    branches: [master]
+    branches: [develop]
   workflow_dispatch:
 jobs:
   build:

README.md

@@ -37,6 +37,7 @@ You can download the latest stable from [Releases](https://github.com/sourcegit-
 For **Windows** users:
 
 * **MSYS Git is NOT supported**. Please use official [Git for Windows](https://git-scm.com/download/win) instead.
+* `Source.win-x64.zip` may be reported as virus by Windows Defender. I don't know why. I have manually tested the zip to be uploaded using Windows Defender before uploading and no virus was found. If you have installed .NET 8 SDK locally, I suggest you to compile it yourself. And if you have any idea about how to fix this, please open an issue.
 
 For **macOS** users:
 
@@ -53,20 +54,20 @@ For **Linux** users:
 * Maybe you need to set environment variable `AVALONIA_SCREEN_SCALE_FACTORS`. See https://github.com/AvaloniaUI/Avalonia/wiki/Configuring-X11-per-monitor-DPI. 
 * Modify `SourceGit.desktop.template` (replace SOURCEGIT_LOCAL_FOLDER with real path) and move it into `~/.local/share/applications`.
 
-## External Editors
+## External Tools
 
-This app supports open repository in external editors listed in the table below.
+This app supports open repository in external tools listed in the table below.
 
-| Editor | Windows | macOS | Linux | Environment Variable |
+| Tool | Windows | macOS | Linux | Environment Variable |
 | --- | --- | --- | --- | --- |
 | Visual Studio Code | YES | YES | YES | VSCODE_PATH |
 | Visual Studio Code - Insiders | YES | YES | YES | VSCODE_INSIDERS_PATH |
 | JetBrains Fleet | YES | YES | YES | FLEET_PATH |
 | Sublime Text | YES | YES | YES | SUBLIME_TEXT_PATH |
 
-You can set the given environment variable for special editor if it can NOT be found by this app automatically. 
+You can set the given environment variable for special tool if it can NOT be found by this app automatically. 
 
-## Screen Shots
+## Screenshots
 
 * Dark Theme
 

build/resources/App.plist

@@ -9,7 +9,7 @@
     <key>CFBundleName</key>
     <string>SourceGit</string>
     <key>CFBundleVersion</key>
-    <string>8.7.0</string>
+    <string>8.8.0</string>
     <key>LSMinimumSystemVersion</key>
     <string>10.12</string>
     <key>CFBundleExecutable</key>
@@ -19,8 +19,8 @@
     <key>CFBundlePackageType</key>
     <string>APPL</string>
     <key>CFBundleShortVersionString</key>
-    <string>8.7</string>
+    <string>8.8</string>
     <key>NSHighResolutionCapable</key>
     <true/>
 </dict>
-</plist>
+</plist>

src/Commands/Checkout.cs

@@ -28,17 +28,31 @@ public bool Branch(string branch, string basedOn, Action<string> onProgress)
             return Exec();
         }
 
-        public bool File(string file, bool useTheirs)
+        public bool UseTheirs(List<string> files)
         {
-            if (useTheirs)
+            StringBuilder builder = new StringBuilder();
+            builder.Append("checkout --theirs --");
+            foreach (var f in files)
             {
-                Args = $"checkout --theirs -- \"{file}\"";
+                builder.Append(" \"");
+                builder.Append(f);
+                builder.Append("\"");
             }
-            else
+            Args = builder.ToString();
+            return Exec();
+        }
+
+        public bool UseMine(List<string> files)
+        {
+            StringBuilder builder = new StringBuilder();
+            builder.Append("checkout --ours --");
+            foreach (var f in files)
             {
-                Args = $"checkout --ours -- \"{file}\"";
+                builder.Append(" \"");
+                builder.Append(f);
+                builder.Append("\"");
             }
-
+            Args = builder.ToString();
             return Exec();
         }
 

src/Commands/Diff.cs

@@ -46,6 +46,18 @@ public Models.DiffResult Result()
 
         protected override void OnReadline(string line)
         {
+            if (line.StartsWith("old mode ", StringComparison.Ordinal))
+            {
+                _result.OldMode = line.Substring(9);
+                return;
+            }
+
+            if (line.StartsWith("new mode ", StringComparison.Ordinal))
+            {
+                _result.NewMode = line.Substring(9);
+                return;
+            }
+
             if (_result.IsBinary)
                 return;
 

src/Commands/Fetch.cs

@@ -24,7 +24,7 @@ public Fetch(string repo, string remote, bool prune, Action<string> outputHandle
                 Args = "-c credential.helper=manager ";
             }
 
-            Args += "fetch --progress --verbose ";
+            Args += "fetch --force --progress --verbose ";
             if (prune)
                 Args += "--prune ";
             Args += remote;

src/Commands/QueryCommitChanges.cs

@@ -7,7 +7,7 @@ namespace SourceGit.Converters
     public static class ListConverters
     {
         public static readonly FuncValueConverter<IList, string> ToCount =
-            new FuncValueConverter<IList, string>(v => $" ({v.Count})");
+            new FuncValueConverter<IList, string>(v => v == null ? " (0)" : $" ({v.Count})");
 
         public static readonly FuncValueConverter<IList, bool> IsNotNullOrEmpty =
             new FuncValueConverter<IList, bool>(v => v != null && v.Count > 0);

src/Converters/ListConverters.cs

@@ -11,13 +11,5 @@ public static class PathConverters
 
         public static readonly FuncValueConverter<string, string> PureDirectoryName =
             new FuncValueConverter<string, string>(fullpath => Path.GetDirectoryName(fullpath) ?? "");
-
-        public static readonly FuncValueConverter<string, string> TruncateIfTooLong =
-            new FuncValueConverter<string, string>(fullpath =>
-            {
-                if (fullpath.Length <= 50)
-                    return fullpath;
-                return fullpath.Substring(0, 20) + ".../" + Path.GetFileName(fullpath);
-            });
     }
 }

src/Converters/PathConverters.cs

@@ -576,11 +576,21 @@ public class NoOrEOLChange
     {
     }
 
+    public class FileModeDiff
+    {
+        public string Old { get; set; } = string.Empty;
+        public string New { get; set; } = string.Empty;
+    }
+
     public class DiffResult
     {
         public bool IsBinary { get; set; } = false;
         public bool IsLFS { get; set; } = false;
+        public string OldMode { get; set; } = string.Empty;
+        public string NewMode { get; set; } = string.Empty;
         public TextDiff TextDiff { get; set; } = null;
         public LFSDiff LFSDiff { get; set; } = null;
+
+        public string FileModeChange => string.IsNullOrEmpty(OldMode) ? string.Empty : $"{OldMode} → {NewMode}";
     }
 }