Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Search Commits via Commit Hash #7400

Merged
merged 13 commits into from
Sep 2, 2019
Merged

Search Commits via Commit Hash #7400

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
27d1bbc
search commits via commit hash
gary-kim Jul 9, 2019
00eb1f0
Also include all option for hash search
gary-kim Jul 11, 2019
813bc58
Remove code duplication in commit search
gary-kim Aug 12, 2019
dd348de
Add case ignore to commit hash search
gary-kim Aug 13, 2019
2fc1edc
Merge branch 'master' into enh/7395/search-via-commit-hash
lunny Aug 16, 2019
e9d2b15
Merge branch 'master' into enh/7395/search-via-commit-hash
gary-kim Aug 18, 2019
e85d8e5
Merge branch 'master' into enh/7395/search-via-commit-hash
gary-kim Aug 23, 2019
7774abc
Merge branch 'master' into enh/7395/search-via-commit-hash
sapk Aug 24, 2019
aebe1de
Merge branch 'master' into enh/7395/search-via-commit-hash
gary-kim Aug 29, 2019
8683a0f
Merge branch 'master' into enh/7395/search-via-commit-hash
lunny Sep 2, 2019
b588ad5
Merge branch 'master' into enh/7395/search-via-commit-hash
gary-kim Sep 2, 2019
0eb5b30
Merge branch 'master' into enh/7395/search-via-commit-hash
techknowlogick Sep 2, 2019
1ff3ae4
Merge branch 'master' into enh/7395/search-via-commit-hash
techknowlogick Sep 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions integrations/repo_commits_search_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,16 @@ func testRepoCommitsSearch(t *testing.T, query, commit string) {
}

func TestRepoCommitsSearch(t *testing.T) {
testRepoCommitsSearch(t, "e8eabd", "")
testRepoCommitsSearch(t, "38a9cb", "")
testRepoCommitsSearch(t, "6e8e", "6e8eabd9a7")
gary-kim marked this conversation as resolved.
Show resolved Hide resolved
testRepoCommitsSearch(t, "58e97", "58e97d1a24")
testRepoCommitsSearch(t, "author:alice", "6e8eabd9a7")
testRepoCommitsSearch(t, "author:alice 6e8ea", "6e8eabd9a7")
testRepoCommitsSearch(t, "committer:Tom", "58e97d1a24")
testRepoCommitsSearch(t, "author:bob commit-4", "58e97d1a24")
testRepoCommitsSearch(t, "author:bob commit after:2019-03-03", "58e97d1a24")
testRepoCommitsSearch(t, "committer:alice 6e8e before:2019-03-02", "6e8eabd9a7")
testRepoCommitsSearch(t, "committer:alice commit before:2019-03-02", "6e8eabd9a7")
testRepoCommitsSearch(t, "committer:alice author:tom commit before:2019-03-04 after:2019-03-02", "0a8499a22a")
}
45 changes: 33 additions & 12 deletions modules/git/repo_commit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,36 +202,57 @@ func (repo *Repository) commitsByRange(id SHA1, page int) (*list.List, error) {
}

func (repo *Repository) searchCommits(id SHA1, opts SearchCommitsOptions) (*list.List, error) {
cmd := NewCommand("log", id.String(), "-100", "-i", prettyLogFormat)
if len(opts.Keywords) > 0 {
for _, v := range opts.Keywords {
cmd.AddArguments("--grep=" + v)
}
}
cmd := NewCommand("log", id.String(), "-100", prettyLogFormat)
args := []string{"-i"}
if len(opts.Authors) > 0 {
for _, v := range opts.Authors {
cmd.AddArguments("--author=" + v)
args = append(args, "--author="+v)
}
}
if len(opts.Committers) > 0 {
for _, v := range opts.Committers {
cmd.AddArguments("--committer=" + v)
args = append(args, "--committer="+v)
}
}
if len(opts.After) > 0 {
cmd.AddArguments("--after=" + opts.After)
args = append(args, "--after="+opts.After)
}
if len(opts.Before) > 0 {
cmd.AddArguments("--before=" + opts.Before)
args = append(args, "--before="+opts.Before)
}
if opts.All {
cmd.AddArguments("--all")
args = append(args, "--all")
}
if len(opts.Keywords) > 0 {
for _, v := range opts.Keywords {
cmd.AddArguments("--grep=" + v)
}
}
cmd.AddArguments(args...)
stdout, err := cmd.RunInDirBytes(repo.Path)
if err != nil {
return nil, err
}
return repo.parsePrettyFormatLogToList(stdout)
if len(stdout) != 0 {
stdout = append(stdout, '\n')
gary-kim marked this conversation as resolved.
Show resolved Hide resolved
}
if len(opts.Keywords) > 0 {
for _, v := range opts.Keywords {
if len(v) >= 4 {
hashCmd := NewCommand("log", "-1", prettyLogFormat)
hashCmd.AddArguments(args...)
hashCmd.AddArguments(v)
hashMatching, err := hashCmd.RunInDirBytes(repo.Path)
if err != nil || bytes.Contains(stdout, hashMatching) {
continue
}
stdout = append(stdout, hashMatching...)
stdout = append(stdout, '\n')
}
}
}

return repo.parsePrettyFormatLogToList(bytes.TrimSuffix(stdout, []byte{'\n'}))
gary-kim marked this conversation as resolved.
Show resolved Hide resolved
}

func (repo *Repository) getFilesChanged(id1, id2 string) ([]string, error) {
Expand Down