refactor(librarian): move conventionalcommit to gitrepo (#2554)

Commit is in the name of the package so it makes sense that this
code should be related to the git code. In a future PR I will remove
the Commit type and/or replace it with ConventionalCommit.

Updates: #2543

Author: codyoss

internal/config/state.go

@@ -20,7 +20,6 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/googleapis/librarian/internal/conventionalcommits"
 	"github.com/googleapis/librarian/internal/gitrepo"
 )
 
@@ -114,7 +113,7 @@ type LibraryState struct {
 	LastGeneratedCommit string `yaml:"last_generated_commit" json:"-"`
 	// The changes from the language repository since the library was last released.
 	// This field is ignored when writing to state.yaml.
-	Changes []*conventionalcommits.ConventionalCommit `yaml:"-" json:"changes,omitempty"`
+	Changes []*gitrepo.ConventionalCommit `yaml:"-" json:"changes,omitempty"`
 	// A list of APIs that are part of this library.
 	APIs []*API `yaml:"apis" json:"apis"`
 	// A list of directories in the language repository where Librarian contributes code.

internal/docker/docker_test.go

@@ -25,7 +25,7 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 	"github.com/googleapis/librarian/internal/config"
-	"github.com/googleapis/librarian/internal/conventionalcommits"
+	"github.com/googleapis/librarian/internal/gitrepo"
 )
 
 func TestNew(t *testing.T) {
@@ -929,7 +929,7 @@ func TestReleaseInitRequestContent(t *testing.T) {
 				ID:               "my-library",
 				Version:          "1.1.0",
 				ReleaseTriggered: true,
-				Changes: []*conventionalcommits.ConventionalCommit{
+				Changes: []*gitrepo.ConventionalCommit{
 					{
 						Type:    "feat",
 						Subject: "new feature",

internal/conventionalcommits/conventional_commits.go renamed to internal/gitrepo/conventional_commits.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package conventionalcommits
+package gitrepo
 
 import (
 	"encoding/json"
@@ -22,8 +22,6 @@ import (
 	"regexp"
 	"strings"
 	"time"
-
-	"github.com/googleapis/librarian/internal/gitrepo"
 )
 
 const (
@@ -125,7 +123,7 @@ func (c *ConventionalCommit) MarshalJSON() ([]byte, error) {
 // Malformed override or nested blocks (e.g., with a missing end marker) are
 // ignored. Any commit part that is found but fails to parse as a valid
 // conventional commit is logged and skipped.
-func ParseCommits(commit *gitrepo.Commit, libraryID string) ([]*ConventionalCommit, error) {
+func ParseCommits(commit *Commit, libraryID string) ([]*ConventionalCommit, error) {
 	message := commit.Message
 	if strings.TrimSpace(message) == "" {
 		return nil, ErrEmptyCommitMessage
@@ -196,7 +194,7 @@ func extractCommitParts(message string) []commitPart {
 
 // parseSimpleCommit parses a simple commit message and returns a slice of ConventionalCommit.
 // A simple commit message is commit that does not include override or nested commits.
-func parseSimpleCommit(commitPart commitPart, commit *gitrepo.Commit, libraryID string) ([]*ConventionalCommit, error) {
+func parseSimpleCommit(commitPart commitPart, commit *Commit, libraryID string) ([]*ConventionalCommit, error) {
 	trimmedMessage := strings.TrimSpace(commitPart.message)
 	if trimmedMessage == "" {
 		return nil, fmt.Errorf("empty commit message")

internal/conventionalcommits/conventional_commits_test.go renamed to internal/gitrepo/conventional_commits_test.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package conventionalcommits
+package gitrepo
 
 import (
 	"strings"
@@ -21,7 +21,6 @@ import (
 
 	"github.com/go-git/go-git/v5/plumbing"
 	"github.com/google/go-cmp/cmp"
-	"github.com/googleapis/librarian/internal/gitrepo"
 )
 
 func TestParseCommits(t *testing.T) {
@@ -546,7 +545,7 @@ END_COMMIT_OVERRIDE`,
 		},
 	} {
 		t.Run(test.name, func(t *testing.T) {
-			commit := &gitrepo.Commit{
+			commit := &Commit{
 				Message: test.message,
 				Hash:    plumbing.NewHash("fake-sha"),
 				When:    now,

internal/librarian/commit_version_analyzer.go

@@ -21,14 +21,13 @@ import (
 	"strings"
 
 	"github.com/googleapis/librarian/internal/config"
-	"github.com/googleapis/librarian/internal/conventionalcommits"
 	"github.com/googleapis/librarian/internal/gitrepo"
 	"github.com/googleapis/librarian/internal/semver"
 )
 
 // getConventionalCommitsSinceLastRelease returns all conventional commits for the given library since the
 // version specified in the state file. The repo should be the language repo.
-func getConventionalCommitsSinceLastRelease(repo gitrepo.Repository, library *config.LibraryState, tag string) ([]*conventionalcommits.ConventionalCommit, error) {
+func getConventionalCommitsSinceLastRelease(repo gitrepo.Repository, library *config.LibraryState, tag string) ([]*gitrepo.ConventionalCommit, error) {
 	commits, err := repo.GetCommitsForPathsSinceTag(library.SourceRoots, tag)
 
 	if err != nil {
@@ -59,10 +58,10 @@ func shouldIncludeForRelease(files, sourceRoots, excludePaths []string) bool {
 // getConventionalCommitsSinceLastGeneration returns all conventional commits for
 // all API paths in given library since the last generation. The repo input should
 // be the googleapis source repo.
-func getConventionalCommitsSinceLastGeneration(sourceRepo, languageRepo gitrepo.Repository, library *config.LibraryState, lastGenCommit string) ([]*conventionalcommits.ConventionalCommit, error) {
+func getConventionalCommitsSinceLastGeneration(sourceRepo, languageRepo gitrepo.Repository, library *config.LibraryState, lastGenCommit string) ([]*gitrepo.ConventionalCommit, error) {
 	if lastGenCommit == "" {
 		slog.Info("the last generation commit is empty, skip fetching conventional commits", "library", library.ID)
-		return make([]*conventionalcommits.ConventionalCommit, 0), nil
+		return make([]*gitrepo.ConventionalCommit, 0), nil
 	}
 
 	apiPaths := make([]string, 0)
@@ -131,8 +130,8 @@ func shouldIncludeForGeneration(sourceFiles, languageRepoFiles []string, library
 }
 
 // libraryFilter filters a list of conventional commits by library ID.
-func libraryFilter(commits []*conventionalcommits.ConventionalCommit, libraryID string) []*conventionalcommits.ConventionalCommit {
-	var filteredCommits []*conventionalcommits.ConventionalCommit
+func libraryFilter(commits []*gitrepo.ConventionalCommit, libraryID string) []*gitrepo.ConventionalCommit {
+	var filteredCommits []*gitrepo.ConventionalCommit
 	for _, commit := range commits {
 		if libraryIDs, ok := commit.Footers["Library-IDs"]; ok {
 			ids := strings.Split(libraryIDs, ",")
@@ -152,8 +151,8 @@ func libraryFilter(commits []*conventionalcommits.ConventionalCommit, libraryID
 // convertToConventionalCommits converts a list of commits in a git repo into a list
 // of conventional commits. The filesFilter parameter is custom filter out non-matching
 // files depending on a generation or a release change.
-func convertToConventionalCommits(sourceRepo gitrepo.Repository, library *config.LibraryState, commits []*gitrepo.Commit, filesFilter func(files []string) bool) ([]*conventionalcommits.ConventionalCommit, error) {
-	var conventionalCommits []*conventionalcommits.ConventionalCommit
+func convertToConventionalCommits(sourceRepo gitrepo.Repository, library *config.LibraryState, commits []*gitrepo.Commit, filesFilter func(files []string) bool) ([]*gitrepo.ConventionalCommit, error) {
+	var conventionalCommits []*gitrepo.ConventionalCommit
 	for _, commit := range commits {
 		files, err := sourceRepo.ChangedFilesInCommit(commit.Hash.String())
 		if err != nil {
@@ -162,7 +161,7 @@ func convertToConventionalCommits(sourceRepo gitrepo.Repository, library *config
 		if !filesFilter(files) {
 			continue
 		}
-		parsedCommits, err := conventionalcommits.ParseCommits(commit, library.ID)
+		parsedCommits, err := gitrepo.ParseCommits(commit, library.ID)
 		if err != nil {
 			return nil, fmt.Errorf("failed to parse commit %s: %w", commit.Hash.String(), err)
 		}
@@ -195,13 +194,13 @@ func isUnderAnyPath(file string, paths []string) bool {
 }
 
 // NextVersion calculates the next semantic version based on a slice of conventional commits.
-func NextVersion(commits []*conventionalcommits.ConventionalCommit, currentVersion string) (string, error) {
+func NextVersion(commits []*gitrepo.ConventionalCommit, currentVersion string) (string, error) {
 	highestChange := getHighestChange(commits)
 	return semver.DeriveNext(highestChange, currentVersion)
 }
 
 // getHighestChange determines the highest-ranking change type from a slice of commits.
-func getHighestChange(commits []*conventionalcommits.ConventionalCommit) semver.ChangeLevel {
+func getHighestChange(commits []*gitrepo.ConventionalCommit) semver.ChangeLevel {
 	highestChange := semver.None
 	for _, commit := range commits {
 		var currentChange semver.ChangeLevel