Merge branch 'release/v8.23'

sourcegit-scm · Jul 29, 2024 · b7c6d62 · b7c6d62
2 parents 41dfbb3 + aec621b
commit b7c6d62
Show file tree

Hide file tree

Showing 78 changed files with 1,264 additions and 784 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Build
         run: dotnet build -c Release
       - name: Publish
-        run: dotnet publish src/SourceGit.csproj -c Release -o publish -r win-x64 -p:PublishAot=true -p:PublishTrimmed=true -p:TrimMode=link --self-contained
+        run: dotnet publish src/SourceGit.csproj -c Release -o publish -r win-x64
       - name: Upload Artifact
         uses: actions/upload-artifact@v4
         with:
@@ -43,7 +43,7 @@ jobs:
       - name: Build
         run: dotnet build -c Release
       - name: Publish
-        run: dotnet publish src/SourceGit.csproj -c Release -o publish -r osx-x64 -p:PublishAot=true -p:PublishTrimmed=true -p:TrimMode=link --self-contained
+        run: dotnet publish src/SourceGit.csproj -c Release -o publish -r osx-x64
       - name: Packing Program
         run:  tar -cvf sourcegit.osx-x64.tar -C publish/ .
       - name: Upload Artifact
@@ -66,7 +66,7 @@ jobs:
       - name: Build
         run: dotnet build -c Release
       - name: Publish
-        run: dotnet publish src/SourceGit.csproj -c Release -o publish -r osx-arm64 -p:PublishAot=true -p:PublishTrimmed=true -p:TrimMode=link --self-contained
+        run: dotnet publish src/SourceGit.csproj -c Release -o publish -r osx-arm64
       - name: Packing Program
         run: tar -cvf sourcegit.osx-arm64.tar -C publish/ .
       - name: Upload Artifact
@@ -89,7 +89,7 @@ jobs:
       - name: Build
         run: dotnet build -c Release
       - name: Publish
-        run: dotnet publish src/SourceGit.csproj -c Release -o publish -r linux-x64 -p:PublishAot=true -p:PublishTrimmed=true -p:TrimMode=link --self-contained
+        run: dotnet publish src/SourceGit.csproj -c Release -o publish -r linux-x64
       - name: Rename Executable File
         run: mv publish/SourceGit publish/sourcegit
       - name: Packing Program

