diff options
Diffstat (limited to 'internal/gitaly/service/commit/find_commits.go')
| -rw-r--r-- | internal/gitaly/service/commit/find_commits.go | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/internal/gitaly/service/commit/find_commits.go b/internal/gitaly/service/commit/find_commits.go index 8662ab593..11fbdc491 100644 --- a/internal/gitaly/service/commit/find_commits.go +++ b/internal/gitaly/service/commit/find_commits.go @@ -12,7 +12,6 @@ import ( "gitlab.com/gitlab-org/gitaly/internal/command" "gitlab.com/gitlab-org/gitaly/internal/git" "gitlab.com/gitlab-org/gitaly/internal/git/catfile" - "gitlab.com/gitlab-org/gitaly/internal/git/log" "gitlab.com/gitlab-org/gitaly/internal/git/trailerparser" "gitlab.com/gitlab-org/gitaly/internal/helper" "gitlab.com/gitlab-org/gitaly/internal/helper/chunk" @@ -26,11 +25,13 @@ func (s *server) FindCommits(req *gitalypb.FindCommitsRequest, stream gitalypb.C return helper.ErrInvalidArgument(err) } + repo := s.localrepo(req.GetRepository()) + // Use Gitaly's default branch lookup function because that is already // migrated. if revision := req.Revision; len(revision) == 0 && !req.GetAll() { var err error - req.Revision, err = defaultBranchName(ctx, s.gitCmdFactory, req.Repository) + req.Revision, err = defaultBranchName(ctx, repo) if err != nil { return helper.ErrInternal(fmt.Errorf("defaultBranchName: %v", err)) } @@ -51,12 +52,14 @@ func (s *server) FindCommits(req *gitalypb.FindCommitsRequest, stream gitalypb.C func (s *server) findCommits(ctx context.Context, req *gitalypb.FindCommitsRequest, stream gitalypb.CommitService_FindCommitsServer) error { opts := git.ConvertGlobalOptions(req.GetGlobalOptions()) - logCmd, err := s.gitCmdFactory.New(ctx, req.GetRepository(), getLogCommandSubCmd(req), opts...) + repo := s.localrepo(req.GetRepository()) + + logCmd, err := repo.Exec(ctx, getLogCommandSubCmd(req), opts...) if err != nil { return fmt.Errorf("error when creating git log command: %v", err) } - batch, err := catfile.New(ctx, s.gitCmdFactory, req.GetRepository()) + batch, err := s.catfileCache.BatchProcess(ctx, repo) if err != nil { return fmt.Errorf("creating catfile: %v", err) } @@ -137,7 +140,7 @@ func (g *GetCommits) Commit(ctx context.Context, trailers bool) (*gitalypb.GitCo } else { revision = logOutput } - commit, err := log.GetCommitCatfile(ctx, g.batch, git.Revision(revision)) + commit, err := catfile.GetCommit(ctx, g.batch, git.Revision(revision)) if err != nil { return nil, fmt.Errorf("cat-file get commit %q: %v", revision, err) } |