pkg/covermerger: rename variables, delete unused

Not all variables were renames after RepoBranchCommit refactoring.
Some unused variables found.

4 files changed, 44 insertions, 46 deletions

diff --git a/pkg/covermerger/covermerger_test.go b/pkg/covermerger/covermerger_test.go
index 035e5972d..8a33c9872 100644
--- a/pkg/covermerger/covermerger_test.go
+++ b/pkg/covermerger/covermerger_test.go
@@ -135,13 +135,13 @@ samp_time,1,360,arch,b1,ci-mock,git://repo,master,commit2,not_changed.c,func1,4,
 
 type fileVersProviderMock struct{}
 
-func (m *fileVersProviderMock) GetFileVersions(c *Config, targetFilePath string, rbcs []RepoCommit,
+func (m *fileVersProviderMock) GetFileVersions(c *Config, targetFilePath string, repoCommits []RepoCommit,
 ) (fileVersions, error) {
 	res := make(fileVersions)
-	for _, rbc := range rbcs {
-		filePath := filepath.Join(c.Workdir, "repos", rbc.Commit, targetFilePath)
+	for _, repoCommit := range repoCommits {
+		filePath := filepath.Join(c.Workdir, "repos", repoCommit.Commit, targetFilePath)
 		if bytes, err := os.ReadFile(filePath); err == nil {
-			res[rbc] = string(bytes)
+			res[repoCommit] = string(bytes)
 		}
 	}
 	return res, nil
diff --git a/pkg/covermerger/file_line_merger.go b/pkg/covermerger/file_line_merger.go
index 95d226adf..8d4c7f7d7 100644
--- a/pkg/covermerger/file_line_merger.go
+++ b/pkg/covermerger/file_line_merger.go
@@ -9,8 +9,8 @@ func makeFileLineCoverMerger(
 	fvs fileVersions, base RepoCommit, storeDetails bool) FileCoverageMerger {
 	baseFile := ""
 	baseFileExists := false
-	for rbc, fv := range fvs {
-		if rbc == base {
+	for repoCommit, fv := range fvs {
+		if repoCommit == base {
 			baseFile = fv
 			baseFileExists = true
 			break
@@ -24,7 +24,6 @@ func makeFileLineCoverMerger(
 			HitCounts:  make(map[int]int),
 			FileExists: true,
 		},
-		rbcToFile:  fvs,
 		baseFile:   baseFile,
 		matchers:   make(map[RepoCommit]*LineToLineMatcher),
 		lostFrames: map[RepoCommit]int64{},
@@ -32,15 +31,14 @@ func makeFileLineCoverMerger(
 	if storeDetails {
 		a.MergeResult.LineDetails = make(map[int][]*FileRecord)
 	}
-	for rbc, fv := range fvs {
-		a.matchers[rbc] = makeLineToLineMatcher(fv, baseFile)
+	for repoBranch, fv := range fvs {
+		a.matchers[repoBranch] = makeLineToLineMatcher(fv, baseFile)
 	}
 	return a
 }
 
 type FileLineCoverMerger struct {
 	*MergeResult
-	rbcToFile  fileVersions
 	baseFile   string
 	matchers   map[RepoCommit]*LineToLineMatcher
 	lostFrames map[RepoCommit]int64
@@ -62,9 +60,9 @@ func (a *FileLineCoverMerger) Add(record *FileRecord) {
 }
 
 func (a *FileLineCoverMerger) Result() *MergeResult {
-	for rbc, lostFrames := range a.lostFrames {
+	for repoBranch, lostFrames := range a.lostFrames {
 		log.Logf(1, "\t[warn] lost %d frames from repoCommit(%s, %s)",
-			lostFrames, rbc.Repo, rbc.Commit)
+			lostFrames, repoBranch.Repo, repoBranch.Commit)
 	}
 	return a.MergeResult
 }
diff --git a/pkg/covermerger/provider_monorepo.go b/pkg/covermerger/provider_monorepo.go
index 379c8c138..53bad4b12 100644
--- a/pkg/covermerger/provider_monorepo.go
+++ b/pkg/covermerger/provider_monorepo.go
@@ -14,7 +14,7 @@ import (
 )
 
 type FileVersProvider interface {
-	GetFileVersions(c *Config, targetFilePath string, rbcs []RepoCommit,
+	GetFileVersions(c *Config, targetFilePath string, repoCommits []RepoCommit,
 	) (fileVersions, error)
 }
 
@@ -26,83 +26,83 @@ type monoRepo struct {
 
 type fileVersions map[RepoCommit]string
 
-func (mr *monoRepo) GetFileVersions(c *Config, targetFilePath string, rbcs []RepoCommit,
+func (mr *monoRepo) GetFileVersions(c *Config, targetFilePath string, repoCommits []RepoCommit,
 ) (fileVersions, error) {
 	mr.mu.RLock()
-	if !mr.allRepoCommitsPresent(rbcs) {
+	if !mr.allRepoCommitsPresent(repoCommits) {
 		mr.mu.RUnlock()
-		mr.cloneCommits(rbcs)
+		mr.cloneCommits(repoCommits)
 		mr.mu.RLock()
 	}
 	defer mr.mu.RUnlock()
 	res := make(fileVersions)
-	for _, rbc := range rbcs {
-		fileBytes, err := mr.repo.Object(targetFilePath, rbc.Commit)
+	for _, repoCommit := range repoCommits {
+		fileBytes, err := mr.repo.Object(targetFilePath, repoCommit.Commit)
 		// It is ok if some file doesn't exist. It means we have repo FS diff.
 		// Or the upstream commit doesn't exist anymore
 		if err != nil {
-			log.Logf(1, "repo.Object(%s, %s) error: %s", targetFilePath, rbc.Commit, err.Error())
+			log.Logf(1, "repo.Object(%s, %s) error: %s", targetFilePath, repoCommit.Commit, err.Error())
 			continue
 		}
-		res[rbc] = string(fileBytes)
+		res[repoCommit] = string(fileBytes)
 	}
 	return res, nil
 }
 
-func (mr *monoRepo) allRepoCommitsPresent(rbcs []RepoCommit) bool {
-	for _, rbc := range rbcs {
-		if !mr.repoCommitPresent(rbc) {
+func (mr *monoRepo) allRepoCommitsPresent(repoCommits []RepoCommit) bool {
+	for _, repoCommit := range repoCommits {
+		if !mr.repoCommitPresent(repoCommit) {
 			return false
 		}
 	}
 	return true
 }
 
-func (mr *monoRepo) repoCommitPresent(rbc RepoCommit) bool {
-	_, ok := mr.repoCommits[rbc]
+func (mr *monoRepo) repoCommitPresent(repoCommit RepoCommit) bool {
+	_, ok := mr.repoCommits[repoCommit]
 	return ok
 }
 
-func (mr *monoRepo) addRepoCommit(rbc RepoCommit) {
-	log.Logf(0, "cloning repo: %s, commit %s", rbc.Repo, rbc.Commit)
-	mr.repoCommits[rbc] = struct{}{}
-	if rbc.Repo == "" || rbc.Commit == "" {
+func (mr *monoRepo) addRepoCommit(repoCommit RepoCommit) {
+	log.Logf(0, "cloning repo: %s, commit %s", repoCommit.Repo, repoCommit.Commit)
+	mr.repoCommits[repoCommit] = struct{}{}
+	repo, commit := repoCommit.Repo, repoCommit.Commit
+	if repo == "" || commit == "" {
 		panic("repo and commit are needed")
 	}
-	if _, err := mr.repo.CheckoutCommit(rbc.Repo, rbc.Commit); err != nil {
-		log.Logf(0, "failed to CheckoutCommit(repo %s, commit %s): %s",
-			rbc.Repo, rbc.Commit, err.Error())
+	if _, err := mr.repo.CheckoutCommit(repo, commit); err != nil {
+		log.Logf(0, "failed to CheckoutCommit(repo %s, commit %s): %s", repo, commit, err.Error())
 	}
 }
 
 func MakeMonoRepo(workdir string) FileVersProvider {
-	rbcPath := filepath.Join(workdir, "repos", "linux_kernels")
+	repoPath := filepath.Join(workdir, "repos", "linux_kernels")
 	mr := &monoRepo{
 		repoCommits: map[RepoCommit]struct{}{},
 	}
 	var err error
-	if mr.repo, err = vcs.NewRepo(targets.Linux, "none", rbcPath); err != nil {
-		panic(fmt.Sprintf("failed to create/open repo at %s: %s", rbcPath, err.Error()))
+	if mr.repo, err = vcs.NewRepo(targets.Linux, "none", repoPath); err != nil {
+		panic(fmt.Sprintf("failed to create/open repo at %s: %s", repoPath, err.Error()))
 	}
 	return mr
 }
 
-func (mr *monoRepo) cloneCommits(rbcs []RepoCommit) {
+func (mr *monoRepo) cloneCommits(repoCommits []RepoCommit) {
 	mr.mu.Lock()
 	defer mr.mu.Unlock()
-	for _, rbc := range rbcs {
-		if mr.repoCommitPresent(rbc) {
+	for _, repoCommit := range repoCommits {
+		if mr.repoCommitPresent(repoCommit) {
 			continue
 		}
-		commitExistsInRepo, err := mr.repo.CommitExists(rbc.Commit)
+		commitExistsInRepo, err := mr.repo.CommitExists(repoCommit.Commit)
 		if err != nil {
 			log.Logf(0, "can't check CommitExists: %s", err.Error())
 		}
 		if commitExistsInRepo {
-			log.Logf(0, "commit %s exists in local repo, no need to clone", rbc.Commit)
-			mr.repoCommits[rbc] = struct{}{}
+			log.Logf(0, "commit %s exists in local repo, no need to clone", repoCommit.Commit)
+			mr.repoCommits[repoCommit] = struct{}{}
 			continue
 		}
-		mr.addRepoCommit(rbc)
+		mr.addRepoCommit(repoCommit)
 	}
 }
diff --git a/pkg/covermerger/provider_web.go b/pkg/covermerger/provider_web.go
index 18addd6ee..5e8bee4a6 100644
--- a/pkg/covermerger/provider_web.go
+++ b/pkg/covermerger/provider_web.go
@@ -14,11 +14,11 @@ import (
 type webGit struct {
 }
 
-func (mr *webGit) GetFileVersions(c *Config, targetFilePath string, rbcs []RepoCommit,
+func (mr *webGit) GetFileVersions(c *Config, targetFilePath string, repoCommits []RepoCommit,
 ) (fileVersions, error) {
 	res := make(fileVersions)
-	for _, rbc := range rbcs {
-		fileBytes, err := loadFile(targetFilePath, rbc.Repo, rbc.Commit)
+	for _, repoCommit := range repoCommits {
+		fileBytes, err := loadFile(targetFilePath, repoCommit.Repo, repoCommit.Commit)
 		// It is ok if some file doesn't exist. It means we have repo FS diff.
 		if err == errFileNotFound {
 			continue
@@ -26,7 +26,7 @@ func (mr *webGit) GetFileVersions(c *Config, targetFilePath string, rbcs []RepoC
 		if err != nil {
 			return nil, fmt.Errorf("failed to loadFile: %w", err)
 		}
-		res[rbc] = string(fileBytes)
+		res[repoCommit] = string(fileBytes)
 	}
 	return res, nil
 }