Skip to content

Commit fe677d4

Browse files
committed
feature: supports search commits by change content (#1263)
Signed-off-by: leo <[email protected]>
1 parent 9bde797 commit fe677d4

File tree

6 files changed

+15
-6
lines changed

6 files changed

+15
-6
lines changed

src/Commands/QueryCommits.cs

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,7 @@ public QueryCommits(string repo, string filter, Models.CommitSearchMethod method
2626
{
2727
search += $"-i --committer=\"{filter}\"";
2828
}
29-
else if (method == Models.CommitSearchMethod.ByFile)
30-
{
31-
search += $"-- \"{filter}\"";
32-
}
33-
else
29+
else if (method == Models.CommitSearchMethod.ByMessage)
3430
{
3531
var argsBuilder = new StringBuilder();
3632
argsBuilder.Append(search);
@@ -45,10 +41,18 @@ public QueryCommits(string repo, string filter, Models.CommitSearchMethod method
4541

4642
search = argsBuilder.ToString();
4743
}
44+
else if (method == Models.CommitSearchMethod.ByFile)
45+
{
46+
search += $"-- \"{filter}\"";
47+
}
48+
else
49+
{
50+
search = $"-G\"{filter}\"";
51+
}
4852

4953
WorkingDirectory = repo;
5054
Context = repo;
51-
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;
55+
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}";
5256
_findFirstMerged = false;
5357
}
5458

src/Models/Commit.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ public enum CommitSearchMethod
1313
ByCommitter,
1414
ByMessage,
1515
ByFile,
16+
ByContent,
1617
}
1718

1819
public class Commit

src/Resources/Locales/en_US.axaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -605,6 +605,7 @@
605605
<x:String x:Key="Text.Repository.Search" xml:space="preserve">Search Commit</x:String>
606606
<x:String x:Key="Text.Repository.Search.ByAuthor" xml:space="preserve">Author</x:String>
607607
<x:String x:Key="Text.Repository.Search.ByCommitter" xml:space="preserve">Committer</x:String>
608+
<x:String x:Key="Text.Repository.Search.ByContent" xml:space="preserve">Content</x:String>
608609
<x:String x:Key="Text.Repository.Search.ByFile" xml:space="preserve">File</x:String>
609610
<x:String x:Key="Text.Repository.Search.ByMessage" xml:space="preserve">Message</x:String>
610611
<x:String x:Key="Text.Repository.Search.BySHA" xml:space="preserve">SHA</x:String>

src/Resources/Locales/zh_CN.axaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -609,6 +609,7 @@
609609
<x:String x:Key="Text.Repository.Search" xml:space="preserve">查找提交</x:String>
610610
<x:String x:Key="Text.Repository.Search.ByAuthor" xml:space="preserve">作者</x:String>
611611
<x:String x:Key="Text.Repository.Search.ByCommitter" xml:space="preserve">提交者</x:String>
612+
<x:String x:Key="Text.Repository.Search.ByContent" xml:space="preserve">变更内容</x:String>
612613
<x:String x:Key="Text.Repository.Search.ByFile" xml:space="preserve">文件</x:String>
613614
<x:String x:Key="Text.Repository.Search.ByMessage" xml:space="preserve">提交信息</x:String>
614615
<x:String x:Key="Text.Repository.Search.BySHA" xml:space="preserve">提交指纹</x:String>

src/Resources/Locales/zh_TW.axaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -609,6 +609,7 @@
609609
<x:String x:Key="Text.Repository.Search" xml:space="preserve">搜尋提交</x:String>
610610
<x:String x:Key="Text.Repository.Search.ByAuthor" xml:space="preserve">作者</x:String>
611611
<x:String x:Key="Text.Repository.Search.ByCommitter" xml:space="preserve">提交者</x:String>
612+
<x:String x:Key="Text.Repository.Search.ByContent" xml:space="preserve">變更內容</x:String>
612613
<x:String x:Key="Text.Repository.Search.ByFile" xml:space="preserve">檔案</x:String>
613614
<x:String x:Key="Text.Repository.Search.ByMessage" xml:space="preserve">提交訊息</x:String>
614615
<x:String x:Key="Text.Repository.Search.BySHA" xml:space="preserve">提交編號</x:String>

src/Views/Repository.axaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -495,6 +495,7 @@
495495
<TextBlock Text="{DynamicResource Text.Repository.Search.ByCommitter}"/>
496496
<TextBlock Text="{DynamicResource Text.Repository.Search.ByMessage}"/>
497497
<TextBlock Text="{DynamicResource Text.Repository.Search.ByFile}"/>
498+
<TextBlock Text="{DynamicResource Text.Repository.Search.ByContent}"/>
498499
</ComboBox.Items>
499500
</ComboBox>
500501

0 commit comments

Comments
 (0)