add context to GetPatch

modernize test

Author: TheFox0x7

modules/git/repo_compare.go

@@ -245,10 +245,10 @@ func (repo *Repository) GetDiffBinary(ctx context.Context, compareArg string, w
 }
 
 // GetPatch generates and returns format-patch data between given revisions, able to be used with `git apply`
-func (repo *Repository) GetPatch(compareArg string, w io.Writer) error {
+func (repo *Repository) GetPatch(ctx context.Context, compareArg string, w io.Writer) error {
 	stderr := new(bytes.Buffer)
 	return NewCommand("format-patch", "--binary", "--stdout").AddDynamicArguments(compareArg).
-		Run(repo.Ctx, &RunOpts{
+		Run(ctx, &RunOpts{
 			Dir:    repo.Path,
 			Stdout: w,
 			Stderr: stderr,

modules/git/repo_compare_test.go

@@ -10,6 +10,7 @@ import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/require"
 )
 
 func TestGetFormatPatch(t *testing.T) {
@@ -21,24 +22,15 @@ func TestGetFormatPatch(t *testing.T) {
 	}
 
 	repo, err := openRepositoryWithDefaultContext(clonedPath)
-	if err != nil {
-		assert.NoError(t, err)
-		return
-	}
+	require.NoError(t, err)
 	defer repo.Close()
 
 	rd := &bytes.Buffer{}
-	err = repo.GetPatch("8d92fc95^...8d92fc95", rd)
-	if err != nil {
-		assert.NoError(t, err)
-		return
-	}
+	err = repo.GetPatch(t.Context(), "8d92fc95^...8d92fc95", rd)
+	require.NoError(t, err)
 
 	patchb, err := io.ReadAll(rd)
-	if err != nil {
-		assert.NoError(t, err)
-		return
-	}
+	require.NoError(t, err)
 
 	patch := string(patchb)
 	assert.Regexp(t, "^From 8d92fc95", patch)

services/pull/patch.go

@@ -44,7 +44,7 @@ func DownloadDiffOrPatch(ctx context.Context, pr *issues_model.PullRequest, w io
 	compareArg := pr.MergeBase + "..." + pr.GetGitRefName()
 	switch {
 	case patch:
-		err = gitRepo.GetPatch(compareArg, w)
+		err = gitRepo.GetPatch(ctx, compareArg, w)
 	case binary:
 		err = gitRepo.GetDiffBinary(ctx, compareArg, w)
 	default: