Roll all changes back to default branch, only change is rename to andrewb1269hg

Signed-off-by: Andrew Brandt <[email protected]>

Author: andrewb1269

go.mod

@@ -10,7 +10,6 @@ require (
 
 require (
 	dario.cat/mergo v1.0.0 // indirect
-	github.com/Masterminds/semver/v3 v3.3.1 // indirect
 	github.com/Microsoft/go-winio v0.6.1 // indirect
 	github.com/ProtonMail/go-crypto v1.0.0 // indirect
 	github.com/cloudflare/circl v1.3.7 // indirect

go.sum

@@ -1,7 +1,5 @@
 dario.cat/mergo v1.0.0 h1:AGCNq9Evsj31mOgNPcLyXc+4PNABt905YmuqPYYpBWk=
 dario.cat/mergo v1.0.0/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
-github.com/Masterminds/semver/v3 v3.3.1 h1:QtNSWtVZ3nBfk8mAOu/B6v7FMJ+NHTIgUPi7rj+4nv4=
-github.com/Masterminds/semver/v3 v3.3.1/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
 github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY=
 github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow=
 github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM=

latest/latest.go

@@ -1,7 +1,6 @@
 package latest
 
 import (
-  "github.com/Masterminds/semver/v3"
 	"github.com/go-git/go-git/v5"
 	"github.com/go-git/go-git/v5/plumbing"
 	"github.com/pkg/errors"
@@ -94,54 +93,3 @@ func tagNameToVersion(tagName string) *semver.Version {
 
 	return version
 }
-
-func FindLatestVersionOnBranch(repo *git.Repository, majorVersionFilter int, branchName string, preRelease bool) (*semver.Version, *plumbing.Reference, error) {
-    iter, err := repo.Tags()
-    if err != nil {
-        return nil, nil, err
-    }
-
-    var latestVersion *semver.Version
-    var latestTag *plumbing.Reference
-
-    err = iter.ForEach(func(ref *plumbing.Reference) error {
-        commit, err := repo.CommitObject(ref.Hash())
-        if err != nil {
-            return nil
-        }
-
-        // Ensure the commit is on the specified branch
-        isMerged, err := repo.getMergeBase(commit, branchName)
-        if err != nil || !isMerged {
-            return nil // Skip tags not in the default branch history
-        }
-
-        version, err := semver.ParseTolerant(ref.Name().Short())
-        if err != nil {
-            return nil
-        }
-
-        if latestVersion == nil || version.GreaterThan(latestVersion) {
-            latestVersion = &version
-            latestTag = ref
-        }
-
-        return nil
-    })
-
-    if err != nil {
-        return nil, nil, err
-    }
-
-    return latestVersion, latestTag, nil
-}
-
-func getMergeBase(repoPath, branchA, branchB string) (string, error) {
-    cmd := exec.Command("git", "-C", repoPath, "merge-base", branchA, branchB)
-    output, err := cmd.Output()
-    if err != nil {
-        return "", err
-    }
-    return strings.TrimSpace(string(output)), nil
-}
-

next/next.go

@@ -35,12 +35,7 @@ func Next(options NextOptions) (*semver.Version, error) {
 		return nil, errors.WithMessage(err, "Could not find HEAD")
 	}
 
-  defaultBranchRef, err := repo.Reference(plumbing.ReferenceName("refs/remotes/origin/HEAD"), true)
-  if err != nil {
-      return nil, errors.WithMessage(err, "Could not determine default branch")
-  }
-
-  latestReleaseVersion, latestReleaseVersionTag, err := latest.FindLatestVersionOnBranch(repo, options.MajorVersionFilter, defaultBranchRef.Name().Short(), false)
+	latestReleaseVersion, latestReleaseVersionTag, err := latest.FindLatestVersion(repo, options.MajorVersionFilter, false)
 
 	if err != nil {
 		return nil, errors.WithMessage(err, "Error while trying to find latest release version tag")
@@ -60,13 +55,8 @@ func Next(options NextOptions) (*semver.Version, error) {
 	var latestPreReleaseVersionTag *plumbing.Reference
 
 	if options.PreReleaseOptions.ShouldBePreRelease() {
-		defaultBranchRef, err := repo.Reference(plumbing.ReferenceName("refs/remotes/origin/HEAD"), true)
-    if err != nil {
-        return nil, errors.WithMessage(err, "Could not determine default branch")
-    }
-
-    latestPreReleaseVersion, latestPreReleaseVersionTag, err = latest.FindLatestVersionOnBranch(repo, options.MajorVersionFilter, defaultBranchRef.Name().Short(), true)
-  }
+		latestPreReleaseVersion, latestPreReleaseVersionTag, err = latest.FindLatestVersion(repo, options.MajorVersionFilter, true)
+	}
 
 	if err != nil {
 		return nil, errors.WithMessage(err, "Error while trying to find latest pre-release version tag")