Skip to content

Commit a4e5604

Browse files
committed
add context to GetCodeActivityStats
1 parent 8fd4716 commit a4e5604

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

models/activities/repo_activity.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ func GetActivityStats(ctx context.Context, repo *repo_model.Repository, timeFrom
7474
}
7575
defer closer.Close()
7676

77-
code, err := gitRepo.GetCodeActivityStats(timeFrom, repo.DefaultBranch)
77+
code, err := gitRepo.GetCodeActivityStats(ctx, timeFrom, repo.DefaultBranch)
7878
if err != nil {
7979
return nil, fmt.Errorf("FillFromGit: %w", err)
8080
}
@@ -91,7 +91,7 @@ func GetActivityStatsTopAuthors(ctx context.Context, repo *repo_model.Repository
9191
}
9292
defer closer.Close()
9393

94-
code, err := gitRepo.GetCodeActivityStats(timeFrom, "")
94+
code, err := gitRepo.GetCodeActivityStats(ctx, timeFrom, "")
9595
if err != nil {
9696
return nil, fmt.Errorf("FillFromGit: %w", err)
9797
}

modules/git/repo_stats.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ type CodeActivityAuthor struct {
3535
}
3636

3737
// GetCodeActivityStats returns code statistics for activity page
38-
func (repo *Repository) GetCodeActivityStats(fromTime time.Time, branch string) (*CodeActivityStats, error) {
38+
func (repo *Repository) GetCodeActivityStats(ctx context.Context, fromTime time.Time, branch string) (*CodeActivityStats, error) {
3939
stats := &CodeActivityStats{}
4040

4141
since := fromTime.Format(time.RFC3339)
4242

43-
stdout, _, runErr := NewCommand("rev-list", "--count", "--no-merges", "--branches=*", "--date=iso").AddOptionFormat("--since='%s'", since).RunStdString(repo.Ctx, &RunOpts{Dir: repo.Path})
43+
stdout, _, runErr := NewCommand("rev-list", "--count", "--no-merges", "--branches=*", "--date=iso").AddOptionFormat("--since='%s'", since).RunStdString(ctx, &RunOpts{Dir: repo.Path})
4444
if runErr != nil {
4545
return nil, runErr
4646
}
@@ -68,7 +68,7 @@ func (repo *Repository) GetCodeActivityStats(fromTime time.Time, branch string)
6868
}
6969

7070
stderr := new(strings.Builder)
71-
err = gitCmd.Run(repo.Ctx, &RunOpts{
71+
err = gitCmd.Run(ctx, &RunOpts{
7272
Env: []string{},
7373
Dir: repo.Path,
7474
Stdout: stdoutWriter,

modules/git/repo_stats_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ func TestRepository_GetCodeActivityStats(t *testing.T) {
2020
timeFrom, err := time.Parse(time.RFC3339, "2016-01-01T00:00:00+00:00")
2121
assert.NoError(t, err)
2222

23-
code, err := bareRepo1.GetCodeActivityStats(timeFrom, "")
23+
code, err := bareRepo1.GetCodeActivityStats(t.Context(), timeFrom, "")
2424
assert.NoError(t, err)
2525
assert.NotNil(t, code)
2626

0 commit comments

Comments
 (0)