From 511f6138d4b5b7a464a8fa3d7f8fc52bec3789a4 Mon Sep 17 00:00:00 2001 From: zeripath Date: Thu, 17 Dec 2020 14:00:47 +0000 Subject: Use native git variants by default with go-git variants as build tag (#13673) * Move last commit cache back into modules/git Signed-off-by: Andrew Thornton * Remove go-git from the interface for last commit cache Signed-off-by: Andrew Thornton * move cacheref to last_commit_cache Signed-off-by: Andrew Thornton * Remove go-git from routers/private/hook Signed-off-by: Andrew Thornton * Move FindLFSFiles to pipeline Signed-off-by: Andrew Thornton * Make no-go-git variants Signed-off-by: Andrew Thornton * Submodule RefID Signed-off-by: Andrew Thornton * fix issue with GetCommitsInfo Signed-off-by: Andrew Thornton * fix GetLastCommitForPaths Signed-off-by: Andrew Thornton * Improve efficiency Signed-off-by: Andrew Thornton * More efficiency Signed-off-by: Andrew Thornton * even faster Signed-off-by: Andrew Thornton * Reduce duplication * As per @lunny Signed-off-by: Andrew Thornton * attempt to fix drone Signed-off-by: Andrew Thornton * fix test-tags Signed-off-by: Andrew Thornton * default to use no-go-git variants and add gogit build tag Signed-off-by: Andrew Thornton * placate lint Signed-off-by: Andrew Thornton * as per @6543 Signed-off-by: Andrew Thornton Co-authored-by: 6543 <6543@obermui.de> Co-authored-by: techknowlogick --- modules/git/repo_commit_nogogit.go | 109 +++++++++++++++++++++++++++++++++++++ 1 file changed, 109 insertions(+) create mode 100644 modules/git/repo_commit_nogogit.go (limited to 'modules/git/repo_commit_nogogit.go') diff --git a/modules/git/repo_commit_nogogit.go b/modules/git/repo_commit_nogogit.go new file mode 100644 index 0000000000..a43fe4b334 --- /dev/null +++ b/modules/git/repo_commit_nogogit.go @@ -0,0 +1,109 @@ +// Copyright 2020 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. + +// +build !gogit + +package git + +import ( + "bufio" + "fmt" + "io" + "io/ioutil" + "strings" +) + +// ResolveReference resolves a name to a reference +func (repo *Repository) ResolveReference(name string) (string, error) { + stdout, err := NewCommand("show-ref", "--hash", name).RunInDir(repo.Path) + if err != nil { + if strings.Contains(err.Error(), "not a valid ref") { + return "", ErrNotExist{name, ""} + } + return "", err + } + stdout = strings.TrimSpace(stdout) + if stdout == "" { + return "", ErrNotExist{name, ""} + } + + return stdout, nil +} + +// GetRefCommitID returns the last commit ID string of given reference (branch or tag). +func (repo *Repository) GetRefCommitID(name string) (string, error) { + stdout, err := NewCommand("show-ref", "--verify", "--hash", name).RunInDir(repo.Path) + if err != nil { + if strings.Contains(err.Error(), "not a valid ref") { + return "", ErrNotExist{name, ""} + } + return "", err + } + + return strings.TrimSpace(stdout), nil +} + +// IsCommitExist returns true if given commit exists in current repository. +func (repo *Repository) IsCommitExist(name string) bool { + _, err := NewCommand("cat-file", "-e", name).RunInDir(repo.Path) + return err == nil +} + +func (repo *Repository) getCommit(id SHA1) (*Commit, error) { + stdoutReader, stdoutWriter := io.Pipe() + defer func() { + _ = stdoutReader.Close() + _ = stdoutWriter.Close() + }() + + go func() { + stderr := strings.Builder{} + err := NewCommand("cat-file", "--batch").RunInDirFullPipeline(repo.Path, stdoutWriter, &stderr, strings.NewReader(id.String()+"\n")) + if err != nil { + _ = stdoutWriter.CloseWithError(ConcatenateError(err, (&stderr).String())) + } else { + _ = stdoutWriter.Close() + } + }() + + bufReader := bufio.NewReader(stdoutReader) + _, typ, size, err := ReadBatchLine(bufReader) + if err != nil { + return nil, err + } + + switch typ { + case "tag": + // then we need to parse the tag + // and load the commit + data, err := ioutil.ReadAll(io.LimitReader(bufReader, size)) + if err != nil { + return nil, err + } + tag, err := parseTagData(data) + if err != nil { + return nil, err + } + tag.repo = repo + + commit, err := tag.Commit() + if err != nil { + return nil, err + } + + commit.CommitMessage = strings.TrimSpace(tag.Message) + commit.Author = tag.Tagger + commit.Signature = tag.Signature + + return commit, nil + case "commit": + return CommitFromReader(repo, id, io.LimitReader(bufReader, size)) + default: + _ = stdoutReader.CloseWithError(fmt.Errorf("unknown typ: %s", typ)) + log("Unknown typ: %s", typ) + return nil, ErrNotExist{ + ID: id.String(), + } + } +} -- cgit v1.2.3