2016-11-03 22:16:01 +00:00
|
|
|
// Copyright 2015 The Gogs Authors. All rights reserved.
|
2019-04-19 12:17:27 +00:00
|
|
|
// Copyright 2019 The Gitea Authors. All rights reserved.
|
2022-11-27 18:20:29 +00:00
|
|
|
// SPDX-License-Identifier: MIT
|
2016-11-03 22:16:01 +00:00
|
|
|
|
|
|
|
package git
|
|
|
|
|
|
|
|
import (
|
|
|
|
"bytes"
|
2022-08-15 01:22:13 +00:00
|
|
|
"encoding/hex"
|
|
|
|
"fmt"
|
2021-03-04 00:48:19 +00:00
|
|
|
"io"
|
2016-11-03 22:16:01 +00:00
|
|
|
"strconv"
|
|
|
|
"strings"
|
2021-06-26 11:28:55 +00:00
|
|
|
|
2022-07-30 08:09:04 +00:00
|
|
|
"code.gitea.io/gitea/modules/cache"
|
2021-06-26 11:28:55 +00:00
|
|
|
"code.gitea.io/gitea/modules/setting"
|
2016-11-03 22:16:01 +00:00
|
|
|
)
|
|
|
|
|
|
|
|
// GetBranchCommitID returns last commit ID string of given branch.
|
|
|
|
func (repo *Repository) GetBranchCommitID(name string) (string, error) {
|
2018-01-19 06:18:51 +00:00
|
|
|
return repo.GetRefCommitID(BranchPrefix + name)
|
2016-11-03 22:16:01 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// GetTagCommitID returns last commit ID string of given tag.
|
|
|
|
func (repo *Repository) GetTagCommitID(name string) (string, error) {
|
2021-04-14 14:22:37 +00:00
|
|
|
return repo.GetRefCommitID(TagPrefix + name)
|
2016-11-03 22:16:01 +00:00
|
|
|
}
|
|
|
|
|
2019-08-05 20:39:39 +00:00
|
|
|
// GetCommit returns commit object of by ID string.
|
|
|
|
func (repo *Repository) GetCommit(commitID string) (*Commit, error) {
|
|
|
|
id, err := repo.ConvertToSHA1(commitID)
|
2016-11-03 22:16:01 +00:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
return repo.getCommit(id)
|
|
|
|
}
|
|
|
|
|
|
|
|
// GetBranchCommit returns the last commit of given branch.
|
|
|
|
func (repo *Repository) GetBranchCommit(name string) (*Commit, error) {
|
|
|
|
commitID, err := repo.GetBranchCommitID(name)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
return repo.GetCommit(commitID)
|
|
|
|
}
|
|
|
|
|
2016-12-22 09:30:52 +00:00
|
|
|
// GetTagCommit get the commit of the specific tag via name
|
2016-11-03 22:16:01 +00:00
|
|
|
func (repo *Repository) GetTagCommit(name string) (*Commit, error) {
|
|
|
|
commitID, err := repo.GetTagCommitID(name)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
return repo.GetCommit(commitID)
|
|
|
|
}
|
|
|
|
|
2016-12-22 09:30:52 +00:00
|
|
|
func (repo *Repository) getCommitByPathWithID(id SHA1, relpath string) (*Commit, error) {
|
2016-11-03 22:16:01 +00:00
|
|
|
// File name starts with ':' must be escaped.
|
|
|
|
if relpath[0] == ':' {
|
|
|
|
relpath = `\` + relpath
|
|
|
|
}
|
|
|
|
|
2022-10-23 14:44:45 +00:00
|
|
|
stdout, _, runErr := NewCommand(repo.Ctx, "log", "-1", prettyLogFormat).AddDynamicArguments(id.String()).AddDashesAndList(relpath).RunStdString(&RunOpts{Dir: repo.Path})
|
2022-04-01 02:55:30 +00:00
|
|
|
if runErr != nil {
|
|
|
|
return nil, runErr
|
2016-11-03 22:16:01 +00:00
|
|
|
}
|
|
|
|
|
2022-04-01 02:55:30 +00:00
|
|
|
id, err := NewIDFromString(stdout)
|
2016-11-03 22:16:01 +00:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
return repo.getCommit(id)
|
|
|
|
}
|
|
|
|
|
|
|
|
// GetCommitByPath returns the last commit of relative path.
|
|
|
|
func (repo *Repository) GetCommitByPath(relpath string) (*Commit, error) {
|
2022-10-23 14:44:45 +00:00
|
|
|
stdout, _, runErr := NewCommand(repo.Ctx, "log", "-1", prettyLogFormat).AddDashesAndList(relpath).RunStdBytes(&RunOpts{Dir: repo.Path})
|
2022-04-01 02:55:30 +00:00
|
|
|
if runErr != nil {
|
|
|
|
return nil, runErr
|
2016-11-03 22:16:01 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
commits, err := repo.parsePrettyFormatLogToList(stdout)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
2021-08-09 18:08:51 +00:00
|
|
|
return commits[0], nil
|
2016-11-03 22:16:01 +00:00
|
|
|
}
|
|
|
|
|
2021-08-09 18:08:51 +00:00
|
|
|
func (repo *Repository) commitsByRange(id SHA1, page, pageSize int) ([]*Commit, error) {
|
2022-10-23 14:44:45 +00:00
|
|
|
stdout, _, err := NewCommand(repo.Ctx, "log").
|
|
|
|
AddArguments(CmdArg("--skip="+strconv.Itoa((page-1)*pageSize)), CmdArg("--max-count="+strconv.Itoa(pageSize)), prettyLogFormat).
|
|
|
|
AddDynamicArguments(id.String()).
|
|
|
|
RunStdBytes(&RunOpts{Dir: repo.Path})
|
2016-11-03 22:16:01 +00:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
return repo.parsePrettyFormatLogToList(stdout)
|
|
|
|
}
|
|
|
|
|
2021-08-09 18:08:51 +00:00
|
|
|
func (repo *Repository) searchCommits(id SHA1, opts SearchCommitsOptions) ([]*Commit, error) {
|
2020-06-11 21:44:39 +00:00
|
|
|
// create new git log command with limit of 100 commis
|
2022-10-23 14:44:45 +00:00
|
|
|
cmd := NewCommand(repo.Ctx, "log", "-100", prettyLogFormat).AddDynamicArguments(id.String())
|
2020-06-11 21:44:39 +00:00
|
|
|
// ignore case
|
2022-10-23 14:44:45 +00:00
|
|
|
args := []CmdArg{"-i"}
|
2020-06-11 21:44:39 +00:00
|
|
|
|
|
|
|
// add authors if present in search query
|
2019-04-12 02:28:44 +00:00
|
|
|
if len(opts.Authors) > 0 {
|
|
|
|
for _, v := range opts.Authors {
|
2022-10-23 14:44:45 +00:00
|
|
|
args = append(args, CmdArg("--author="+v))
|
2019-04-12 02:28:44 +00:00
|
|
|
}
|
|
|
|
}
|
2020-06-11 21:44:39 +00:00
|
|
|
|
2021-07-08 11:38:13 +00:00
|
|
|
// add committers if present in search query
|
2019-04-12 02:28:44 +00:00
|
|
|
if len(opts.Committers) > 0 {
|
|
|
|
for _, v := range opts.Committers {
|
2022-10-23 14:44:45 +00:00
|
|
|
args = append(args, CmdArg("--committer="+v))
|
2019-04-12 02:28:44 +00:00
|
|
|
}
|
|
|
|
}
|
2020-06-11 21:44:39 +00:00
|
|
|
|
|
|
|
// add time constraints if present in search query
|
2019-04-12 02:28:44 +00:00
|
|
|
if len(opts.After) > 0 {
|
2022-10-23 14:44:45 +00:00
|
|
|
args = append(args, CmdArg("--after="+opts.After))
|
2019-04-12 02:28:44 +00:00
|
|
|
}
|
|
|
|
if len(opts.Before) > 0 {
|
2022-10-23 14:44:45 +00:00
|
|
|
args = append(args, CmdArg("--before="+opts.Before))
|
2019-04-12 02:28:44 +00:00
|
|
|
}
|
2020-06-11 21:44:39 +00:00
|
|
|
|
|
|
|
// pretend that all refs along with HEAD were listed on command line as <commis>
|
|
|
|
// https://git-scm.com/docs/git-log#Documentation/git-log.txt---all
|
|
|
|
// note this is done only for command created above
|
2019-04-12 02:28:44 +00:00
|
|
|
if opts.All {
|
2020-06-11 21:44:39 +00:00
|
|
|
cmd.AddArguments("--all")
|
2019-09-02 23:38:04 +00:00
|
|
|
}
|
2020-06-11 21:44:39 +00:00
|
|
|
|
|
|
|
// add remaining keywords from search string
|
|
|
|
// note this is done only for command created above
|
2019-09-02 23:38:04 +00:00
|
|
|
if len(opts.Keywords) > 0 {
|
|
|
|
for _, v := range opts.Keywords {
|
2022-10-23 14:44:45 +00:00
|
|
|
cmd.AddArguments(CmdArg("--grep=" + v))
|
2019-09-02 23:38:04 +00:00
|
|
|
}
|
2017-02-05 14:43:28 +00:00
|
|
|
}
|
2020-06-11 21:44:39 +00:00
|
|
|
|
|
|
|
// search for commits matching given constraints and keywords in commit msg
|
2019-09-02 23:38:04 +00:00
|
|
|
cmd.AddArguments(args...)
|
2022-04-01 02:55:30 +00:00
|
|
|
stdout, _, err := cmd.RunStdBytes(&RunOpts{Dir: repo.Path})
|
2016-11-03 22:16:01 +00:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
2019-09-02 23:38:04 +00:00
|
|
|
if len(stdout) != 0 {
|
|
|
|
stdout = append(stdout, '\n')
|
|
|
|
}
|
2020-06-11 21:44:39 +00:00
|
|
|
|
2021-07-08 11:38:13 +00:00
|
|
|
// if there are any keywords (ie not committer:, author:, time:)
|
2020-06-11 21:44:39 +00:00
|
|
|
// then let's iterate over them
|
2019-09-02 23:38:04 +00:00
|
|
|
if len(opts.Keywords) > 0 {
|
|
|
|
for _, v := range opts.Keywords {
|
2022-10-17 14:40:37 +00:00
|
|
|
// ignore anything not matching a valid sha pattern
|
|
|
|
if IsValidSHAPattern(v) {
|
2020-06-11 21:44:39 +00:00
|
|
|
// create new git log command with 1 commit limit
|
2022-02-06 19:01:47 +00:00
|
|
|
hashCmd := NewCommand(repo.Ctx, "log", "-1", prettyLogFormat)
|
2020-06-11 21:44:39 +00:00
|
|
|
// add previous arguments except for --grep and --all
|
2019-09-02 23:38:04 +00:00
|
|
|
hashCmd.AddArguments(args...)
|
2020-06-11 21:44:39 +00:00
|
|
|
// add keyword as <commit>
|
2022-10-15 10:49:26 +00:00
|
|
|
hashCmd.AddDynamicArguments(v)
|
2020-06-11 21:44:39 +00:00
|
|
|
|
|
|
|
// search with given constraints for commit matching sha hash of v
|
2022-04-01 02:55:30 +00:00
|
|
|
hashMatching, _, err := hashCmd.RunStdBytes(&RunOpts{Dir: repo.Path})
|
2019-09-02 23:38:04 +00:00
|
|
|
if err != nil || bytes.Contains(stdout, hashMatching) {
|
|
|
|
continue
|
|
|
|
}
|
|
|
|
stdout = append(stdout, hashMatching...)
|
|
|
|
stdout = append(stdout, '\n')
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return repo.parsePrettyFormatLogToList(bytes.TrimSuffix(stdout, []byte{'\n'}))
|
2016-11-03 22:16:01 +00:00
|
|
|
}
|
|
|
|
|
2019-04-17 16:06:35 +00:00
|
|
|
func (repo *Repository) getFilesChanged(id1, id2 string) ([]string, error) {
|
2022-10-23 14:44:45 +00:00
|
|
|
stdout, _, err := NewCommand(repo.Ctx, "diff", "--name-only").AddDynamicArguments(id1, id2).RunStdBytes(&RunOpts{Dir: repo.Path})
|
2016-11-03 22:16:01 +00:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
return strings.Split(string(stdout), "\n"), nil
|
|
|
|
}
|
|
|
|
|
2019-04-17 16:06:35 +00:00
|
|
|
// FileChangedBetweenCommits Returns true if the file changed between commit IDs id1 and id2
|
2019-08-05 20:39:39 +00:00
|
|
|
// You must ensure that id1 and id2 are valid commit ids.
|
2019-04-17 16:06:35 +00:00
|
|
|
func (repo *Repository) FileChangedBetweenCommits(filename, id1, id2 string) (bool, error) {
|
2022-10-23 14:44:45 +00:00
|
|
|
stdout, _, err := NewCommand(repo.Ctx, "diff", "--name-only", "-z").AddDynamicArguments(id1, id2).AddDashesAndList(filename).RunStdBytes(&RunOpts{Dir: repo.Path})
|
2019-04-17 16:06:35 +00:00
|
|
|
if err != nil {
|
|
|
|
return false, err
|
|
|
|
}
|
|
|
|
return len(strings.TrimSpace(string(stdout))) > 0, nil
|
|
|
|
}
|
|
|
|
|
2021-07-08 11:38:13 +00:00
|
|
|
// FileCommitsCount return the number of files at a revision
|
2016-11-03 22:16:01 +00:00
|
|
|
func (repo *Repository) FileCommitsCount(revision, file string) (int64, error) {
|
2022-01-19 23:26:57 +00:00
|
|
|
return CommitsCountFiles(repo.Ctx, repo.Path, []string{revision}, []string{file})
|
2016-11-03 22:16:01 +00:00
|
|
|
}
|
|
|
|
|
2021-07-08 11:38:13 +00:00
|
|
|
// CommitsByFileAndRange return the commits according revision file and the page
|
2021-08-09 18:08:51 +00:00
|
|
|
func (repo *Repository) CommitsByFileAndRange(revision, file string, page int) ([]*Commit, error) {
|
2021-06-26 11:28:55 +00:00
|
|
|
skip := (page - 1) * setting.Git.CommitsRangeSize
|
2021-03-04 00:48:19 +00:00
|
|
|
|
|
|
|
stdoutReader, stdoutWriter := io.Pipe()
|
|
|
|
defer func() {
|
|
|
|
_ = stdoutReader.Close()
|
|
|
|
_ = stdoutWriter.Close()
|
|
|
|
}()
|
|
|
|
go func() {
|
|
|
|
stderr := strings.Builder{}
|
2022-10-23 14:44:45 +00:00
|
|
|
gitCmd := NewCommand(repo.Ctx, "rev-list").
|
|
|
|
AddArguments(CmdArg("--max-count=" + strconv.Itoa(setting.Git.CommitsRangeSize*page))).
|
|
|
|
AddArguments(CmdArg("--skip=" + strconv.Itoa(skip)))
|
2022-10-15 10:49:26 +00:00
|
|
|
gitCmd.AddDynamicArguments(revision)
|
2022-10-23 14:44:45 +00:00
|
|
|
gitCmd.AddDashesAndList(file)
|
2022-10-15 10:49:26 +00:00
|
|
|
err := gitCmd.Run(&RunOpts{
|
|
|
|
Dir: repo.Path,
|
|
|
|
Stdout: stdoutWriter,
|
|
|
|
Stderr: &stderr,
|
|
|
|
})
|
2021-03-04 00:48:19 +00:00
|
|
|
if err != nil {
|
|
|
|
_ = stdoutWriter.CloseWithError(ConcatenateError(err, (&stderr).String()))
|
|
|
|
} else {
|
|
|
|
_ = stdoutWriter.Close()
|
|
|
|
}
|
|
|
|
}()
|
|
|
|
|
2022-08-15 01:22:13 +00:00
|
|
|
commits := []*Commit{}
|
|
|
|
shaline := [41]byte{}
|
|
|
|
var sha1 SHA1
|
|
|
|
for {
|
|
|
|
n, err := io.ReadFull(stdoutReader, shaline[:])
|
|
|
|
if err != nil || n < 40 {
|
2021-03-04 00:48:19 +00:00
|
|
|
if err == io.EOF {
|
2022-08-15 01:22:13 +00:00
|
|
|
err = nil
|
2021-03-04 00:48:19 +00:00
|
|
|
}
|
2022-08-15 01:22:13 +00:00
|
|
|
return commits, err
|
|
|
|
}
|
|
|
|
n, err = hex.Decode(sha1[:], shaline[0:40])
|
|
|
|
if n != 20 {
|
|
|
|
err = fmt.Errorf("invalid sha %q", string(shaline[:40]))
|
|
|
|
}
|
|
|
|
if err != nil {
|
2021-03-04 00:48:19 +00:00
|
|
|
return nil, err
|
|
|
|
}
|
2022-08-15 01:22:13 +00:00
|
|
|
commit, err := repo.getCommit(sha1)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
commits = append(commits, commit)
|
2021-03-04 00:48:19 +00:00
|
|
|
}
|
2019-07-11 14:45:10 +00:00
|
|
|
}
|
|
|
|
|
2016-12-22 09:30:52 +00:00
|
|
|
// FilesCountBetween return the number of files changed between two commits
|
2016-11-03 22:16:01 +00:00
|
|
|
func (repo *Repository) FilesCountBetween(startCommitID, endCommitID string) (int, error) {
|
2022-10-23 14:44:45 +00:00
|
|
|
stdout, _, err := NewCommand(repo.Ctx, "diff", "--name-only").AddDynamicArguments(startCommitID + "..." + endCommitID).RunStdString(&RunOpts{Dir: repo.Path})
|
2020-07-29 17:53:04 +00:00
|
|
|
if err != nil && strings.Contains(err.Error(), "no merge base") {
|
|
|
|
// git >= 2.28 now returns an error if startCommitID and endCommitID have become unrelated.
|
|
|
|
// previously it would return the results of git diff --name-only startCommitID endCommitID so let's try that...
|
2022-10-23 14:44:45 +00:00
|
|
|
stdout, _, err = NewCommand(repo.Ctx, "diff", "--name-only").AddDynamicArguments(startCommitID, endCommitID).RunStdString(&RunOpts{Dir: repo.Path})
|
2020-07-29 17:53:04 +00:00
|
|
|
}
|
2016-11-03 22:16:01 +00:00
|
|
|
if err != nil {
|
|
|
|
return 0, err
|
|
|
|
}
|
|
|
|
return len(strings.Split(stdout, "\n")) - 1, nil
|
|
|
|
}
|
|
|
|
|
2021-06-30 17:49:06 +00:00
|
|
|
// CommitsBetween returns a list that contains commits between [before, last).
|
|
|
|
// If before is detached (removed by reset + push) it is not included.
|
2021-12-20 04:41:31 +00:00
|
|
|
func (repo *Repository) CommitsBetween(last, before *Commit) ([]*Commit, error) {
|
2019-12-30 23:34:11 +00:00
|
|
|
var stdout []byte
|
|
|
|
var err error
|
|
|
|
if before == nil {
|
2022-10-23 14:44:45 +00:00
|
|
|
stdout, _, err = NewCommand(repo.Ctx, "rev-list").AddDynamicArguments(last.ID.String()).RunStdBytes(&RunOpts{Dir: repo.Path})
|
2019-12-30 23:34:11 +00:00
|
|
|
} else {
|
2022-10-23 14:44:45 +00:00
|
|
|
stdout, _, err = NewCommand(repo.Ctx, "rev-list").AddDynamicArguments(before.ID.String() + ".." + last.ID.String()).RunStdBytes(&RunOpts{Dir: repo.Path})
|
2020-07-29 17:53:04 +00:00
|
|
|
if err != nil && strings.Contains(err.Error(), "no merge base") {
|
|
|
|
// future versions of git >= 2.28 are likely to return an error if before and last have become unrelated.
|
|
|
|
// previously it would return the results of git rev-list before last so let's try that...
|
2022-10-23 14:44:45 +00:00
|
|
|
stdout, _, err = NewCommand(repo.Ctx, "rev-list").AddDynamicArguments(before.ID.String(), last.ID.String()).RunStdBytes(&RunOpts{Dir: repo.Path})
|
2020-07-29 17:53:04 +00:00
|
|
|
}
|
2019-12-30 23:34:11 +00:00
|
|
|
}
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
return repo.parsePrettyFormatLogToList(bytes.TrimSpace(stdout))
|
|
|
|
}
|
|
|
|
|
2021-06-30 17:49:06 +00:00
|
|
|
// CommitsBetweenLimit returns a list that contains at most limit commits skipping the first skip commits between [before, last)
|
2021-12-20 04:41:31 +00:00
|
|
|
func (repo *Repository) CommitsBetweenLimit(last, before *Commit, limit, skip int) ([]*Commit, error) {
|
2019-12-30 23:34:11 +00:00
|
|
|
var stdout []byte
|
|
|
|
var err error
|
|
|
|
if before == nil {
|
2022-10-23 14:44:45 +00:00
|
|
|
stdout, _, err = NewCommand(repo.Ctx, "rev-list",
|
|
|
|
"--max-count", CmdArg(strconv.Itoa(limit)),
|
|
|
|
"--skip", CmdArg(strconv.Itoa(skip))).
|
|
|
|
AddDynamicArguments(last.ID.String()).RunStdBytes(&RunOpts{Dir: repo.Path})
|
2019-12-30 23:34:11 +00:00
|
|
|
} else {
|
2022-10-23 14:44:45 +00:00
|
|
|
stdout, _, err = NewCommand(repo.Ctx, "rev-list",
|
|
|
|
"--max-count", CmdArg(strconv.Itoa(limit)),
|
|
|
|
"--skip", CmdArg(strconv.Itoa(skip))).
|
|
|
|
AddDynamicArguments(before.ID.String() + ".." + last.ID.String()).RunStdBytes(&RunOpts{Dir: repo.Path})
|
2020-07-29 17:53:04 +00:00
|
|
|
if err != nil && strings.Contains(err.Error(), "no merge base") {
|
|
|
|
// future versions of git >= 2.28 are likely to return an error if before and last have become unrelated.
|
|
|
|
// previously it would return the results of git rev-list --max-count n before last so let's try that...
|
2022-10-23 14:44:45 +00:00
|
|
|
stdout, _, err = NewCommand(repo.Ctx, "rev-list",
|
|
|
|
"--max-count", CmdArg(strconv.Itoa(limit)),
|
|
|
|
"--skip", CmdArg(strconv.Itoa(skip))).
|
|
|
|
AddDynamicArguments(before.ID.String(), last.ID.String()).RunStdBytes(&RunOpts{Dir: repo.Path})
|
2020-07-29 17:53:04 +00:00
|
|
|
}
|
2019-12-30 23:34:11 +00:00
|
|
|
}
|
2017-10-23 13:36:14 +00:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
2016-11-03 22:16:01 +00:00
|
|
|
}
|
2017-10-23 13:36:14 +00:00
|
|
|
return repo.parsePrettyFormatLogToList(bytes.TrimSpace(stdout))
|
2016-11-03 22:16:01 +00:00
|
|
|
}
|
|
|
|
|
2016-12-22 09:30:52 +00:00
|
|
|
// CommitsBetweenIDs return commits between twoe commits
|
2021-08-09 18:08:51 +00:00
|
|
|
func (repo *Repository) CommitsBetweenIDs(last, before string) ([]*Commit, error) {
|
2016-11-03 22:16:01 +00:00
|
|
|
lastCommit, err := repo.GetCommit(last)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
2019-12-30 23:34:11 +00:00
|
|
|
if before == "" {
|
|
|
|
return repo.CommitsBetween(lastCommit, nil)
|
|
|
|
}
|
2016-11-03 22:16:01 +00:00
|
|
|
beforeCommit, err := repo.GetCommit(before)
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
return repo.CommitsBetween(lastCommit, beforeCommit)
|
|
|
|
}
|
|
|
|
|
2016-12-22 09:30:52 +00:00
|
|
|
// CommitsCountBetween return numbers of commits between two commits
|
2016-11-03 22:16:01 +00:00
|
|
|
func (repo *Repository) CommitsCountBetween(start, end string) (int64, error) {
|
2022-01-19 23:26:57 +00:00
|
|
|
count, err := CommitsCountFiles(repo.Ctx, repo.Path, []string{start + ".." + end}, []string{})
|
2020-07-29 17:53:04 +00:00
|
|
|
if err != nil && strings.Contains(err.Error(), "no merge base") {
|
|
|
|
// future versions of git >= 2.28 are likely to return an error if before and last have become unrelated.
|
|
|
|
// previously it would return the results of git rev-list before last so let's try that...
|
2022-01-19 23:26:57 +00:00
|
|
|
return CommitsCountFiles(repo.Ctx, repo.Path, []string{start, end}, []string{})
|
2020-07-29 17:53:04 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return count, err
|
2016-11-03 22:16:01 +00:00
|
|
|
}
|
|
|
|
|
2016-12-22 09:30:52 +00:00
|
|
|
// commitsBefore the limit is depth, not total number of returned commits.
|
2021-08-09 18:08:51 +00:00
|
|
|
func (repo *Repository) commitsBefore(id SHA1, limit int) ([]*Commit, error) {
|
2022-02-06 19:01:47 +00:00
|
|
|
cmd := NewCommand(repo.Ctx, "log")
|
2017-12-11 02:23:34 +00:00
|
|
|
if limit > 0 {
|
2022-10-23 14:44:45 +00:00
|
|
|
cmd.AddArguments(CmdArg("-"+strconv.Itoa(limit)), prettyLogFormat).AddDynamicArguments(id.String())
|
2017-12-11 02:23:34 +00:00
|
|
|
} else {
|
2022-10-23 14:44:45 +00:00
|
|
|
cmd.AddArguments(prettyLogFormat).AddDynamicArguments(id.String())
|
2016-11-03 22:16:01 +00:00
|
|
|
}
|
|
|
|
|
2022-04-01 02:55:30 +00:00
|
|
|
stdout, _, runErr := cmd.RunStdBytes(&RunOpts{Dir: repo.Path})
|
|
|
|
if runErr != nil {
|
|
|
|
return nil, runErr
|
2016-11-03 22:16:01 +00:00
|
|
|
}
|
|
|
|
|
2017-12-11 02:23:34 +00:00
|
|
|
formattedLog, err := repo.parsePrettyFormatLogToList(bytes.TrimSpace(stdout))
|
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
2016-11-03 22:16:01 +00:00
|
|
|
}
|
|
|
|
|
2021-08-09 18:08:51 +00:00
|
|
|
commits := make([]*Commit, 0, len(formattedLog))
|
|
|
|
for _, commit := range formattedLog {
|
2017-12-11 02:23:34 +00:00
|
|
|
branches, err := repo.getBranches(commit, 2)
|
2016-11-03 22:16:01 +00:00
|
|
|
if err != nil {
|
2017-12-11 02:23:34 +00:00
|
|
|
return nil, err
|
2016-11-03 22:16:01 +00:00
|
|
|
}
|
2017-12-11 02:23:34 +00:00
|
|
|
|
|
|
|
if len(branches) > 1 {
|
|
|
|
break
|
2016-11-03 22:16:01 +00:00
|
|
|
}
|
2017-12-11 02:23:34 +00:00
|
|
|
|
2021-08-09 18:08:51 +00:00
|
|
|
commits = append(commits, commit)
|
2016-11-03 22:16:01 +00:00
|
|
|
}
|
|
|
|
|
2017-12-11 02:23:34 +00:00
|
|
|
return commits, nil
|
2016-11-03 22:16:01 +00:00
|
|
|
}
|
|
|
|
|
2021-08-09 18:08:51 +00:00
|
|
|
func (repo *Repository) getCommitsBefore(id SHA1) ([]*Commit, error) {
|
2017-12-11 02:23:34 +00:00
|
|
|
return repo.commitsBefore(id, 0)
|
2016-11-03 22:16:01 +00:00
|
|
|
}
|
|
|
|
|
2021-08-09 18:08:51 +00:00
|
|
|
func (repo *Repository) getCommitsBeforeLimit(id SHA1, num int) ([]*Commit, error) {
|
2017-12-11 02:23:34 +00:00
|
|
|
return repo.commitsBefore(id, num)
|
|
|
|
}
|
|
|
|
|
|
|
|
func (repo *Repository) getBranches(commit *Commit, limit int) ([]string, error) {
|
2020-10-21 15:42:08 +00:00
|
|
|
if CheckGitVersionAtLeast("2.7.0") == nil {
|
2022-10-23 14:44:45 +00:00
|
|
|
stdout, _, err := NewCommand(repo.Ctx, "for-each-ref",
|
|
|
|
CmdArg("--count="+strconv.Itoa(limit)),
|
|
|
|
"--format=%(refname:strip=2)", "--contains").
|
|
|
|
AddDynamicArguments(commit.ID.String(), BranchPrefix).
|
|
|
|
RunStdString(&RunOpts{Dir: repo.Path})
|
2018-05-27 18:47:34 +00:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
branches := strings.Fields(stdout)
|
|
|
|
return branches, nil
|
|
|
|
}
|
|
|
|
|
2022-10-23 14:44:45 +00:00
|
|
|
stdout, _, err := NewCommand(repo.Ctx, "branch", "--contains").AddDynamicArguments(commit.ID.String()).RunStdString(&RunOpts{Dir: repo.Path})
|
2017-12-11 02:23:34 +00:00
|
|
|
if err != nil {
|
|
|
|
return nil, err
|
|
|
|
}
|
|
|
|
|
|
|
|
refs := strings.Split(stdout, "\n")
|
2018-05-27 18:47:34 +00:00
|
|
|
|
|
|
|
var max int
|
|
|
|
if len(refs) > limit {
|
|
|
|
max = limit
|
|
|
|
} else {
|
|
|
|
max = len(refs) - 1
|
|
|
|
}
|
|
|
|
|
|
|
|
branches := make([]string, max)
|
|
|
|
for i, ref := range refs[:max] {
|
|
|
|
parts := strings.Fields(ref)
|
|
|
|
|
|
|
|
branches[i] = parts[len(parts)-1]
|
2017-12-11 02:23:34 +00:00
|
|
|
}
|
|
|
|
return branches, nil
|
2016-11-03 22:16:01 +00:00
|
|
|
}
|
2020-05-20 12:47:24 +00:00
|
|
|
|
|
|
|
// GetCommitsFromIDs get commits from commit IDs
|
2021-08-09 18:08:51 +00:00
|
|
|
func (repo *Repository) GetCommitsFromIDs(commitIDs []string) []*Commit {
|
|
|
|
commits := make([]*Commit, 0, len(commitIDs))
|
2020-05-20 12:47:24 +00:00
|
|
|
|
|
|
|
for _, commitID := range commitIDs {
|
|
|
|
commit, err := repo.GetCommit(commitID)
|
|
|
|
if err == nil && commit != nil {
|
2021-08-09 18:08:51 +00:00
|
|
|
commits = append(commits, commit)
|
2020-05-20 12:47:24 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return commits
|
|
|
|
}
|
2021-03-04 03:41:23 +00:00
|
|
|
|
|
|
|
// IsCommitInBranch check if the commit is on the branch
|
|
|
|
func (repo *Repository) IsCommitInBranch(commitID, branch string) (r bool, err error) {
|
2022-10-23 14:44:45 +00:00
|
|
|
stdout, _, err := NewCommand(repo.Ctx, "branch", "--contains").AddDynamicArguments(commitID, branch).RunStdString(&RunOpts{Dir: repo.Path})
|
2021-03-04 03:41:23 +00:00
|
|
|
if err != nil {
|
|
|
|
return false, err
|
|
|
|
}
|
|
|
|
return len(stdout) > 0, err
|
|
|
|
}
|
2022-07-30 08:09:04 +00:00
|
|
|
|
|
|
|
func (repo *Repository) AddLastCommitCache(cacheKey, fullName, sha string) error {
|
|
|
|
if repo.LastCommitCache == nil {
|
|
|
|
commitsCount, err := cache.GetInt64(cacheKey, func() (int64, error) {
|
|
|
|
commit, err := repo.GetCommit(sha)
|
|
|
|
if err != nil {
|
|
|
|
return 0, err
|
|
|
|
}
|
|
|
|
return commit.CommitsCount()
|
|
|
|
})
|
|
|
|
if err != nil {
|
|
|
|
return err
|
|
|
|
}
|
|
|
|
repo.LastCommitCache = NewLastCommitCache(commitsCount, fullName, repo, cache.GetCache())
|
|
|
|
}
|
|
|
|
return nil
|
|
|
|
}
|