Merge branch 'release/v8.22'

Author: love-linger

.github/workflows/ci.yml

@@ -9,7 +9,7 @@ on:
 jobs:
   build-windows:
     name: Build Windows x64
-    runs-on: windows-latest
+    runs-on: windows-2019
     steps:
       - name: Checkout sources
         uses: actions/checkout@v4
@@ -30,7 +30,7 @@ jobs:
           path: publish
   build-macos-intel:
     name: Build macOS (Intel)
-    runs-on: macos-latest
+    runs-on: macos-13
     steps:
       - name: Checkout sources
         uses: actions/checkout@v4
@@ -76,7 +76,7 @@ jobs:
           path: sourcegit.osx-arm64.tar
   build-linux:
     name: Build Linux
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - name: Checkout sources
         uses: actions/checkout@v4

README.md

@@ -41,7 +41,7 @@ Opensource Git GUI client.
 
 You can download the latest stable from [Releases](https://github.com/sourcegit-scm/sourcegit/releases/latest) or download workflow artifacts from [Github Actions](https://github.com/sourcegit-scm/sourcegit/actions) to try this app based on latest commits.
 
-This software creates a folder `$"{System.Environment.SpecialFolder.ApplicationData}/SourceGit"`, which is platform-dependent, to store user settings, downloaded avatars and crash logs. 
+This software creates a folder `$"{System.Environment.SpecialFolder.ApplicationData}/SourceGit"`, which is platform-dependent, to store user settings, downloaded avatars and crash logs.
 
 | OS      | PATH                                            |
 |---------|-------------------------------------------------|
@@ -52,8 +52,16 @@ This software creates a folder `$"{System.Environment.SpecialFolder.ApplicationD
 For **Windows** users:
 
 * **MSYS Git is NOT supported**. Please use official [Git for Windows](https://git-scm.com/download/win) instead.
-* You can install the latest stable by `winget install SourceGit`.
-  - Note: `winget` will install this software as a commandline tool. You need run `SourceGit` from console or `Win+R` at the first time. Then you can add it to the taskbar.
+* You can install the latest stable from `winget` with follow commands:
+  ```shell
+  winget install SourceGit
+  ```
+  > `winget` will install this software as a commandline tool. You need run `SourceGit` from console or `Win+R` at the first time. Then you can add it to the taskbar.
+* You can install the latest stable by `scoope` with follow commands:
+  ```shell
+  scoop bucket add extras
+  scoop install sourcegit
+  ```
 * Portable versions can be found in [Releases](https://github.com/sourcegit-scm/sourcegit/releases/latest)
 
 For **macOS** users:
@@ -68,7 +76,7 @@ For **Linux** users:
 
 * `xdg-open` must be installed to support open native file manager.
 * Make sure [git-credential-manager](https://github.com/git-ecosystem/git-credential-manager/releases) is installed on your linux.
-* Maybe you need to set environment variable `AVALONIA_SCREEN_SCALE_FACTORS`. See https://github.com/AvaloniaUI/Avalonia/wiki/Configuring-X11-per-monitor-DPI. 
+* Maybe you need to set environment variable `AVALONIA_SCREEN_SCALE_FACTORS`. See https://github.com/AvaloniaUI/Avalonia/wiki/Configuring-X11-per-monitor-DPI.
 
 ## External Tools
 
@@ -82,23 +90,23 @@ This app supports open repository in external tools listed in the table below.
 | JetBrains Fleet               | YES     | YES   | YES   | FLEET_PATH           |
 | Sublime Text                  | YES     | YES   | YES   | SUBLIME_TEXT_PATH    |
 
-* You can set the given environment variable for special tool 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.
 * Installing `JetBrains Toolbox` will help this app to find other JetBrains tools installed on your device.
 * On macOS, you may need to use `launchctl setenv` to make sure the app can read these environment variables.
 
 ## Screenshots
 
 * Dark Theme
 
-![Theme Dark](./screenshots/theme_dark.png)
+  ![Theme Dark](./screenshots/theme_dark.png)
 
 * Light Theme
 
-![Theme Light](./screenshots/theme_light.png)
+  ![Theme Light](./screenshots/theme_light.png)
 
-* Custom Themes
+* Custom
 
-You can find custom themes from [sourcegit-theme](https://github.com/sourcegit-scm/sourcegit-theme.git)
+  You can find custom themes from [sourcegit-theme](https://github.com/sourcegit-scm/sourcegit-theme.git)
 
 ## Contributing
 

VERSION

@@ -1 +1 @@
-8.21
+8.22

src/App.axaml.cs

@@ -188,6 +188,8 @@ public static void SetTheme(string theme, string themeOverridesFile)
                     else
                         Models.CommitGraph.SetDefaultPens(overrides.GraphPenThickness);
 
+                    Models.Commit.OpacityForNotMerged = overrides.OpacityForNotMergedCommits;
+
                     app.Resources.MergedDictionaries.Add(resDic);
                     app._themeOverrides = resDic;
                 }

src/Commands/Diff.cs

@@ -14,6 +14,11 @@ public partial class Diff : Command
 
         public Diff(string repo, Models.DiffOption opt, int unified)
         {
+            _result.TextDiff = new Models.TextDiff() {
+                Repo = repo,
+                Option = opt,
+            };
+
             WorkingDirectory = repo;
             Context = repo;
             Args = $"diff --ignore-cr-at-eol --unified={unified} {opt}";
@@ -214,7 +219,7 @@ private void ProcessInlineHighlights()
             }
         }
 
-        private readonly Models.DiffResult _result = new Models.DiffResult() { TextDiff = new Models.TextDiff() };
+        private readonly Models.DiffResult _result = new Models.DiffResult();
         private readonly List<Models.TextDiffLine> _deleted = new List<Models.TextDiffLine>();
         private readonly List<Models.TextDiffLine> _added = new List<Models.TextDiffLine>();
         private int _oldLine = 0;

src/Commands/GC.cs

@@ -10,7 +10,7 @@ public GC(string repo, Action<string> outputHandler)
             WorkingDirectory = repo;
             Context = repo;
             TraitErrorAsOutput = true;
-            Args = "gc";
+            Args = "gc --prune";
         }
 
         protected override void OnReadline(string line)

src/Commands/QueryBranches.cs

@@ -24,20 +24,8 @@ public QueryBranches(string repo)
         {
             Exec();
 
-            foreach (var b in _branches)
-            {
-                if (b.IsLocal && !string.IsNullOrEmpty(b.UpstreamTrackStatus))
-                {
-                    if (b.UpstreamTrackStatus == "=")
-                    {
-                        b.UpstreamTrackStatus = string.Empty;
-                    }
-                    else
-                    {
-                        b.UpstreamTrackStatus = ParseTrackStatus(b.Name, b.Upstream);
-                    }
-                }
-            }
+            foreach (var b in _needQueryTrackStatus)
+                b.TrackStatus = new QueryTrackStatus(WorkingDirectory, b.Name, b.Upstream).Result();
 
             return _branches;
         }
@@ -84,35 +72,16 @@ protected override void OnReadline(string line)
             branch.Head = parts[1];
             branch.IsCurrent = parts[2] == "*";
             branch.Upstream = parts[3];
-            branch.UpstreamTrackStatus = parts[4];
-            _branches.Add(branch);
-        }
 
-        private string ParseTrackStatus(string local, string upstream)
-        {
-            var cmd = new Command();
-            cmd.WorkingDirectory = WorkingDirectory;
-            cmd.Context = Context;
-            cmd.Args = $"rev-list --left-right --count {local}...{upstream}";
-
-            var rs = cmd.ReadToEnd();
-            if (!rs.IsSuccess)
-                return string.Empty;
-
-            var match = REG_AHEAD_BEHIND().Match(rs.StdOut);
-            if (!match.Success)
-                return string.Empty;
+            if (branch.IsLocal && !parts[4].Equals("=", StringComparison.Ordinal))
+                _needQueryTrackStatus.Add(branch);
+            else
+                branch.TrackStatus = new Models.BranchTrackStatus();
 
-            var ahead = int.Parse(match.Groups[1].Value);
-            var behind = int.Parse(match.Groups[2].Value);
-            var track = "";
-            if (ahead > 0)
-                track += $"{ahead}↑";
-            if (behind > 0)
-                track += $" {behind}↓";
-            return track.Trim();
+            _branches.Add(branch);
         }
 
         private readonly List<Models.Branch> _branches = new List<Models.Branch>();
+        private List<Models.Branch> _needQueryTrackStatus = new List<Models.Branch>();
     }
 }

src/Commands/QueryCommits.cs

@@ -14,20 +14,29 @@ public QueryCommits(string repo, string limits, bool needFindHead = true)
             _findFirstMerged = needFindHead;
         }
 
-        public QueryCommits(string repo, int maxCount, string messageFilter)
+        public QueryCommits(string repo, int maxCount, string messageFilter, bool isFile)
         {
-            var argsBuilder = new StringBuilder();
-            var words = messageFilter.Split(new[] { ' ', '\t', '\r' }, StringSplitOptions.RemoveEmptyEntries);
-            foreach (var word in words)
+            string search;
+            if (isFile)
             {
-                var escaped = word.Trim().Replace("\"", "\\\"", StringComparison.Ordinal);
-                argsBuilder.Append($"--grep=\"{escaped}\" ");
+                search = $"-- \"{messageFilter}\"";
+            }
+            else
+            {
+                var argsBuilder = new StringBuilder();
+                var words = messageFilter.Split(new[] { ' ', '\t', '\r' }, StringSplitOptions.RemoveEmptyEntries);
+                foreach (var word in words)
+                {
+                    var escaped = word.Trim().Replace("\"", "\\\"", StringComparison.Ordinal);
+                    argsBuilder.Append($"--grep=\"{escaped}\" ");
+                }
+                argsBuilder.Append("--all-match -i");
+                search = argsBuilder.ToString();
             }
-            argsBuilder.Append("--all-match");
 
             WorkingDirectory = repo;
             Context = repo;
-            Args = $"log -{maxCount} --date-order --no-show-signature --decorate=full --pretty=format:%H%n%P%n%D%n%aN±%aE%n%at%n%cN±%cE%n%ct%n%s " + argsBuilder.ToString();
+            Args = $"log -{maxCount} --date-order --no-show-signature --decorate=full --pretty=format:%H%n%P%n%D%n%aN±%aE%n%at%n%cN±%cE%n%ct%n%s --branches --remotes " + search;
             _findFirstMerged = false;
         }
 
@@ -53,7 +62,9 @@ public QueryCommits(string repo, int maxCount, string messageFilter)
                         ParseParent(line);
                         break;
                     case 2:
-                        ParseDecorators(line);
+                        _current.ParseDecorators(line);
+                        if (_current.IsMerged && !_isHeadFounded)
+                            _isHeadFounded = true;
                         break;
                     case 3:
                         _current.Author = Models.User.FindOrAdd(line);
@@ -104,74 +115,6 @@ private void ParseParent(string data)
             _current.Parents.Add(data.Substring(idx + 1));
         }
 
-        private void ParseDecorators(string data)
-        {
-            if (data.Length < 3)
-                return;
-
-            var subs = data.Split(',', StringSplitOptions.RemoveEmptyEntries);
-            foreach (var sub in subs)
-            {
-                var d = sub.Trim();
-                if (d.EndsWith("/HEAD", StringComparison.Ordinal))
-                    continue;
-
-                if (d.StartsWith("tag: refs/tags/", StringComparison.Ordinal))
-                {
-                    _current.Decorators.Add(new Models.Decorator()
-                    {
-                        Type = Models.DecoratorType.Tag,
-                        Name = d.Substring(15),
-                    });
-                }
-                else if (d.StartsWith("HEAD -> refs/heads/", StringComparison.Ordinal))
-                {
-                    _current.IsMerged = true;
-                    _current.Decorators.Add(new Models.Decorator()
-                    {
-                        Type = Models.DecoratorType.CurrentBranchHead,
-                        Name = d.Substring(19),
-                    });
-                }
-                else if (d.Equals("HEAD"))
-                {
-                    _current.IsMerged = true;
-                    _current.Decorators.Add(new Models.Decorator()
-                    {
-                        Type = Models.DecoratorType.CurrentCommitHead,
-                        Name = d,
-                    });
-                }
-                else if (d.StartsWith("refs/heads/", StringComparison.Ordinal))
-                {
-                    _current.Decorators.Add(new Models.Decorator()
-                    {
-                        Type = Models.DecoratorType.LocalBranchHead,
-                        Name = d.Substring(11),
-                    });
-                }
-                else if (d.StartsWith("refs/remotes/", StringComparison.Ordinal))
-                {
-                    _current.Decorators.Add(new Models.Decorator()
-                    {
-                        Type = Models.DecoratorType.RemoteBranchHead,
-                        Name = d.Substring(13),
-                    });
-                }
-            }
-
-            _current.Decorators.Sort((l, r) =>
-            {
-                if (l.Type != r.Type)
-                    return (int)l.Type - (int)r.Type;
-                else
-                    return string.Compare(l.Name, r.Name, StringComparison.Ordinal);
-            });
-
-            if (_current.IsMerged && !_isHeadFounded)
-                _isHeadFounded = true;
-        }
-
         private void MarkFirstMerged()
         {
             Args = $"log --since=\"{_commits[^1].CommitterTimeStr}\" --format=\"%H\"";