feat: reverted code that did not need changing

Author: demeyerthom

.gitignore

@@ -25,5 +25,6 @@ __pycache__
 
 # binaries
 /mach-composer
+**/.mach-composer
 /local
-/result
+/result

internal/gitutils/diff.go

@@ -1,6 +1,7 @@
 package gitutils
 
 import (
+	"context"
 	"fmt"
 	"strings"
 
@@ -28,8 +29,8 @@ func pathFilter(paths []string) func(path string) bool {
 
 // commitsBetween returns the commits between revisions first and last. It should equal the functionality of
 // `git log base..head`. See https://github.com/go-git/go-git/issues/69
-func commitsBetween(repository *git.Repository, first, last *plumbing.Revision, paths []string) ([]*object.Commit, error) {
-	log.Debug().Msgf("Getting commits between %s and %s (paths = %s)", first, last, paths)
+func commitsBetween(ctx context.Context, repository *git.Repository, first, last *plumbing.Revision, paths []string) ([]*object.Commit, error) {
+	log.Ctx(ctx).Debug().Msgf("Getting commits between %s and %s (paths = %s)", first, last, paths)
 	if first != nil {
 		_, err := repository.ResolveRevision(*first)
 		if err != nil {
@@ -43,7 +44,7 @@ func commitsBetween(repository *git.Repository, first, last *plumbing.Revision,
 	var firstCommit *object.Commit
 	if first != nil {
 		if val, err := repository.ResolveRevision(*first); err != nil {
-			log.Warn().Err(err).Msgf("failed to resolve %s in repository", first.String())
+			log.Ctx(ctx).Warn().Err(err).Msgf("failed to resolve %s in repository", first.String())
 			return []*object.Commit{}, nil
 		} else {
 			firstHash = val
@@ -85,7 +86,7 @@ func commitsBetween(repository *git.Repository, first, last *plumbing.Revision,
 		}
 		if firstCommit != nil && firstCommit.Committer.When.After(c.Committer.When) {
 			found = false
-			log.Info().Msgf("Did not find commit %s in path but next older commit %s in paths %s", first, c.Hash, paths)
+			log.Ctx(ctx).Info().Msgf("Did not find commit %s in path but next older commit %s in paths %s", first, c.Hash, paths)
 			return storer.ErrStop
 		}
 
@@ -96,7 +97,7 @@ func commitsBetween(repository *git.Repository, first, last *plumbing.Revision,
 		return nil, err
 	}
 	if !found {
-		log.Info().Msgf("found commit %s in %s but failed to find changes in paths %s", first, last, paths)
+		log.Ctx(ctx).Info().Msgf("found commit %s in %s but failed to find changes in paths %s", first, last, paths)
 	}
 
 	return result, nil

internal/gitutils/diff_test.go

@@ -1,6 +1,7 @@
 package gitutils
 
 import (
+	"context"
 	"github.com/go-git/go-git/v5/plumbing"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
@@ -27,12 +28,13 @@ func TestCommitsBetweenResolveFirstError(t *testing.T) {
 	secondHash, err := tr.commit("Second commit")
 	require.NoError(t, err)
 
+	ctx := context.Background()
 	targetRev := plumbing.Revision(secondHash.String())
 
 	badRev := plumbing.Revision("test")
 
 	// Check results
-	_, err = commitsBetween(tr.repository(), &badRev, &targetRev, []string{})
+	_, err = commitsBetween(ctx, tr.repository(), &badRev, &targetRev, []string{})
 	require.Error(t, err)
 }
 
@@ -53,14 +55,16 @@ func TestCommitsBetween(t *testing.T) {
 	secondHash, err := tr.commit("Second commit")
 	require.NoError(t, err)
 
+	ctx := context.Background()
+
 	targetRev := plumbing.Revision(secondHash.String())
 	baseRev := plumbing.Revision(firstHash.String())
 
-	commits, err := commitsBetween(tr.repository(), nil, &targetRev, []string{})
+	commits, err := commitsBetween(ctx, tr.repository(), nil, &targetRev, []string{})
 	require.NoError(t, err)
 	assert.Equal(t, 2, len(commits))
 
-	commits, err = commitsBetween(tr.repository(), &baseRev, &targetRev, []string{})
+	commits, err = commitsBetween(ctx, tr.repository(), &baseRev, &targetRev, []string{})
 	require.NoError(t, err)
 	assert.Equal(t, 1, len(commits))
 }
@@ -96,14 +100,15 @@ func TestCommitsBetweenFilterPath(t *testing.T) {
 	thirdHash, err := tr.commit("third commit")
 	require.NoError(t, err)
 
+	ctx := context.Background()
 	targetRev := plumbing.Revision(thirdHash.String())
 
 	// Check results
-	commits, err := commitsBetween(tr.repository(), nil, &targetRev, []string{})
+	commits, err := commitsBetween(ctx, tr.repository(), nil, &targetRev, []string{})
 	require.NoError(t, err)
 	assert.Equal(t, 3, len(commits))
 
-	commits, err = commitsBetween(tr.repository(), nil, &targetRev, []string{"wanted/"})
+	commits, err = commitsBetween(ctx, tr.repository(), nil, &targetRev, []string{"wanted/"})
 	require.NoError(t, err)
 	assert.Equal(t, 1, len(commits))
 }

internal/gitutils/git.go

@@ -201,10 +201,10 @@ func commitExists(ctx context.Context, gitPath, baseRevision, targetRevision str
 	return nil
 }
 
-func determineRevision(repository *git.Repository, revision string) *plumbing.Revision {
+func determineRevision(ctx context.Context, repository *git.Repository, revision string) *plumbing.Revision {
 	tagRef, err := repository.Tag(revision)
 	if err == nil {
-		log.Debug().Msgf("Found tag %s. Using revision %s to determine updates", tagRef.Name().Short(),
+		log.Ctx(ctx).Debug().Msgf("Found tag %s. Using revision %s to determine updates", tagRef.Name().Short(),
 			tagRef.Hash().String())
 		return asRevision(tagRef.Hash().String())
 	}
@@ -225,14 +225,14 @@ func GetRecentCommits(ctx context.Context, basePath string, baseRevision, target
 		return nil, fmt.Errorf("failed to open repository: %w", err)
 	}
 
-	baseRev := determineRevision(repository, baseRevision)
+	baseRev := determineRevision(ctx, repository, baseRevision)
 	targetRev := asRevision(targetRevision)
 
 	if err = commitExists(ctx, gitPath, baseRevision, targetRevision); err != nil {
 		return nil, err
 	}
 
-	commits, err := commitsBetween(repository, baseRev, targetRev, filterPaths)
+	commits, err := commitsBetween(ctx, repository, baseRev, targetRev, filterPaths)
 	if err != nil {
 		return nil, err
 	}
@@ -333,11 +333,11 @@ func fetchGitRepository(ctx context.Context, source *GitSource, dest string) {
 	_, err := os.Stat(dest)
 	if os.IsNotExist(err) {
 		output, _ := runGit(ctx, ".", "clone", "--bare", source.Repository, dest)
-		log.Debug().
+		log.Ctx(ctx).Debug().
 			Msgf("downloaded new repository %s at destination %s: %s", source.Name, dest, string(output))
 	} else {
 		output, _ := runGit(ctx, dest, "fetch", "-f", "origin", "*:*")
-		log.Debug().
+		log.Ctx(ctx).Debug().
 			Msgf("updated existing repository %s at destination %s: %s", source.Name, dest, string(output))
 	}
 }