mirror of
https://github.com/hanzoai/forge.git
synced 2026-10-30 15:00:39 +00:00
zeekayandHanzo Dev
aa87442fdd
Source files keep their SPDX-License-Identifier and Hanzo copyright line; the Gitea, Gogs and LFS Test Server copyrights they used to repeat now live once in NOTICE, alongside LICENSE. The header lint accepts any copyright line above the SPDX line, so it no longer demands an upstream one. Co-authored-by: Hanzo Dev <[email protected]>
71 lines
2.3 KiB
Go
71 lines
2.3 KiB
Go
// Copyright 2026 Hanzo AI, Inc. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package gitrepo
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"strconv"
|
|
"strings"
|
|
|
|
"github.com/hanzoai/git/modules/git/gitcmd"
|
|
)
|
|
|
|
// DivergeObject represents commit count diverging commits
|
|
type DivergeObject struct {
|
|
Ahead int
|
|
Behind int
|
|
}
|
|
|
|
// GetDivergingCommits returns the number of commits a targetBranch is ahead or behind a baseBranch
|
|
func GetDivergingCommits(ctx context.Context, repo Repository, baseBranch, targetBranch string) (*DivergeObject, error) {
|
|
cmd := gitcmd.NewCommand("rev-list", "--count", "--left-right").
|
|
AddDynamicArguments(baseBranch + "..." + targetBranch).AddArguments("--")
|
|
stdout, _, err1 := RunCmdString(ctx, repo, cmd)
|
|
if err1 != nil {
|
|
return nil, err1
|
|
}
|
|
|
|
left, right, found := strings.Cut(strings.Trim(stdout, "\n"), "\t")
|
|
if !found {
|
|
return nil, fmt.Errorf("git rev-list output is missing a tab: %q", stdout)
|
|
}
|
|
|
|
behind, err := strconv.Atoi(left)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
ahead, err := strconv.Atoi(right)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return &DivergeObject{Ahead: ahead, Behind: behind}, nil
|
|
}
|
|
|
|
// GetCommitIDsBetweenReverse returns the last commit IDs between two commits in reverse order (from old to new) with limit.
|
|
// If the result exceeds the limit, the old commits IDs will be ignored
|
|
func GetCommitIDsBetweenReverse(ctx context.Context, repo Repository, startRef, endRef, notRef string, limit int) ([]string, error) {
|
|
genCmd := func(reversions ...string) *gitcmd.Command {
|
|
cmd := gitcmd.NewCommand("rev-list", "--reverse").
|
|
AddArguments("-n").AddDynamicArguments(strconv.Itoa(limit)).
|
|
AddDynamicArguments(reversions...)
|
|
if notRef != "" { // --not should be kept as the last parameter of git command, otherwise the result will be wrong
|
|
cmd.AddOptionValues("--not", notRef)
|
|
}
|
|
return cmd
|
|
}
|
|
stdout, _, err := RunCmdString(ctx, repo, genCmd(startRef+".."+endRef))
|
|
if gitcmd.IsStderr(err, gitcmd.StderrNoMergeBase) {
|
|
// if the start and end are not related (no merge base), just get all commits pushed by "end ref"
|
|
// previously it would return the results of git rev-list before last so let's try that...
|
|
stdout, _, err = RunCmdString(ctx, repo, genCmd(endRef))
|
|
}
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
commitIDs := strings.Fields(strings.TrimSpace(stdout))
|
|
return commitIDs, nil
|
|
}
|