From fe677d40c1a0d4999b2a9ae5c7784a71270f184a Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Wed, 30 Apr 2025 21:05:53 +0800
Subject: [PATCH] feature: supports search commits by change content (#1263)

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Commands/QueryCommits.cs      | 16 ++++++++++------
 src/Models/Commit.cs              |  1 +
 src/Resources/Locales/en_US.axaml |  1 +
 src/Resources/Locales/zh_CN.axaml |  1 +
 src/Resources/Locales/zh_TW.axaml |  1 +
 src/Views/Repository.axaml        |  1 +
 6 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/Commands/QueryCommits.cs b/src/Commands/QueryCommits.cs
index dd3c39b4..9e1d9918 100644
--- a/src/Commands/QueryCommits.cs
+++ b/src/Commands/QueryCommits.cs
@@ -26,11 +26,7 @@ namespace SourceGit.Commands
             {
                 search += $"-i --committer=\"{filter}\"";
             }
-            else if (method == Models.CommitSearchMethod.ByFile)
-            {
-                search += $"-- \"{filter}\"";
-            }
-            else
+            else if (method == Models.CommitSearchMethod.ByMessage)
             {
                 var argsBuilder = new StringBuilder();
                 argsBuilder.Append(search);
@@ -45,10 +41,18 @@ namespace SourceGit.Commands
 
                 search = argsBuilder.ToString();
             }
+            else if (method == Models.CommitSearchMethod.ByFile)
+            {
+                search += $"-- \"{filter}\"";
+            }
+            else
+            {
+                search = $"-G\"{filter}\"";
+            }
 
             WorkingDirectory = repo;
             Context = repo;
-            Args = $"log -1000 --date-order --no-show-signature --decorate=full --format=%H%n%P%n%D%n%aN±%aE%n%at%n%cN±%cE%n%ct%n%s " + search;
+            Args = $"log -1000 --date-order --no-show-signature --decorate=full --format=%H%n%P%n%D%n%aN±%aE%n%at%n%cN±%cE%n%ct%n%s {search}";
             _findFirstMerged = false;
         }
 
diff --git a/src/Models/Commit.cs b/src/Models/Commit.cs
index 1980e622..ef5a34bc 100644
--- a/src/Models/Commit.cs
+++ b/src/Models/Commit.cs
@@ -13,6 +13,7 @@ namespace SourceGit.Models
         ByCommitter,
         ByMessage,
         ByFile,
+        ByContent,
     }
 
     public class Commit
diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index 108eb50e..f4c62a90 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -605,6 +605,7 @@
   <x:String x:Key="Text.Repository.Search" xml:space="preserve">Search Commit</x:String>
   <x:String x:Key="Text.Repository.Search.ByAuthor" xml:space="preserve">Author</x:String>
   <x:String x:Key="Text.Repository.Search.ByCommitter" xml:space="preserve">Committer</x:String>
+  <x:String x:Key="Text.Repository.Search.ByContent" xml:space="preserve">Content</x:String>
   <x:String x:Key="Text.Repository.Search.ByFile" xml:space="preserve">File</x:String>
   <x:String x:Key="Text.Repository.Search.ByMessage" xml:space="preserve">Message</x:String>
   <x:String x:Key="Text.Repository.Search.BySHA" xml:space="preserve">SHA</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index 4da8c3d7..8ee210e9 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -609,6 +609,7 @@
   <x:String x:Key="Text.Repository.Search" xml:space="preserve">查找提交</x:String>
   <x:String x:Key="Text.Repository.Search.ByAuthor" xml:space="preserve">作者</x:String>
   <x:String x:Key="Text.Repository.Search.ByCommitter" xml:space="preserve">提交者</x:String>
+  <x:String x:Key="Text.Repository.Search.ByContent" xml:space="preserve">变更内容</x:String>
   <x:String x:Key="Text.Repository.Search.ByFile" xml:space="preserve">文件</x:String>
   <x:String x:Key="Text.Repository.Search.ByMessage" xml:space="preserve">提交信息</x:String>
   <x:String x:Key="Text.Repository.Search.BySHA" xml:space="preserve">提交指纹</x:String>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index 049fc379..7430d609 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -609,6 +609,7 @@
   <x:String x:Key="Text.Repository.Search" xml:space="preserve">搜尋提交</x:String>
   <x:String x:Key="Text.Repository.Search.ByAuthor" xml:space="preserve">作者</x:String>
   <x:String x:Key="Text.Repository.Search.ByCommitter" xml:space="preserve">提交者</x:String>
+  <x:String x:Key="Text.Repository.Search.ByContent" xml:space="preserve">變更內容</x:String>
   <x:String x:Key="Text.Repository.Search.ByFile" xml:space="preserve">檔案</x:String>
   <x:String x:Key="Text.Repository.Search.ByMessage" xml:space="preserve">提交訊息</x:String>
   <x:String x:Key="Text.Repository.Search.BySHA" xml:space="preserve">提交編號</x:String>
diff --git a/src/Views/Repository.axaml b/src/Views/Repository.axaml
index 16908f81..a06432d4 100644
--- a/src/Views/Repository.axaml
+++ b/src/Views/Repository.axaml
@@ -495,6 +495,7 @@
               <TextBlock Text="{DynamicResource Text.Repository.Search.ByCommitter}"/>
               <TextBlock Text="{DynamicResource Text.Repository.Search.ByMessage}"/>
               <TextBlock Text="{DynamicResource Text.Repository.Search.ByFile}"/>
+              <TextBlock Text="{DynamicResource Text.Repository.Search.ByContent}"/>
             </ComboBox.Items>
           </ComboBox>