Платформа ЦРНП "Мирокод" для разработки проектов
https://git.mirocod.ru
You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
433 lines
14 KiB
433 lines
14 KiB
// Copyright 2015 The Gogs Authors. All rights reserved. |
|
// Copyright 2019 The Gitea Authors. All rights reserved. |
|
// Use of this source code is governed by a MIT-style |
|
// license that can be found in the LICENSE file. |
|
|
|
package git |
|
|
|
import ( |
|
"bytes" |
|
"io" |
|
"strconv" |
|
"strings" |
|
|
|
"code.gitea.io/gitea/modules/setting" |
|
) |
|
|
|
// GetBranchCommitID returns last commit ID string of given branch. |
|
func (repo *Repository) GetBranchCommitID(name string) (string, error) { |
|
return repo.GetRefCommitID(BranchPrefix + name) |
|
} |
|
|
|
// GetTagCommitID returns last commit ID string of given tag. |
|
func (repo *Repository) GetTagCommitID(name string) (string, error) { |
|
return repo.GetRefCommitID(TagPrefix + name) |
|
} |
|
|
|
// GetCommit returns commit object of by ID string. |
|
func (repo *Repository) GetCommit(commitID string) (*Commit, error) { |
|
id, err := repo.ConvertToSHA1(commitID) |
|
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) |
|
} |
|
|
|
// GetTagCommit get the commit of the specific tag via name |
|
func (repo *Repository) GetTagCommit(name string) (*Commit, error) { |
|
commitID, err := repo.GetTagCommitID(name) |
|
if err != nil { |
|
return nil, err |
|
} |
|
return repo.GetCommit(commitID) |
|
} |
|
|
|
func (repo *Repository) getCommitByPathWithID(id SHA1, relpath string) (*Commit, error) { |
|
// File name starts with ':' must be escaped. |
|
if relpath[0] == ':' { |
|
relpath = `\` + relpath |
|
} |
|
|
|
stdout, err := NewCommandContext(repo.Ctx, "log", "-1", prettyLogFormat, id.String(), "--", relpath).RunInDir(repo.Path) |
|
if err != nil { |
|
return nil, err |
|
} |
|
|
|
id, err = NewIDFromString(stdout) |
|
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) { |
|
stdout, err := NewCommandContext(repo.Ctx, "log", "-1", prettyLogFormat, "--", relpath).RunInDirBytes(repo.Path) |
|
if err != nil { |
|
return nil, err |
|
} |
|
|
|
commits, err := repo.parsePrettyFormatLogToList(stdout) |
|
if err != nil { |
|
return nil, err |
|
} |
|
return commits[0], nil |
|
} |
|
|
|
func (repo *Repository) commitsByRange(id SHA1, page, pageSize int) ([]*Commit, error) { |
|
stdout, err := NewCommandContext(repo.Ctx, "log", id.String(), "--skip="+strconv.Itoa((page-1)*pageSize), |
|
"--max-count="+strconv.Itoa(pageSize), prettyLogFormat).RunInDirBytes(repo.Path) |
|
|
|
if err != nil { |
|
return nil, err |
|
} |
|
return repo.parsePrettyFormatLogToList(stdout) |
|
} |
|
|
|
func (repo *Repository) searchCommits(id SHA1, opts SearchCommitsOptions) ([]*Commit, error) { |
|
// create new git log command with limit of 100 commis |
|
cmd := NewCommandContext(repo.Ctx, "log", id.String(), "-100", prettyLogFormat) |
|
// ignore case |
|
args := []string{"-i"} |
|
|
|
// add authors if present in search query |
|
if len(opts.Authors) > 0 { |
|
for _, v := range opts.Authors { |
|
args = append(args, "--author="+v) |
|
} |
|
} |
|
|
|
// add committers if present in search query |
|
if len(opts.Committers) > 0 { |
|
for _, v := range opts.Committers { |
|
args = append(args, "--committer="+v) |
|
} |
|
} |
|
|
|
// add time constraints if present in search query |
|
if len(opts.After) > 0 { |
|
args = append(args, "--after="+opts.After) |
|
} |
|
if len(opts.Before) > 0 { |
|
args = append(args, "--before="+opts.Before) |
|
} |
|
|
|
// 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 |
|
if opts.All { |
|
cmd.AddArguments("--all") |
|
} |
|
|
|
// add remaining keywords from search string |
|
// note this is done only for command created above |
|
if len(opts.Keywords) > 0 { |
|
for _, v := range opts.Keywords { |
|
cmd.AddArguments("--grep=" + v) |
|
} |
|
} |
|
|
|
// search for commits matching given constraints and keywords in commit msg |
|
cmd.AddArguments(args...) |
|
stdout, err := cmd.RunInDirBytes(repo.Path) |
|
if err != nil { |
|
return nil, err |
|
} |
|
if len(stdout) != 0 { |
|
stdout = append(stdout, '\n') |
|
} |
|
|
|
// if there are any keywords (ie not committer:, author:, time:) |
|
// then let's iterate over them |
|
if len(opts.Keywords) > 0 { |
|
for _, v := range opts.Keywords { |
|
// ignore anything below 4 characters as too unspecific |
|
if len(v) >= 4 { |
|
// create new git log command with 1 commit limit |
|
hashCmd := NewCommandContext(repo.Ctx, "log", "-1", prettyLogFormat) |
|
// add previous arguments except for --grep and --all |
|
hashCmd.AddArguments(args...) |
|
// add keyword as <commit> |
|
hashCmd.AddArguments(v) |
|
|
|
// search with given constraints for commit matching sha hash of v |
|
hashMatching, err := hashCmd.RunInDirBytes(repo.Path) |
|
if err != nil || bytes.Contains(stdout, hashMatching) { |
|
continue |
|
} |
|
stdout = append(stdout, hashMatching...) |
|
stdout = append(stdout, '\n') |
|
} |
|
} |
|
} |
|
|
|
return repo.parsePrettyFormatLogToList(bytes.TrimSuffix(stdout, []byte{'\n'})) |
|
} |
|
|
|
func (repo *Repository) getFilesChanged(id1, id2 string) ([]string, error) { |
|
stdout, err := NewCommandContext(repo.Ctx, "diff", "--name-only", id1, id2).RunInDirBytes(repo.Path) |
|
if err != nil { |
|
return nil, err |
|
} |
|
return strings.Split(string(stdout), "\n"), nil |
|
} |
|
|
|
// FileChangedBetweenCommits Returns true if the file changed between commit IDs id1 and id2 |
|
// You must ensure that id1 and id2 are valid commit ids. |
|
func (repo *Repository) FileChangedBetweenCommits(filename, id1, id2 string) (bool, error) { |
|
stdout, err := NewCommandContext(repo.Ctx, "diff", "--name-only", "-z", id1, id2, "--", filename).RunInDirBytes(repo.Path) |
|
if err != nil { |
|
return false, err |
|
} |
|
return len(strings.TrimSpace(string(stdout))) > 0, nil |
|
} |
|
|
|
// FileCommitsCount return the number of files at a revision |
|
func (repo *Repository) FileCommitsCount(revision, file string) (int64, error) { |
|
return CommitsCountFiles(repo.Path, []string{revision}, []string{file}) |
|
} |
|
|
|
// CommitsByFileAndRange return the commits according revision file and the page |
|
func (repo *Repository) CommitsByFileAndRange(revision, file string, page int) ([]*Commit, error) { |
|
skip := (page - 1) * setting.Git.CommitsRangeSize |
|
|
|
stdoutReader, stdoutWriter := io.Pipe() |
|
defer func() { |
|
_ = stdoutReader.Close() |
|
_ = stdoutWriter.Close() |
|
}() |
|
go func() { |
|
stderr := strings.Builder{} |
|
err := NewCommandContext(repo.Ctx, "log", revision, "--follow", |
|
"--max-count="+strconv.Itoa(setting.Git.CommitsRangeSize*page), |
|
prettyLogFormat, "--", file). |
|
RunInDirPipeline(repo.Path, stdoutWriter, &stderr) |
|
if err != nil { |
|
_ = stdoutWriter.CloseWithError(ConcatenateError(err, (&stderr).String())) |
|
} else { |
|
_ = stdoutWriter.Close() |
|
} |
|
}() |
|
|
|
if skip > 0 { |
|
_, err := io.CopyN(io.Discard, stdoutReader, int64(skip*41)) |
|
if err != nil { |
|
if err == io.EOF { |
|
return []*Commit{}, nil |
|
} |
|
_ = stdoutReader.CloseWithError(err) |
|
return nil, err |
|
} |
|
} |
|
|
|
stdout, err := io.ReadAll(stdoutReader) |
|
if err != nil { |
|
return nil, err |
|
} |
|
return repo.parsePrettyFormatLogToList(stdout) |
|
} |
|
|
|
// CommitsByFileAndRangeNoFollow return the commits according revision file and the page |
|
func (repo *Repository) CommitsByFileAndRangeNoFollow(revision, file string, page int) ([]*Commit, error) { |
|
stdout, err := NewCommandContext(repo.Ctx, "log", revision, "--skip="+strconv.Itoa((page-1)*50), |
|
"--max-count="+strconv.Itoa(setting.Git.CommitsRangeSize), prettyLogFormat, "--", file).RunInDirBytes(repo.Path) |
|
if err != nil { |
|
return nil, err |
|
} |
|
return repo.parsePrettyFormatLogToList(stdout) |
|
} |
|
|
|
// FilesCountBetween return the number of files changed between two commits |
|
func (repo *Repository) FilesCountBetween(startCommitID, endCommitID string) (int, error) { |
|
stdout, err := NewCommandContext(repo.Ctx, "diff", "--name-only", startCommitID+"..."+endCommitID).RunInDir(repo.Path) |
|
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... |
|
stdout, err = NewCommandContext(repo.Ctx, "diff", "--name-only", startCommitID, endCommitID).RunInDir(repo.Path) |
|
} |
|
if err != nil { |
|
return 0, err |
|
} |
|
return len(strings.Split(stdout, "\n")) - 1, nil |
|
} |
|
|
|
// CommitsBetween returns a list that contains commits between [before, last). |
|
// If before is detached (removed by reset + push) it is not included. |
|
func (repo *Repository) CommitsBetween(last, before *Commit) ([]*Commit, error) { |
|
var stdout []byte |
|
var err error |
|
if before == nil { |
|
stdout, err = NewCommandContext(repo.Ctx, "rev-list", last.ID.String()).RunInDirBytes(repo.Path) |
|
} else { |
|
stdout, err = NewCommandContext(repo.Ctx, "rev-list", before.ID.String()+".."+last.ID.String()).RunInDirBytes(repo.Path) |
|
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... |
|
stdout, err = NewCommandContext(repo.Ctx, "rev-list", before.ID.String(), last.ID.String()).RunInDirBytes(repo.Path) |
|
} |
|
} |
|
if err != nil { |
|
return nil, err |
|
} |
|
return repo.parsePrettyFormatLogToList(bytes.TrimSpace(stdout)) |
|
} |
|
|
|
// CommitsBetweenLimit returns a list that contains at most limit commits skipping the first skip commits between [before, last) |
|
func (repo *Repository) CommitsBetweenLimit(last, before *Commit, limit, skip int) ([]*Commit, error) { |
|
var stdout []byte |
|
var err error |
|
if before == nil { |
|
stdout, err = NewCommandContext(repo.Ctx, "rev-list", "--max-count", strconv.Itoa(limit), "--skip", strconv.Itoa(skip), last.ID.String()).RunInDirBytes(repo.Path) |
|
} else { |
|
stdout, err = NewCommandContext(repo.Ctx, "rev-list", "--max-count", strconv.Itoa(limit), "--skip", strconv.Itoa(skip), before.ID.String()+".."+last.ID.String()).RunInDirBytes(repo.Path) |
|
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... |
|
stdout, err = NewCommandContext(repo.Ctx, "rev-list", "--max-count", strconv.Itoa(limit), "--skip", strconv.Itoa(skip), before.ID.String(), last.ID.String()).RunInDirBytes(repo.Path) |
|
} |
|
} |
|
if err != nil { |
|
return nil, err |
|
} |
|
return repo.parsePrettyFormatLogToList(bytes.TrimSpace(stdout)) |
|
} |
|
|
|
// CommitsBetweenIDs return commits between twoe commits |
|
func (repo *Repository) CommitsBetweenIDs(last, before string) ([]*Commit, error) { |
|
lastCommit, err := repo.GetCommit(last) |
|
if err != nil { |
|
return nil, err |
|
} |
|
if before == "" { |
|
return repo.CommitsBetween(lastCommit, nil) |
|
} |
|
beforeCommit, err := repo.GetCommit(before) |
|
if err != nil { |
|
return nil, err |
|
} |
|
return repo.CommitsBetween(lastCommit, beforeCommit) |
|
} |
|
|
|
// CommitsCountBetween return numbers of commits between two commits |
|
func (repo *Repository) CommitsCountBetween(start, end string) (int64, error) { |
|
count, err := CommitsCountFiles(repo.Path, []string{start + ".." + end}, []string{}) |
|
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... |
|
return CommitsCountFiles(repo.Path, []string{start, end}, []string{}) |
|
} |
|
|
|
return count, err |
|
} |
|
|
|
// commitsBefore the limit is depth, not total number of returned commits. |
|
func (repo *Repository) commitsBefore(id SHA1, limit int) ([]*Commit, error) { |
|
cmd := NewCommandContext(repo.Ctx, "log") |
|
if limit > 0 { |
|
cmd.AddArguments("-"+strconv.Itoa(limit), prettyLogFormat, id.String()) |
|
} else { |
|
cmd.AddArguments(prettyLogFormat, id.String()) |
|
} |
|
|
|
stdout, err := cmd.RunInDirBytes(repo.Path) |
|
if err != nil { |
|
return nil, err |
|
} |
|
|
|
formattedLog, err := repo.parsePrettyFormatLogToList(bytes.TrimSpace(stdout)) |
|
if err != nil { |
|
return nil, err |
|
} |
|
|
|
commits := make([]*Commit, 0, len(formattedLog)) |
|
for _, commit := range formattedLog { |
|
branches, err := repo.getBranches(commit, 2) |
|
if err != nil { |
|
return nil, err |
|
} |
|
|
|
if len(branches) > 1 { |
|
break |
|
} |
|
|
|
commits = append(commits, commit) |
|
} |
|
|
|
return commits, nil |
|
} |
|
|
|
func (repo *Repository) getCommitsBefore(id SHA1) ([]*Commit, error) { |
|
return repo.commitsBefore(id, 0) |
|
} |
|
|
|
func (repo *Repository) getCommitsBeforeLimit(id SHA1, num int) ([]*Commit, error) { |
|
return repo.commitsBefore(id, num) |
|
} |
|
|
|
func (repo *Repository) getBranches(commit *Commit, limit int) ([]string, error) { |
|
if CheckGitVersionAtLeast("2.7.0") == nil { |
|
stdout, err := NewCommandContext(repo.Ctx, "for-each-ref", "--count="+strconv.Itoa(limit), "--format=%(refname:strip=2)", "--contains", commit.ID.String(), BranchPrefix).RunInDir(repo.Path) |
|
if err != nil { |
|
return nil, err |
|
} |
|
|
|
branches := strings.Fields(stdout) |
|
return branches, nil |
|
} |
|
|
|
stdout, err := NewCommandContext(repo.Ctx, "branch", "--contains", commit.ID.String()).RunInDir(repo.Path) |
|
if err != nil { |
|
return nil, err |
|
} |
|
|
|
refs := strings.Split(stdout, "\n") |
|
|
|
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] |
|
} |
|
return branches, nil |
|
} |
|
|
|
// GetCommitsFromIDs get commits from commit IDs |
|
func (repo *Repository) GetCommitsFromIDs(commitIDs []string) []*Commit { |
|
commits := make([]*Commit, 0, len(commitIDs)) |
|
|
|
for _, commitID := range commitIDs { |
|
commit, err := repo.GetCommit(commitID) |
|
if err == nil && commit != nil { |
|
commits = append(commits, commit) |
|
} |
|
} |
|
|
|
return commits |
|
} |
|
|
|
// IsCommitInBranch check if the commit is on the branch |
|
func (repo *Repository) IsCommitInBranch(commitID, branch string) (r bool, err error) { |
|
stdout, err := NewCommandContext(repo.Ctx, "branch", "--contains", commitID, branch).RunInDir(repo.Path) |
|
if err != nil { |
|
return false, err |
|
} |
|
return len(stdout) > 0, err |
|
}
|
|
|