-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
(+semver: feature) Handle merge commits in master (#12)
Signed-off-by: Joshua Benjamin <[email protected]>
- Loading branch information
1 parent
b941e75
commit f1b2729
Showing
2 changed files
with
234 additions
and
111 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,223 @@ | ||
| package git | ||
|
|
||
| import ( | ||
| "regexp" | ||
|
|
||
| "gopkg.in/src-d/go-git.v4/plumbing" | ||
|
|
||
| "github.com/coreos/go-semver/semver" | ||
| "github.com/pkg/errors" | ||
| "gopkg.in/src-d/go-git.v4" | ||
| "gopkg.in/src-d/go-git.v4/plumbing/object" | ||
| ) | ||
|
|
||
| type branchWalker struct { | ||
| repository *git.Repository | ||
| head *object.Commit | ||
| tagMap map[string]string | ||
| settings *Settings | ||
| isMaster bool | ||
| endHash string | ||
|
|
||
| visited map[string]bool | ||
| commitsToReconcile map[string]*gitVersion | ||
| } | ||
|
|
||
| type versionHolder struct { | ||
| versionMap []*gitVersion | ||
| } | ||
|
|
||
| func newBranchWalker(repository *git.Repository, head *object.Commit, tagMap map[string]string, settings *Settings, isMaster bool, endHash string) *branchWalker { | ||
| return &branchWalker{ | ||
| repository: repository, | ||
| head: head, | ||
| settings: settings, | ||
| tagMap: tagMap, | ||
| isMaster: isMaster, | ||
| endHash: endHash, | ||
| visited: make(map[string]bool), | ||
| commitsToReconcile: make(map[string]*gitVersion), | ||
| } | ||
| } | ||
|
|
||
| func (b *branchWalker) GetVersion() (*semver.Version, error) { | ||
| versionMap, err := b.GetVersionMap() | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| var baseVersion *semver.Version | ||
| index := len(versionMap) - 1 | ||
| if versionMap[index].IsSolid { | ||
| baseVersion = versionMap[index].Name | ||
| index-- | ||
| } else { | ||
| baseVersion, err = semver.NewVersion("0.0.0") | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| } | ||
|
|
||
| if index < 0 { | ||
| return baseVersion, nil | ||
| } | ||
|
|
||
| for ; index >= 0; index-- { | ||
| v := versionMap[index] | ||
| switch { | ||
| case v.MajorBump: | ||
| baseVersion.BumpMajor() | ||
| case v.MinorBump: | ||
| baseVersion.BumpMinor() | ||
| case v.PatchBump: | ||
| baseVersion.BumpPatch() | ||
| default: // every commit in master has at least a patch bump | ||
| baseVersion.BumpPatch() | ||
| } | ||
| } | ||
|
|
||
| return baseVersion, nil | ||
| } | ||
|
|
||
| func (b *branchWalker) GetVersionMap() ([]*gitVersion, error) { | ||
| versionMap := versionHolder{ | ||
| versionMap: []*gitVersion{}, | ||
| } | ||
|
|
||
| err := b.walkVersion(b.head, &versionMap, false) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| if b.isMaster { | ||
| for hash, version := range b.commitsToReconcile { | ||
| err = b.reconcileCommit(hash, version) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| } | ||
| } | ||
|
|
||
| return versionMap.versionMap, nil | ||
| } | ||
|
|
||
| func (b *branchWalker) walkVersion(ref *object.Commit, version *versionHolder, tilVisited bool) error { | ||
| if _, visited := b.visited[ref.Hash.String()]; tilVisited && visited { | ||
| return nil | ||
| } | ||
|
|
||
| b.visited[ref.Hash.String()] = true | ||
|
|
||
| tag, ok := b.tagMap[ref.Hash.String()] | ||
| if ok { | ||
| tagVersion, err := semver.NewVersion(tag) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| version.versionMap = append(version.versionMap, &gitVersion{IsSolid: true, Name: tagVersion}) | ||
| return nil | ||
| } | ||
|
|
||
| parents := ref.NumParents() | ||
| if parents > 1 { | ||
| versionToReconcile := gitVersion{IsSolid: false} | ||
| version.versionMap = append(version.versionMap, &versionToReconcile) | ||
|
|
||
| b.commitsToReconcile[ref.Hash.String()] = &versionToReconcile | ||
| return b.checkWalkParent(ref, version, tilVisited) | ||
| } | ||
|
|
||
| matched, err := regexp.MatchString(b.settings.MajorPattern, ref.Message) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| if matched { | ||
| version.versionMap = append(version.versionMap, &gitVersion{IsSolid: false, MajorBump: true}) | ||
| return b.checkWalkParent(ref, version, tilVisited) | ||
| } | ||
|
|
||
| matched, err = regexp.MatchString(b.settings.MinorPattern, ref.Message) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| if matched { | ||
| version.versionMap = append(version.versionMap, &gitVersion{IsSolid: false, MinorBump: true}) | ||
| return b.checkWalkParent(ref, version, tilVisited) | ||
| } | ||
|
|
||
| matched, err = regexp.MatchString(b.settings.PatchPattern, ref.Message) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| if matched { | ||
| version.versionMap = append(version.versionMap, &gitVersion{IsSolid: false, PatchBump: true}) | ||
| return b.checkWalkParent(ref, version, tilVisited) | ||
| } | ||
|
|
||
| version.versionMap = append(version.versionMap, &gitVersion{IsSolid: false}) | ||
|
|
||
| return b.checkWalkParent(ref, version, tilVisited) | ||
| } | ||
|
|
||
| func (b *branchWalker) checkWalkParent(ref *object.Commit, version *versionHolder, tilVisited bool) error { | ||
| parents := ref.NumParents() | ||
| if parents == 0 { | ||
| return nil | ||
| } | ||
|
|
||
| parent, err := ref.Parent(0) | ||
| if err != nil { | ||
| return nil | ||
| } | ||
|
|
||
| if parent.Hash.String() == b.endHash { | ||
| return nil | ||
| } | ||
|
|
||
| return b.walkVersion(parent, version, tilVisited) | ||
| } | ||
|
|
||
| func (b *branchWalker) reconcileCommit(hash string, version *gitVersion) error { | ||
| versionMap := versionHolder{ | ||
| versionMap: []*gitVersion{}, | ||
| } | ||
|
|
||
| commit, err := b.repository.CommitObject(plumbing.NewHash(hash)) | ||
| if err != nil { | ||
| return errors.Wrap(err, "failed to get commit in reconcile") | ||
| } | ||
|
|
||
| if commit.NumParents() <= 1 { | ||
| return nil | ||
| } | ||
|
|
||
| parentToWalk, err := commit.Parent(1) | ||
| if err != nil { | ||
| return errors.Wrap(err, "failed to get parent in reconcile") | ||
| } | ||
|
|
||
| err = b.walkVersion(parentToWalk, &versionMap, true) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| var hasMajor, hasMinor bool | ||
| for _, bump := range versionMap.versionMap { | ||
| if bump.MajorBump { | ||
| hasMajor = true | ||
| } | ||
| if bump.MinorBump { | ||
| hasMinor = true | ||
| } | ||
| } | ||
|
|
||
| if hasMajor { | ||
| version.MajorBump = true | ||
| } else if hasMinor { | ||
| version.MinorBump = true | ||
| } else { | ||
| version.PatchBump = true | ||
| } | ||
|
|
||
| return nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters