From e482fad30eb00b9e52f9a9215d6a264c63d20613 Mon Sep 17 00:00:00 2001 From: Abhinav Singh Date: Wed, 24 May 2023 02:41:35 -0700 Subject: [PATCH] feat: [CODE-345]: rename enhancement and committer addition --- gitrpc/internal/gitea/commit.go | 6 ++++-- gitrpc/internal/service/mapping.go | 10 +++++----- gitrpc/mapping.go | 10 +++++----- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/gitrpc/internal/gitea/commit.go b/gitrpc/internal/gitea/commit.go index 7b85eeecb..36b27b838 100644 --- a/gitrpc/internal/gitea/commit.go +++ b/gitrpc/internal/gitea/commit.go @@ -204,10 +204,12 @@ func getRenameDetails( giteaRepo *gitea.Repository, commits []types.Commit, path string) ([]types.PathRenameDetails, error) { - renameDetailsList := make([]types.PathRenameDetails, 0, 2) if len(commits) == 0 { - return renameDetailsList, nil + return []types.PathRenameDetails{}, nil } + + renameDetailsList := make([]types.PathRenameDetails, 0, 2) + renameDetails, err := giteaGetRenameDetails(giteaRepo, commits[0].SHA, path) if err != nil { return nil, err diff --git a/gitrpc/internal/service/mapping.go b/gitrpc/internal/service/mapping.go index 6e7a32b6e..64d85a502 100644 --- a/gitrpc/internal/service/mapping.go +++ b/gitrpc/internal/service/mapping.go @@ -143,12 +143,12 @@ func mapDiffFileHunkHeaders(diffHunkHeaders []*types.DiffFileHunkHeaders) []*rpc func mapRenameDetails(renameDetails []types.PathRenameDetails) []*rpc.RenameDetails { renameDetailsList := make([]*rpc.RenameDetails, len(renameDetails)) - for i := range renameDetails { + for i, detail := range renameDetails { renameDetailsList[i] = &rpc.RenameDetails{ - OldPath: renameDetails[i].OldPath, - NewPath: renameDetails[i].NewPath, - CommitShaBefore: renameDetails[i].CommitSHABefore, - CommitShaAfter: renameDetails[i].CommitSHAAfter} + OldPath: detail.OldPath, + NewPath: detail.NewPath, + CommitShaBefore: detail.CommitSHABefore, + CommitShaAfter: detail.CommitSHAAfter} } return renameDetailsList } diff --git a/gitrpc/mapping.go b/gitrpc/mapping.go index bb909e4a7..bb6fd3816 100644 --- a/gitrpc/mapping.go +++ b/gitrpc/mapping.go @@ -110,12 +110,12 @@ func mapRPCCommitTag(t *rpc.CommitTag) (*CommitTag, error) { func mapRPCRenameDetails(c []*rpc.RenameDetails) []*RenameDetails { renameDetailsList := make([]*RenameDetails, len(c)) - for i := range renameDetailsList { + for i, detail := range c { renameDetailsList[i] = &RenameDetails{ - OldPath: c[i].OldPath, - NewPath: c[i].NewPath, - CommitShaBefore: c[i].CommitShaBefore, - CommitShaAfter: c[i].CommitShaAfter, + OldPath: detail.OldPath, + NewPath: detail.NewPath, + CommitShaBefore: detail.CommitShaBefore, + CommitShaAfter: detail.CommitShaAfter, } } return renameDetailsList