diff --git a/SourceGit.sln b/SourceGit.sln
@@ -75,6 +75,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SPECS", "SPECS", "{7802CD7A
 		build\resources\rpm\SPECS\build.spec = build\resources\rpm\SPECS\build.spec
 	EndProjectSection
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "appimage", "appimage", "{5D125DD9-B48A-491F-B2FB-D7830D74C4DC}"
+	ProjectSection(SolutionItems) = preProject
+		build\resources\appimage\publish-appimage = build\resources\appimage\publish-appimage
+		build\resources\appimage\publish-appimage.conf = build\resources\appimage\publish-appimage.conf
+		build\resources\appimage\runtime-x86_64 = build\resources\appimage\runtime-x86_64
+		build\resources\appimage\sourcegit.appdata.xml = build\resources\appimage\sourcegit.appdata.xml
+		build\resources\appimage\sourcegit.png = build\resources\appimage\sourcegit.png
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -104,6 +113,7 @@ Global
 		{F101849D-BDB7-40D4-A516-751150C3CCFC} = {9C2F0CDA-B56E-44A5-94B6-F3EA7AC20CDC}
 		{9BA0B044-0CC9-46F8-B551-204F149BF45D} = {FD384607-ED99-47B7-AF31-FB245841BC92}
 		{7802CD7A-591B-4EDD-96F8-9BF3F61692E4} = {9BA0B044-0CC9-46F8-B551-204F149BF45D}
+		{5D125DD9-B48A-491F-B2FB-D7830D74C4DC} = {FD384607-ED99-47B7-AF31-FB245841BC92}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {7FF1B9C6-B5BF-4A50-949F-4B407A0E31C9}

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-8.22.1
+8.23
diff --git a/build/build.osx.command b/build/build.osx.command
@@ -9,13 +9,13 @@ cp resources/app/App.icns SourceGit.app/Contents/Resources/App.icns
 sed "s/SOURCE_GIT_VERSION/${version}/g" resources/app/App.plist > SourceGit.app/Contents/Info.plist
 
 mkdir -p SourceGit.app/Contents/MacOS
-dotnet publish ../src/SourceGit.csproj -c Release -r osx-arm64 -o SourceGit.app/Contents/MacOS -p:PublishAot=true -p:PublishTrimmed=true -p:TrimMode=link --self-contained
+dotnet publish ../src/SourceGit.csproj -c Release -r osx-arm64 -o SourceGit.app/Contents/MacOS
 zip sourcegit_${version}.osx-arm64.zip -r SourceGit.app -x "*/*\.dsym/*"
 
 rm -rf SourceGit.app/Contents/MacOS
 
 mkdir -p SourceGit.app/Contents/MacOS
-dotnet publish ../src/SourceGit.csproj -c Release -r osx-x64 -o SourceGit.app/Contents/MacOS -p:PublishAot=true -p:PublishTrimmed=true -p:TrimMode=link --self-contained
+dotnet publish ../src/SourceGit.csproj -c Release -r osx-x64 -o SourceGit.app/Contents/MacOS
 zip sourcegit_${version}.osx-x64.zip -r SourceGit.app -x "*/*\.dsym/*"
 
 rm -rf SourceGit.app
diff --git a/build/build.windows.ps1 b/build/build.windows.ps1
@@ -6,7 +6,7 @@ if (Test-Path SourceGit) {
 
 Remove-Item *.zip -Force
 
-dotnet publish ..\src\SourceGit.csproj -c Release -r win-arm64 -o SourceGit -p:PublishAot=true -p:PublishTrimmed=true -p:TrimMode=link --self-contained
+dotnet publish ..\src\SourceGit.csproj -c Release -r win-arm64 -o SourceGit
 
 Remove-Item SourceGit\*.pdb -Force
 
@@ -16,7 +16,7 @@ if (Test-Path SourceGit) {
     Remove-Item SourceGit -Recurse -Force
 }
 
-dotnet publish ..\src\SourceGit.csproj -c Release -r win-x64 -o SourceGit -p:PublishAot=true -p:PublishTrimmed=true -p:TrimMode=link --self-contained
+dotnet publish ..\src\SourceGit.csproj -c Release -r win-x64 -o SourceGit
 
 Remove-Item SourceGit\*.pdb -Force
 

diff --git a/build/resources/app/App.plist b/build/resources/app/App.plist
@@ -2,30 +2,30 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-    <key>CFBundleIconFile</key>
-    <string>App.icns</string>
-    <key>CFBundleIdentifier</key>
-    <string>com.sourcegit-scm.sourcegit</string>
-    <key>CFBundleName</key>
-    <string>SourceGit</string>
-    <key>CFBundleVersion</key>
-    <string>SOURCE_GIT_VERSION.0</string>
-    <key>LSMinimumSystemVersion</key>
-    <string>10.12</string>
-    <key>LSEnvironment</key>
-    <dict>
-        <key>PATH</key>
-        <string>/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin</string>
-    </dict>
-    <key>CFBundleExecutable</key>
-    <string>SourceGit</string>
-    <key>CFBundleInfoDictionaryVersion</key>
-    <string>6.0</string>
-    <key>CFBundlePackageType</key>
-    <string>APPL</string>
-    <key>CFBundleShortVersionString</key>
-    <string>SOURCE_GIT_VERSION</string>
-    <key>NSHighResolutionCapable</key>
-    <true/>
+	<key>CFBundleIconFile</key>
+	<string>App.icns</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.sourcegit-scm.sourcegit</string>
+	<key>CFBundleName</key>
+	<string>SourceGit</string>
+	<key>CFBundleVersion</key>
+	<string>SOURCE_GIT_VERSION.0</string>
+	<key>LSMinimumSystemVersion</key>
+	<string>11.0</string>
+	<key>LSEnvironment</key>
+	<dict>
+		<key>PATH</key>
+		<string>/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin</string>
+	</dict>
+	<key>CFBundleExecutable</key>
+	<string>SourceGit</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>SOURCE_GIT_VERSION</string>
+	<key>NSHighResolutionCapable</key>
+	<true/>
 </dict>
 </plist>
diff --git a/build/resources/appimage/publish-appimage.conf b/build/resources/appimage/publish-appimage.conf
@@ -82,7 +82,7 @@ DOTNET_PROJECT_PATH="../../../src/SourceGit.csproj"
 # Additional useful arguments include:
 # "-p:DebugType=None -p:DebugSymbols=false -p:PublishSingleFile=true -p:PublishTrimmed=true -p:TrimMode=link"
 # Refer: https://docs.microsoft.com/en-us/dotnet/core/tools/dotnet-publish
-DOTNET_PUBLISH_ARGS="-c Release -p:DebugType=None -p:DebugSymbols=false -p:PublishAot=true -p:PublishTrimmed=true -p:TrimMode=link --self-contained"
+DOTNET_PUBLISH_ARGS="-c Release -p:DebugType=None -p:DebugSymbols=false"
 
 
 ########################################
@@ -137,4 +137,4 @@ PKG_APPIMAGE_SUFFIX=".AppImage"
 APPIMAGETOOL_COMMAND="appimagetool"
 
 # Internal use only. Used for compatibility between conf and script. Do not modify.
-CONF_IMPL_VERSION=1
+CONF_IMPL_VERSION=1
diff --git a/src/App.JsonCodeGen.cs b/src/App.JsonCodeGen.cs
@@ -62,7 +62,7 @@ public override void Write(Utf8JsonWriter writer, GridLength value, JsonSerializ
     [JsonSerializable(typeof(Models.JetBrainsState))]
     [JsonSerializable(typeof(Models.ThemeOverrides))]
     [JsonSerializable(typeof(Models.Version))]
+    [JsonSerializable(typeof(Models.RepositorySettings))]
     [JsonSerializable(typeof(ViewModels.Preference))]
-    [JsonSerializable(typeof(ViewModels.RepositorySettings))]
     internal partial class JsonCodeGen : JsonSerializerContext { }
 }
diff --git a/src/App.axaml.cs b/src/App.axaml.cs
@@ -92,7 +92,7 @@ public static AppBuilder BuildAvaloniaApp()
             var toplevel = GetTopLevel() as Window;
             if (toplevel == null)
                 return;
-            
+
             var dialog = new Views.Preference();
             dialog.ShowDialog(toplevel);
         });
