refactor: remove support to search commits by committer

Signed-off-by: leo <longshuang@msn.cn>

Author: love-linger

src/Commands/QueryUsers.cs src/Commands/QueryAuthors.cssrc/Commands/QueryUsers.cs renamed to src/Commands/QueryAuthors.cs

@@ -3,14 +3,14 @@
 
 namespace SourceGit.Commands
 {
-    public class QueryUsers : Command
+    public class QueryAuthors : Command
     {
-        public QueryUsers(string repo)
+        public QueryAuthors(string repo)
         {
             WorkingDirectory = repo;
             Context = repo;
             RaiseError = false;
-            Args = "log -100000 --all --format=%aN±%aE%n%cN±%cE";
+            Args = "log -100000 --all --format=%aN±%aE";
         }
 
         public async Task<List<Models.User>> GetResultAsync()

src/Commands/QueryCommits.cs

@@ -28,10 +28,6 @@ public QueryCommits(string repo, string filter, Models.CommitSearchMethod method
             {
                 builder.Append("-i --author=").Append(filter.Quoted());
             }
-            else if (method == Models.CommitSearchMethod.ByCommitter)
-            {
-                builder.Append("-i --committer=").Append(filter.Quoted());
-            }
             else if (method == Models.CommitSearchMethod.ByMessage)
             {
                 var words = filter.Split([' ', '\t', '\r'], StringSplitOptions.RemoveEmptyEntries);

src/Models/Commit.cs

@@ -8,7 +8,6 @@ public enum CommitSearchMethod
     {
         BySHA = 0,
         ByAuthor,
-        ByCommitter,
         ByMessage,
         ByPath,
         ByContent,

src/Resources/Locales/en_US.axaml

@@ -813,7 +813,6 @@
   <x:String x:Key="Text.Repository.Resolve" xml:space="preserve">RESOLVE</x:String>
   <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.ByMessage" xml:space="preserve">Message</x:String>
   <x:String x:Key="Text.Repository.Search.ByPath" xml:space="preserve">Path</x:String>

src/ViewModels/SearchCommitContext.cs

@@ -177,7 +177,7 @@ public void EndSearch()
                 _cancellation.Cancel();
 
             _worktreeFiles = null;
-            _users = null;
+            _authors = null;
 
             IsQuerying = false;
             Suggestions = null;
@@ -187,29 +187,28 @@ public void EndSearch()
 
         private void UpdateSuggestions()
         {
-            if (_method == (int)Models.CommitSearchMethod.ByAuthor ||
-                _method == (int)Models.CommitSearchMethod.ByCommitter)
+            if (_method == (int)Models.CommitSearchMethod.ByAuthor)
             {
-                if (_users == null)
+                if (_authors == null)
                 {
-                    if (_requestingUsers)
+                    if (_requestingAuthors)
                         return;
 
-                    _requestingUsers = true;
+                    _requestingAuthors = true;
 
                     Task.Run(async () =>
                     {
-                        var users = await new Commands.QueryUsers(_repo.FullPath)
+                        var authors = await new Commands.QueryAuthors(_repo.FullPath)
                             .GetResultAsync()
                             .ConfigureAwait(false);
 
                         Dispatcher.UIThread.Post(() =>
                         {
-                            _requestingUsers = false;
+                            _requestingAuthors = false;
 
                             if (_repo.IsSearchingCommits)
                             {
-                                _users = users;
+                                _authors = authors;
                                 UpdateSuggestions();
                             }
                         });
@@ -218,18 +217,18 @@ private void UpdateSuggestions()
                     return;
                 }
 
-                if (_users.Count == 0 || _filter.Length < 2)
+                if (_authors.Count == 0 || _filter.Length < 2)
                 {
                     Suggestions = null;
                     return;
                 }
 
                 var matched = new List<object>();
-                foreach (var user in _users)
+                foreach (var author in _authors)
                 {
-                    if (user.Name.Contains(_filter, StringComparison.OrdinalIgnoreCase) ||
-                        user.Email.Contains(_filter, StringComparison.OrdinalIgnoreCase))
-                        matched.Add(user);
+                    if (author.Name.Contains(_filter, StringComparison.OrdinalIgnoreCase) ||
+                        author.Email.Contains(_filter, StringComparison.OrdinalIgnoreCase))
+                        matched.Add(author);
                 }
 
                 Suggestions = matched;
@@ -296,8 +295,8 @@ private void UpdateSuggestions()
         private Models.Commit _selected = null;
         private bool _requestingWorktreeFiles = false;
         private List<string> _worktreeFiles = null;
-        private bool _requestingUsers = false;
-        private List<Models.User> _users = null;
+        private bool _requestingAuthors = false;
+        private List<Models.User> _authors = null;
         private List<object> _suggestions = null;
     }
 }

src/Views/Repository.axaml

@@ -612,7 +612,6 @@
             <ComboBox.Items>
               <TextBlock Text="{DynamicResource Text.Repository.Search.BySHA}"/>
               <TextBlock Text="{DynamicResource Text.Repository.Search.ByAuthor}"/>
-              <TextBlock Text="{DynamicResource Text.Repository.Search.ByCommitter}"/>
               <TextBlock Text="{DynamicResource Text.Repository.Search.ByMessage}"/>
               <TextBlock Text="{DynamicResource Text.Repository.Search.ByPath}"/>
               <TextBlock Text="{DynamicResource Text.Repository.Search.ByContent}"/>