Decouple context from repository related structs (#33823)

TheFox0x7 · web-flow · commit 4c4c56c7cde2 · 2025-03-08T13:12:46.000-08:00
Calls that required context implicitly are made to pass it as argument
diff --git a/models/activities/action.go b/models/activities/action.go
@@ -529,8 +529,8 @@ func ActivityQueryCondition(ctx context.Context, opts GetFeedsOptions) (builder.
 	}
 
 	if opts.RequestedTeam != nil {
-		env := repo_model.AccessibleTeamReposEnv(ctx, organization.OrgFromUser(opts.RequestedUser), opts.RequestedTeam)
-		teamRepoIDs, err := env.RepoIDs(1, opts.RequestedUser.NumRepos)
+		env := repo_model.AccessibleTeamReposEnv(organization.OrgFromUser(opts.RequestedUser), opts.RequestedTeam)
+		teamRepoIDs, err := env.RepoIDs(ctx, 1, opts.RequestedUser.NumRepos)
 		if err != nil {
 			return nil, fmt.Errorf("GetTeamRepositories: %w", err)
 		}
diff --git a/models/organization/org_test.go b/models/organization/org_test.go
@@ -320,7 +320,7 @@ func TestAccessibleReposEnv_CountRepos(t *testing.T) {
 	testSuccess := func(userID, expectedCount int64) {
 		env, err := repo_model.AccessibleReposEnv(db.DefaultContext, org, userID)
 		assert.NoError(t, err)
-		count, err := env.CountRepos()
+		count, err := env.CountRepos(db.DefaultContext)
 		assert.NoError(t, err)
 		assert.EqualValues(t, expectedCount, count)
 	}
@@ -334,7 +334,7 @@ func TestAccessibleReposEnv_RepoIDs(t *testing.T) {
 	testSuccess := func(userID int64, expectedRepoIDs []int64) {
 		env, err := repo_model.AccessibleReposEnv(db.DefaultContext, org, userID)
 		assert.NoError(t, err)
-		repoIDs, err := env.RepoIDs(1, 100)
+		repoIDs, err := env.RepoIDs(db.DefaultContext, 1, 100)
 		assert.NoError(t, err)
 		assert.Equal(t, expectedRepoIDs, repoIDs)
 	}
@@ -348,7 +348,7 @@ func TestAccessibleReposEnv_Repos(t *testing.T) {
 	testSuccess := func(userID int64, expectedRepoIDs []int64) {
 		env, err := repo_model.AccessibleReposEnv(db.DefaultContext, org, userID)
 		assert.NoError(t, err)
-		repos, err := env.Repos(1, 100)
+		repos, err := env.Repos(db.DefaultContext, 1, 100)
 		assert.NoError(t, err)
 		expectedRepos := make(repo_model.RepositoryList, len(expectedRepoIDs))
 		for i, repoID := range expectedRepoIDs {
@@ -367,7 +367,7 @@ func TestAccessibleReposEnv_MirrorRepos(t *testing.T) {
 	testSuccess := func(userID int64, expectedRepoIDs []int64) {
 		env, err := repo_model.AccessibleReposEnv(db.DefaultContext, org, userID)
 		assert.NoError(t, err)
-		repos, err := env.MirrorRepos()
+		repos, err := env.MirrorRepos(db.DefaultContext)
 		assert.NoError(t, err)
 		expectedRepos := make(repo_model.RepositoryList, len(expectedRepoIDs))
 		for i, repoID := range expectedRepoIDs {
diff --git a/models/repo/org_repo.go b/models/repo/org_repo.go
@@ -47,10 +47,10 @@ func GetTeamRepositories(ctx context.Context, opts *SearchTeamRepoOptions) (Repo
 // AccessibleReposEnvironment operations involving the repositories that are
 // accessible to a particular user
 type AccessibleReposEnvironment interface {
-	CountRepos() (int64, error)
-	RepoIDs(page, pageSize int) ([]int64, error)
-	Repos(page, pageSize int) (RepositoryList, error)
-	MirrorRepos() (RepositoryList, error)
+	CountRepos(ctx context.Context) (int64, error)
+	RepoIDs(ctx context.Context, page, pageSize int) ([]int64, error)
+	Repos(ctx context.Context, page, pageSize int) (RepositoryList, error)
+	MirrorRepos(ctx context.Context) (RepositoryList, error)
 	AddKeyword(keyword string)
 	SetSort(db.SearchOrderBy)
 }
@@ -60,7 +60,6 @@ type accessibleReposEnv struct {
 	user    *user_model.User
 	team    *org_model.Team
 	teamIDs []int64
-	ctx     context.Context
 	keyword string
 	orderBy db.SearchOrderBy
 }
@@ -86,18 +85,16 @@ func AccessibleReposEnv(ctx context.Context, org *org_model.Organization, userID
 		org:     org,
 		user:    user,
 		teamIDs: teamIDs,
-		ctx:     ctx,
 		orderBy: db.SearchOrderByRecentUpdated,
 	}, nil
 }
 
 // AccessibleTeamReposEnv an AccessibleReposEnvironment for the repositories in `org`
 // that are accessible to the specified team.
-func AccessibleTeamReposEnv(ctx context.Context, org *org_model.Organization, team *org_model.Team) AccessibleReposEnvironment {
+func AccessibleTeamReposEnv(org *org_model.Organization, team *org_model.Team) AccessibleReposEnvironment {
 	return &accessibleReposEnv{
 		org:     org,
 		team:    team,
-		ctx:     ctx,
 		orderBy: db.SearchOrderByRecentUpdated,
 	}
 }
@@ -123,8 +120,8 @@ func (env *accessibleReposEnv) cond() builder.Cond {
 	return cond
 }
 
-func (env *accessibleReposEnv) CountRepos() (int64, error) {
-	repoCount, err := db.GetEngine(env.ctx).
+func (env *accessibleReposEnv) CountRepos(ctx context.Context) (int64, error) {
+	repoCount, err := db.GetEngine(ctx).
 		Join("INNER", "team_repo", "`team_repo`.repo_id=`repository`.id").
 		Where(env.cond()).
 		Distinct("`repository`.id").
@@ -135,13 +132,13 @@ func (env *accessibleReposEnv) CountRepos() (int64, error) {
 	return repoCount, nil
 }
 
-func (env *accessibleReposEnv) RepoIDs(page, pageSize int) ([]int64, error) {
+func (env *accessibleReposEnv) RepoIDs(ctx context.Context, page, pageSize int) ([]int64, error) {
 	if page <= 0 {
 		page = 1
 	}
 
 	repoIDs := make([]int64, 0, pageSize)
-	return repoIDs, db.GetEngine(env.ctx).
+	return repoIDs, db.GetEngine(ctx).
 		Table("repository").
 		Join("INNER", "team_repo", "`team_repo`.repo_id=`repository`.id").
 		Where(env.cond()).
@@ -152,8 +149,8 @@ func (env *accessibleReposEnv) RepoIDs(page, pageSize int) ([]int64, error) {
 		Find(&repoIDs)
 }
 
-func (env *accessibleReposEnv) Repos(page, pageSize int) (RepositoryList, error) {
-	repoIDs, err := env.RepoIDs(page, pageSize)
+func (env *accessibleReposEnv) Repos(ctx context.Context, page, pageSize int) (RepositoryList, error) {
+	repoIDs, err := env.RepoIDs(ctx, page, pageSize)
 	if err != nil {
 		return nil, fmt.Errorf("GetUserRepositoryIDs: %w", err)
 	}
@@ -163,15 +160,15 @@ func (env *accessibleReposEnv) Repos(page, pageSize int) (RepositoryList, error)
 		return repos, nil
 	}
 
-	return repos, db.GetEngine(env.ctx).
+	return repos, db.GetEngine(ctx).
 		In("`repository`.id", repoIDs).
 		OrderBy(string(env.orderBy)).
 		Find(&repos)
 }
 
-func (env *accessibleReposEnv) MirrorRepoIDs() ([]int64, error) {
+func (env *accessibleReposEnv) MirrorRepoIDs(ctx context.Context) ([]int64, error) {
 	repoIDs := make([]int64, 0, 10)
-	return repoIDs, db.GetEngine(env.ctx).
+	return repoIDs, db.GetEngine(ctx).
 		Table("repository").
 		Join("INNER", "team_repo", "`team_repo`.repo_id=`repository`.id AND `repository`.is_mirror=?", true).
 		Where(env.cond()).
@@ -181,8 +178,8 @@ func (env *accessibleReposEnv) MirrorRepoIDs() ([]int64, error) {
 		Find(&repoIDs)
 }
 
-func (env *accessibleReposEnv) MirrorRepos() (RepositoryList, error) {
-	repoIDs, err := env.MirrorRepoIDs()
+func (env *accessibleReposEnv) MirrorRepos(ctx context.Context) (RepositoryList, error) {
+	repoIDs, err := env.MirrorRepoIDs(ctx)
 	if err != nil {
 		return nil, fmt.Errorf("MirrorRepoIDs: %w", err)
 	}
@@ -192,7 +189,7 @@ func (env *accessibleReposEnv) MirrorRepos() (RepositoryList, error) {
 		return repos, nil
 	}
 
-	return repos, db.GetEngine(env.ctx).
+	return repos, db.GetEngine(ctx).
 		In("`repository`.id", repoIDs).
 		Find(&repos)
 }
diff --git a/services/org/user.go b/services/org/user.go
@@ -64,7 +64,7 @@ func RemoveOrgUser(ctx context.Context, org *organization.Organization, user *us
 	if err != nil {
 		return fmt.Errorf("AccessibleReposEnv: %w", err)
 	}
-	repoIDs, err := env.RepoIDs(1, org.NumRepos)
+	repoIDs, err := env.RepoIDs(ctx, 1, org.NumRepos)
 	if err != nil {
 		return fmt.Errorf("GetUserRepositories [%d]: %w", user.ID, err)
 	}
diff --git a/services/packages/cargo/index.go b/services/packages/cargo/index.go
@@ -78,7 +78,7 @@ func RebuildIndex(ctx context.Context, doer, owner *user_model.User) error {
 		"Rebuild Cargo Index",
 		func(t *files_service.TemporaryUploadRepository) error {
 			// Remove all existing content but the Cargo config
-			files, err := t.LsFiles()
+			files, err := t.LsFiles(ctx)
 			if err != nil {
 				return err
 			}
@@ -89,7 +89,7 @@ func RebuildIndex(ctx context.Context, doer, owner *user_model.User) error {
 					break
 				}
 			}
-			if err := t.RemoveFilesFromIndex(files...); err != nil {
+			if err := t.RemoveFilesFromIndex(ctx, files...); err != nil {
 				return err
 			}
 
@@ -204,7 +204,7 @@ func addOrUpdatePackageIndex(ctx context.Context, t *files_service.TemporaryUplo
 		return nil
 	}
 
-	return writeObjectToIndex(t, BuildPackagePath(p.LowerName), b)
+	return writeObjectToIndex(ctx, t, BuildPackagePath(p.LowerName), b)
 }
 
 func getOrCreateIndexRepository(ctx context.Context, doer, owner *user_model.User) (*repo_model.Repository, error) {
@@ -252,29 +252,29 @@ func createOrUpdateConfigFile(ctx context.Context, repo *repo_model.Repository,
 				return err
 			}
 
-			return writeObjectToIndex(t, ConfigFileName, &b)
+			return writeObjectToIndex(ctx, t, ConfigFileName, &b)
 		},
 	)
 }
 
 // This is a shorter version of CreateOrUpdateRepoFile which allows to perform multiple actions on a git repository
 func alterRepositoryContent(ctx context.Context, doer *user_model.User, repo *repo_model.Repository, commitMessage string, fn func(*files_service.TemporaryUploadRepository) error) error {
-	t, err := files_service.NewTemporaryUploadRepository(ctx, repo)
+	t, err := files_service.NewTemporaryUploadRepository(repo)
 	if err != nil {
 		return err
 	}
 	defer t.Close()
 
 	var lastCommitID string
-	if err := t.Clone(repo.DefaultBranch, true); err != nil {
+	if err := t.Clone(ctx, repo.DefaultBranch, true); err != nil {
 		if !git.IsErrBranchNotExist(err) || !repo.IsEmpty {
 			return err
 		}
-		if err := t.Init(repo.ObjectFormatName); err != nil {
+		if err := t.Init(ctx, repo.ObjectFormatName); err != nil {
 			return err
 		}
 	} else {
-		if err := t.SetDefaultIndex(); err != nil {
+		if err := t.SetDefaultIndex(ctx); err != nil {
 			return err
 		}
 
@@ -290,7 +290,7 @@ func alterRepositoryContent(ctx context.Context, doer *user_model.User, repo *re
 		return err
 	}
 
-	treeHash, err := t.WriteTree()
+	treeHash, err := t.WriteTree(ctx)
 	if err != nil {
 		return err
 	}
@@ -301,19 +301,19 @@ func alterRepositoryContent(ctx context.Context, doer *user_model.User, repo *re
 		CommitMessage:  commitMessage,
 		DoerUser:       doer,
 	}
-	commitHash, err := t.CommitTree(commitOpts)
+	commitHash, err := t.CommitTree(ctx, commitOpts)
 	if err != nil {
 		return err
 	}
 
-	return t.Push(doer, commitHash, repo.DefaultBranch)
+	return t.Push(ctx, doer, commitHash, repo.DefaultBranch)
 }
 
-func writeObjectToIndex(t *files_service.TemporaryUploadRepository, path string, r io.Reader) error {
-	hash, err := t.HashObject(r)
+func writeObjectToIndex(ctx context.Context, t *files_service.TemporaryUploadRepository, path string, r io.Reader) error {
+	hash, err := t.HashObject(ctx, r)
 	if err != nil {
 		return err
 	}
 
-	return t.AddObjectToIndex("100644", hash, path)
+	return t.AddObjectToIndex(ctx, "100644", hash, path)
 }
diff --git a/services/repository/files/cherry_pick.go b/services/repository/files/cherry_pick.go
@@ -39,18 +39,18 @@ func CherryPick(ctx context.Context, repo *repo_model.Repository, doer *user_mod
 	}
 	message := strings.TrimSpace(opts.Message)
 
-	t, err := NewTemporaryUploadRepository(ctx, repo)
+	t, err := NewTemporaryUploadRepository(repo)
 	if err != nil {
 		log.Error("NewTemporaryUploadRepository failed: %v", err)
 	}
 	defer t.Close()
-	if err := t.Clone(opts.OldBranch, false); err != nil {
+	if err := t.Clone(ctx, opts.OldBranch, false); err != nil {
 		return nil, err
 	}
-	if err := t.SetDefaultIndex(); err != nil {
+	if err := t.SetDefaultIndex(ctx); err != nil {
 		return nil, err
 	}
-	if err := t.RefreshIndex(); err != nil {
+	if err := t.RefreshIndex(ctx); err != nil {
 		return nil, err
 	}
 
@@ -103,7 +103,7 @@ func CherryPick(ctx context.Context, repo *repo_model.Repository, doer *user_mod
 		return nil, fmt.Errorf("failed to merge due to conflicts")
 	}
 
-	treeHash, err := t.WriteTree()
+	treeHash, err := t.WriteTree(ctx)
 	if err != nil {
 		// likely non-sensical tree due to merge conflicts...
 		return nil, err
@@ -124,13 +124,13 @@ func CherryPick(ctx context.Context, repo *repo_model.Repository, doer *user_mod
 	if opts.Dates != nil {
 		commitOpts.AuthorTime, commitOpts.CommitterTime = &opts.Dates.Author, &opts.Dates.Committer
 	}
-	commitHash, err := t.CommitTree(commitOpts)
+	commitHash, err := t.CommitTree(ctx, commitOpts)
 	if err != nil {
 		return nil, err
 	}
 
 	// Then push this tree to NewBranch
-	if err := t.Push(doer, commitHash, opts.NewBranch); err != nil {
+	if err := t.Push(ctx, doer, commitHash, opts.NewBranch); err != nil {
 		return nil, err
 	}
 
diff --git a/services/repository/files/diff.go b/services/repository/files/diff.go
@@ -16,27 +16,27 @@ func GetDiffPreview(ctx context.Context, repo *repo_model.Repository, branch, tr
 	if branch == "" {
 		branch = repo.DefaultBranch
 	}
-	t, err := NewTemporaryUploadRepository(ctx, repo)
+	t, err := NewTemporaryUploadRepository(repo)
 	if err != nil {
 		return nil, err
 	}
 	defer t.Close()
-	if err := t.Clone(branch, true); err != nil {
+	if err := t.Clone(ctx, branch, true); err != nil {
 		return nil, err
 	}
-	if err := t.SetDefaultIndex(); err != nil {
+	if err := t.SetDefaultIndex(ctx); err != nil {
 		return nil, err
 	}
 
 	// Add the object to the database
-	objectHash, err := t.HashObject(strings.NewReader(content))
+	objectHash, err := t.HashObject(ctx, strings.NewReader(content))
 	if err != nil {
 		return nil, err
 	}
 
 	// Add the object to the index
-	if err := t.AddObjectToIndex("100644", objectHash, treePath); err != nil {
+	if err := t.AddObjectToIndex(ctx, "100644", objectHash, treePath); err != nil {
 		return nil, err
 	}
-	return t.DiffIndex()
+	return t.DiffIndex(ctx)
 }
diff --git a/services/repository/files/patch.go b/services/repository/files/patch.go
@@ -126,15 +126,15 @@ func ApplyDiffPatch(ctx context.Context, repo *repo_model.Repository, doer *user
 
 	message := strings.TrimSpace(opts.Message)
 
-	t, err := NewTemporaryUploadRepository(ctx, repo)
+	t, err := NewTemporaryUploadRepository(repo)
 	if err != nil {
 		log.Error("NewTemporaryUploadRepository failed: %v", err)
 	}
 	defer t.Close()
-	if err := t.Clone(opts.OldBranch, true); err != nil {
+	if err := t.Clone(ctx, opts.OldBranch, true); err != nil {
 		return nil, err
 	}
-	if err := t.SetDefaultIndex(); err != nil {
+	if err := t.SetDefaultIndex(ctx); err != nil {
 		return nil, err
 	}
 
@@ -179,7 +179,7 @@ func ApplyDiffPatch(ctx context.Context, repo *repo_model.Repository, doer *user
 	}
 
 	// Now write the tree
-	treeHash, err := t.WriteTree()
+	treeHash, err := t.WriteTree(ctx)
 	if err != nil {
 		return nil, err
 	}
@@ -199,13 +199,13 @@ func ApplyDiffPatch(ctx context.Context, repo *repo_model.Repository, doer *user
 	if opts.Dates != nil {
 		commitOpts.AuthorTime, commitOpts.CommitterTime = &opts.Dates.Author, &opts.Dates.Committer
 	}
-	commitHash, err := t.CommitTree(commitOpts)
+	commitHash, err := t.CommitTree(ctx, commitOpts)
 	if err != nil {
 		return nil, err
 	}
 
 	// Then push this tree to NewBranch
-	if err := t.Push(doer, commitHash, opts.NewBranch); err != nil {
+	if err := t.Push(ctx, doer, commitHash, opts.NewBranch); err != nil {
 		return nil, err
 	}
 
diff --git a/services/repository/files/temp_repo.go b/services/repository/files/temp_repo.go
diff --git a/services/repository/files/update.go b/services/repository/files/update.go
diff --git a/services/repository/files/upload.go b/services/repository/files/upload.go

Original file line number	Diff line number	Diff line change
`@@ -529,8 +529,8 @@ func ActivityQueryCondition(ctx context.Context, opts GetFeedsOptions) (builder.`
`529`	`529`	`}`
`530`	`530`
`531`	`531`	`if opts.RequestedTeam != nil {`
`532`		`- env := repo_model.AccessibleTeamReposEnv(ctx, organization.OrgFromUser(opts.RequestedUser), opts.RequestedTeam)`
`533`		`- teamRepoIDs, err := env.RepoIDs(1, opts.RequestedUser.NumRepos)`
	`532`	`+ env := repo_model.AccessibleTeamReposEnv(organization.OrgFromUser(opts.RequestedUser), opts.RequestedTeam)`
	`533`	`+ teamRepoIDs, err := env.RepoIDs(ctx, 1, opts.RequestedUser.NumRepos)`
`534`	`534`	`if err != nil {`
`535`	`535`	`return nil, fmt.Errorf("GetTeamRepositories: %w", err)`
`536`	`536`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ func RemoveOrgUser(ctx context.Context, org organization.Organization, user us`
`64`	`64`	`if err != nil {`
`65`	`65`	`return fmt.Errorf("AccessibleReposEnv: %w", err)`
`66`	`66`	`}`
`67`		`- repoIDs, err := env.RepoIDs(1, org.NumRepos)`
	`67`	`+ repoIDs, err := env.RepoIDs(ctx, 1, org.NumRepos)`
`68`	`68`	`if err != nil {`
`69`	`69`	`return fmt.Errorf("GetUserRepositories [%d]: %w", user.ID, err)`
`70`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ func RebuildIndex(ctx context.Context, doer, owner *user_model.User) error {`
`78`	`78`	`"Rebuild Cargo Index",`
`79`	`79`	`func(t *files_service.TemporaryUploadRepository) error {`
`80`	`80`	`// Remove all existing content but the Cargo config`
`81`		`- files, err := t.LsFiles()`
	`81`	`+ files, err := t.LsFiles(ctx)`
`82`	`82`	`if err != nil {`
`83`	`83`	`return err`
`84`	`84`	`}`
`@@ -89,7 +89,7 @@ func RebuildIndex(ctx context.Context, doer, owner *user_model.User) error {`
`89`	`89`	`break`
`90`	`90`	`}`
`91`	`91`	`}`
`92`		`- if err := t.RemoveFilesFromIndex(files...); err != nil {`
	`92`	`+ if err := t.RemoveFilesFromIndex(ctx, files...); err != nil {`
`93`	`93`	`return err`
`94`	`94`	`}`
`95`	`95`
`@@ -204,7 +204,7 @@ func addOrUpdatePackageIndex(ctx context.Context, t *files_service.TemporaryUplo`
`204`	`204`	`return nil`
`205`	`205`	`}`
`206`	`206`
`207`		`- return writeObjectToIndex(t, BuildPackagePath(p.LowerName), b)`
	`207`	`+ return writeObjectToIndex(ctx, t, BuildPackagePath(p.LowerName), b)`
`208`	`208`	`}`
`209`	`209`
`210`	`210`	`func getOrCreateIndexRepository(ctx context.Context, doer, owner user_model.User) (repo_model.Repository, error) {`
`@@ -252,29 +252,29 @@ func createOrUpdateConfigFile(ctx context.Context, repo *repo_model.Repository,`
`252`	`252`	`return err`
`253`	`253`	`}`
`254`	`254`
`255`		`- return writeObjectToIndex(t, ConfigFileName, &b)`
	`255`	`+ return writeObjectToIndex(ctx, t, ConfigFileName, &b)`
`256`	`256`	`},`
`257`	`257`	`)`
`258`	`258`	`}`
`259`	`259`
`260`	`260`	`// This is a shorter version of CreateOrUpdateRepoFile which allows to perform multiple actions on a git repository`
`261`	`261`	`func alterRepositoryContent(ctx context.Context, doer user_model.User, repo repo_model.Repository, commitMessage string, fn func(*files_service.TemporaryUploadRepository) error) error {`
`262`		`- t, err := files_service.NewTemporaryUploadRepository(ctx, repo)`
	`262`	`+ t, err := files_service.NewTemporaryUploadRepository(repo)`
`263`	`263`	`if err != nil {`
`264`	`264`	`return err`
`265`	`265`	`}`
`266`	`266`	`defer t.Close()`
`267`	`267`
`268`	`268`	`var lastCommitID string`
`269`		`- if err := t.Clone(repo.DefaultBranch, true); err != nil {`
	`269`	`+ if err := t.Clone(ctx, repo.DefaultBranch, true); err != nil {`
`270`	`270`	`if !git.IsErrBranchNotExist(err) \|\| !repo.IsEmpty {`
`271`	`271`	`return err`
`272`	`272`	`}`
`273`		`- if err := t.Init(repo.ObjectFormatName); err != nil {`
	`273`	`+ if err := t.Init(ctx, repo.ObjectFormatName); err != nil {`
`274`	`274`	`return err`
`275`	`275`	`}`
`276`	`276`	`} else {`
`277`		`- if err := t.SetDefaultIndex(); err != nil {`
	`277`	`+ if err := t.SetDefaultIndex(ctx); err != nil {`
`278`	`278`	`return err`
`279`	`279`	`}`
`280`	`280`
`@@ -290,7 +290,7 @@ func alterRepositoryContent(ctx context.Context, doer user_model.User, repo re`
`290`	`290`	`return err`
`291`	`291`	`}`
`292`	`292`
`293`		`- treeHash, err := t.WriteTree()`
	`293`	`+ treeHash, err := t.WriteTree(ctx)`
`294`	`294`	`if err != nil {`
`295`	`295`	`return err`
`296`	`296`	`}`
`@@ -301,19 +301,19 @@ func alterRepositoryContent(ctx context.Context, doer user_model.User, repo re`
`301`	`301`	`CommitMessage: commitMessage,`
`302`	`302`	`DoerUser: doer,`
`303`	`303`	`}`
`304`		`- commitHash, err := t.CommitTree(commitOpts)`
	`304`	`+ commitHash, err := t.CommitTree(ctx, commitOpts)`
`305`	`305`	`if err != nil {`
`306`	`306`	`return err`
`307`	`307`	`}`
`308`	`308`
`309`		`- return t.Push(doer, commitHash, repo.DefaultBranch)`
	`309`	`+ return t.Push(ctx, doer, commitHash, repo.DefaultBranch)`
`310`	`310`	`}`
`311`	`311`
`312`		`-func writeObjectToIndex(t *files_service.TemporaryUploadRepository, path string, r io.Reader) error {`
`313`		`- hash, err := t.HashObject(r)`
	`312`	`+func writeObjectToIndex(ctx context.Context, t *files_service.TemporaryUploadRepository, path string, r io.Reader) error {`
	`313`	`+ hash, err := t.HashObject(ctx, r)`
`314`	`314`	`if err != nil {`
`315`	`315`	`return err`
`316`	`316`	`}`
`317`	`317`
`318`		`- return t.AddObjectToIndex("100644", hash, path)`
	`318`	`+ return t.AddObjectToIndex(ctx, "100644", hash, path)`
`319`	`319`	`}`
Original file line number	Diff line number	Diff line change
`@@ -39,18 +39,18 @@ func CherryPick(ctx context.Context, repo repo_model.Repository, doer user_mod`
`39`	`39`	`}`
`40`	`40`	`message := strings.TrimSpace(opts.Message)`
`41`	`41`
`42`		`- t, err := NewTemporaryUploadRepository(ctx, repo)`
	`42`	`+ t, err := NewTemporaryUploadRepository(repo)`
`43`	`43`	`if err != nil {`
`44`	`44`	`log.Error("NewTemporaryUploadRepository failed: %v", err)`
`45`	`45`	`}`
`46`	`46`	`defer t.Close()`
`47`		`- if err := t.Clone(opts.OldBranch, false); err != nil {`
	`47`	`+ if err := t.Clone(ctx, opts.OldBranch, false); err != nil {`
`48`	`48`	`return nil, err`
`49`	`49`	`}`
`50`		`- if err := t.SetDefaultIndex(); err != nil {`
	`50`	`+ if err := t.SetDefaultIndex(ctx); err != nil {`
`51`	`51`	`return nil, err`
`52`	`52`	`}`
`53`		`- if err := t.RefreshIndex(); err != nil {`
	`53`	`+ if err := t.RefreshIndex(ctx); err != nil {`
`54`	`54`	`return nil, err`
`55`	`55`	`}`
`56`	`56`
`@@ -103,7 +103,7 @@ func CherryPick(ctx context.Context, repo repo_model.Repository, doer user_mod`
`103`	`103`	`return nil, fmt.Errorf("failed to merge due to conflicts")`
`104`	`104`	`}`
`105`	`105`
`106`		`- treeHash, err := t.WriteTree()`
	`106`	`+ treeHash, err := t.WriteTree(ctx)`
`107`	`107`	`if err != nil {`
`108`	`108`	`// likely non-sensical tree due to merge conflicts...`
`109`	`109`	`return nil, err`
`@@ -124,13 +124,13 @@ func CherryPick(ctx context.Context, repo repo_model.Repository, doer user_mod`
`124`	`124`	`if opts.Dates != nil {`
`125`	`125`	`commitOpts.AuthorTime, commitOpts.CommitterTime = &opts.Dates.Author, &opts.Dates.Committer`
`126`	`126`	`}`
`127`		`- commitHash, err := t.CommitTree(commitOpts)`
	`127`	`+ commitHash, err := t.CommitTree(ctx, commitOpts)`
`128`	`128`	`if err != nil {`
`129`	`129`	`return nil, err`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`// Then push this tree to NewBranch`
`133`		`- if err := t.Push(doer, commitHash, opts.NewBranch); err != nil {`
	`133`	`+ if err := t.Push(ctx, doer, commitHash, opts.NewBranch); err != nil {`
`134`	`134`	`return nil, err`
`135`	`135`	`}`
`136`	`136`
Original file line number	Diff line number	Diff line change
`@@ -16,27 +16,27 @@ func GetDiffPreview(ctx context.Context, repo *repo_model.Repository, branch, tr`
`16`	`16`	`if branch == "" {`
`17`	`17`	`branch = repo.DefaultBranch`
`18`	`18`	`}`
`19`		`- t, err := NewTemporaryUploadRepository(ctx, repo)`
	`19`	`+ t, err := NewTemporaryUploadRepository(repo)`
`20`	`20`	`if err != nil {`
`21`	`21`	`return nil, err`
`22`	`22`	`}`
`23`	`23`	`defer t.Close()`
`24`		`- if err := t.Clone(branch, true); err != nil {`
	`24`	`+ if err := t.Clone(ctx, branch, true); err != nil {`
`25`	`25`	`return nil, err`
`26`	`26`	`}`
`27`		`- if err := t.SetDefaultIndex(); err != nil {`
	`27`	`+ if err := t.SetDefaultIndex(ctx); err != nil {`
`28`	`28`	`return nil, err`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`// Add the object to the database`
`32`		`- objectHash, err := t.HashObject(strings.NewReader(content))`
	`32`	`+ objectHash, err := t.HashObject(ctx, strings.NewReader(content))`
`33`	`33`	`if err != nil {`
`34`	`34`	`return nil, err`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`// Add the object to the index`
`38`		`- if err := t.AddObjectToIndex("100644", objectHash, treePath); err != nil {`
	`38`	`+ if err := t.AddObjectToIndex(ctx, "100644", objectHash, treePath); err != nil {`
`39`	`39`	`return nil, err`
`40`	`40`	`}`
`41`		`- return t.DiffIndex()`
	`41`	`+ return t.DiffIndex(ctx)`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -126,15 +126,15 @@ func ApplyDiffPatch(ctx context.Context, repo repo_model.Repository, doer user`
`126`	`126`
`127`	`127`	`message := strings.TrimSpace(opts.Message)`
`128`	`128`
`129`		`- t, err := NewTemporaryUploadRepository(ctx, repo)`
	`129`	`+ t, err := NewTemporaryUploadRepository(repo)`
`130`	`130`	`if err != nil {`
`131`	`131`	`log.Error("NewTemporaryUploadRepository failed: %v", err)`
`132`	`132`	`}`
`133`	`133`	`defer t.Close()`
`134`		`- if err := t.Clone(opts.OldBranch, true); err != nil {`
	`134`	`+ if err := t.Clone(ctx, opts.OldBranch, true); err != nil {`
`135`	`135`	`return nil, err`
`136`	`136`	`}`
`137`		`- if err := t.SetDefaultIndex(); err != nil {`
	`137`	`+ if err := t.SetDefaultIndex(ctx); err != nil {`
`138`	`138`	`return nil, err`
`139`	`139`	`}`
`140`	`140`
`@@ -179,7 +179,7 @@ func ApplyDiffPatch(ctx context.Context, repo repo_model.Repository, doer user`
`179`	`179`	`}`
`180`	`180`
`181`	`181`	`// Now write the tree`
`182`		`- treeHash, err := t.WriteTree()`
	`182`	`+ treeHash, err := t.WriteTree(ctx)`
`183`	`183`	`if err != nil {`
`184`	`184`	`return nil, err`
`185`	`185`	`}`
`@@ -199,13 +199,13 @@ func ApplyDiffPatch(ctx context.Context, repo repo_model.Repository, doer user`
`199`	`199`	`if opts.Dates != nil {`
`200`	`200`	`commitOpts.AuthorTime, commitOpts.CommitterTime = &opts.Dates.Author, &opts.Dates.Committer`
`201`	`201`	`}`
`202`		`- commitHash, err := t.CommitTree(commitOpts)`
	`202`	`+ commitHash, err := t.CommitTree(ctx, commitOpts)`
`203`	`203`	`if err != nil {`
`204`	`204`	`return nil, err`
`205`	`205`	`}`
`206`	`206`
`207`	`207`	`// Then push this tree to NewBranch`
`208`		`- if err := t.Push(doer, commitHash, opts.NewBranch); err != nil {`
	`208`	`+ if err := t.Push(ctx, doer, commitHash, opts.NewBranch); err != nil {`
`209`	`209`	`return nil, err`
`210`	`210`	`}`
`211`	`211`