@@ -102,7 +102,7 @@ public static AppBuilder BuildAvaloniaApp()
             var toplevel = GetTopLevel() as Window;
             if (toplevel == null)
                 return;
-            
+
             var dialog = new Views.Hotkeys();
             dialog.ShowDialog(toplevel);
         });
@@ -112,7 +112,7 @@ public static AppBuilder BuildAvaloniaApp()
             var toplevel = GetTopLevel() as Window;
             if (toplevel == null)
                 return;
-            
+
             var dialog = new Views.About();
             dialog.ShowDialog(toplevel);
         });
@@ -247,7 +247,7 @@ public static Avalonia.Controls.Shapes.Path CreateMenuIcon(string key)
             var geo = Current?.FindResource(key) as StreamGeometry;
             if (geo != null)
                 icon.Data = geo;
-            
+
             return icon;
         }
 
@@ -257,7 +257,7 @@ public static TopLevel GetTopLevel()
             {
                 return desktop.MainWindow;
             }
-            
+
             return null;
         }
 
@@ -302,6 +302,11 @@ public static void Check4Update(bool manually = false)
             });
         }
 
+        public static ViewModels.Launcher GetLauncer()
+        {
+            return Current is App app ? app._launcher : null;
+        }
+
         public static ViewModels.Repository FindOpenedRepository(string repoPath)
         {
             if (Current is App app && app._launcher != null)
@@ -501,10 +506,15 @@ private bool TryLaunchedAsCoreEditor(IClassicDesktopStyleApplicationLifetime des
         private bool TryLaunchedAsAskpass(IClassicDesktopStyleApplicationLifetime desktop)
         {
             var args = desktop.Args;
-            if (args == null || args.Length != 1 || !args[0].StartsWith("Enter passphrase", StringComparison.Ordinal))
+            if (args == null || args.Length != 1)
+                return false;
+
+            var param = args[0];
+            if (!param.StartsWith("enter passphrase", StringComparison.OrdinalIgnoreCase) &&
+                !param.Contains(" password", StringComparison.OrdinalIgnoreCase))
                 return false;
 
-            desktop.MainWindow = new Views.Askpass(args[0]);
+            desktop.MainWindow = new Views.Askpass(param);
             return true;
         }
 

diff --git a/src/Commands/AssumeUnchanged.cs b/src/Commands/AssumeUnchanged.cs
@@ -5,11 +5,11 @@ namespace SourceGit.Commands
 {
     public partial class AssumeUnchanged
     {
-        partial class ViewCommand : Command
-        {
-            [GeneratedRegex(@"^(\w)\s+(.+)$")]
-            private static partial Regex REG();
+        [GeneratedRegex(@"^(\w)\s+(.+)$")]
+        private static partial Regex REG_PARSE();
 
+        class ViewCommand : Command
+        {
             public ViewCommand(string repo)
             {
                 WorkingDirectory = repo;
@@ -25,7 +25,7 @@ public List<string> Result()
 
             protected override void OnReadline(string line)
             {
-                var match = REG().Match(line);
+                var match = REG_PARSE().Match(line);
                 if (!match.Success)
                     return;
 

diff --git a/src/Commands/CompareRevisions.cs b/src/Commands/CompareRevisions.cs
@@ -13,7 +13,9 @@ public CompareRevisions(string repo, string start, string end)
         {
             WorkingDirectory = repo;
             Context = repo;
-            Args = $"diff --name-status {start} {end}";
+
+            var based = string.IsNullOrEmpty(start) ? "-R" : start;
+            Args = $"diff --name-status {based} {end}";
         }
 
         public List<Models.Change> Result()

diff --git a/src/Commands/Diff.cs b/src/Commands/Diff.cs
@@ -14,7 +14,8 @@ public partial class Diff : Command
 
         public Diff(string repo, Models.DiffOption opt, int unified)
         {
-            _result.TextDiff = new Models.TextDiff() {
+            _result.TextDiff = new Models.TextDiff()
+            {
                 Repo = repo,
                 Option = opt,
             };

diff --git a/src/Commands/QueryBranches.cs b/src/Commands/QueryBranches.cs
@@ -1,18 +1,14 @@
 using System;
 using System.Collections.Generic;
-using System.Text.RegularExpressions;
 
 namespace SourceGit.Commands
 {
-    public partial class QueryBranches : Command
+    public class QueryBranches : Command
     {
         private const string PREFIX_LOCAL = "refs/heads/";
         private const string PREFIX_REMOTE = "refs/remotes/";
         private const string PREFIX_DETACHED = "(HEAD detached at";
 
-        [GeneratedRegex(@"^(\d+)\s(\d+)$")]
-        private static partial Regex REG_AHEAD_BEHIND();
-
         public QueryBranches(string repo)
         {
             WorkingDirectory = repo;

diff --git a/src/Commands/QuerySingleCommit.cs b/src/Commands/QuerySingleCommit.cs
@@ -38,7 +38,5 @@ public Models.Commit Result()
 
             return null;
         }
-
-
     }
 }
diff --git a/src/Commands/QueryStashChanges.cs b/src/Commands/QueryStashChanges.cs
@@ -5,7 +5,6 @@ namespace SourceGit.Commands
 {
     public partial class QueryStashChanges : Command
     {
-
         [GeneratedRegex(@"^(\s?[\w\?]{1,4})\s+(.+)$")]
         private static partial Regex REG_FORMAT();
 

diff --git a/src/Commands/QueryTags.cs b/src/Commands/QueryTags.cs
@@ -9,7 +9,7 @@ public QueryTags(string repo)
         {
             Context = repo;
             WorkingDirectory = repo;
-            Args = "for-each-ref --sort=-creatordate --format=\"$%(refname:short)$%(objectname)$%(*objectname)\" refs/tags";
+            Args = "tag -l --sort=-creatordate --format=\"$%(refname)$%(objectname)$%(*objectname)\"";
         }
 
         public List<Models.Tag> Result()
@@ -25,15 +25,15 @@ protected override void OnReadline(string line)
             {
                 _loaded.Add(new Models.Tag()
                 {
-                    Name = subs[0],
+                    Name = subs[0].Substring(10),
                     SHA = subs[1],
                 });
             }
             else if (subs.Length == 3)
             {
                 _loaded.Add(new Models.Tag()
                 {
-                    Name = subs[0],
+                    Name = subs[0].Substring(10),
                     SHA = subs[2],
                 });
             }

diff --git a/src/Commands/QueryTrackStatus.cs b/src/Commands/QueryTrackStatus.cs
@@ -4,7 +4,7 @@ namespace SourceGit.Commands
 {
     public class QueryTrackStatus : Command
     {
-        public QueryTrackStatus(string repo, string local, string upstream) 
+        public QueryTrackStatus(string repo, string local, string upstream)
         {
             WorkingDirectory = repo;
             Context = repo;
@@ -19,7 +19,7 @@ public Models.BranchTrackStatus Result()
             if (!rs.IsSuccess)
                 return status;
 
-            var lines = rs.StdOut.Split(['\n', '\r'], StringSplitOptions.RemoveEmptyEntries);
+            var lines = rs.StdOut.Split(new char[] { '\n', '\r' }, StringSplitOptions.RemoveEmptyEntries);
             foreach (var line in lines)
             {
                 if (line[0] == '>')
-Original file line number
+Diff line change
@@ Expand Up / @@ -38,7 +38,5 @@ public Models.Commit Result() @@
                 return null;
             }
         }
     }