Платформа ЦРНП "Мирокод" для разработки проектов
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.
110 lines
2.7 KiB
110 lines
2.7 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" |
|
"fmt" |
|
"os" |
|
"strings" |
|
"time" |
|
|
|
"github.com/mcuadros/go-version" |
|
) |
|
|
|
func (repo *Repository) getTree(id SHA1) (*Tree, error) { |
|
gogitTree, err := repo.gogitRepo.TreeObject(id) |
|
if err != nil { |
|
return nil, err |
|
} |
|
|
|
tree := NewTree(repo, id) |
|
tree.gogitTree = gogitTree |
|
return tree, nil |
|
} |
|
|
|
// GetTree find the tree object in the repository. |
|
func (repo *Repository) GetTree(idStr string) (*Tree, error) { |
|
if len(idStr) != 40 { |
|
res, err := NewCommand("rev-parse", "--verify", idStr).RunInDir(repo.Path) |
|
if err != nil { |
|
return nil, err |
|
} |
|
if len(res) > 0 { |
|
idStr = res[:len(res)-1] |
|
} |
|
} |
|
id, err := NewIDFromString(idStr) |
|
if err != nil { |
|
return nil, err |
|
} |
|
resolvedID := id |
|
commitObject, err := repo.gogitRepo.CommitObject(id) |
|
if err == nil { |
|
id = SHA1(commitObject.TreeHash) |
|
} |
|
treeObject, err := repo.getTree(id) |
|
if err != nil { |
|
return nil, err |
|
} |
|
treeObject.ResolvedID = resolvedID |
|
return treeObject, nil |
|
} |
|
|
|
// CommitTreeOpts represents the possible options to CommitTree |
|
type CommitTreeOpts struct { |
|
Parents []string |
|
Message string |
|
KeyID string |
|
NoGPGSign bool |
|
AlwaysSign bool |
|
} |
|
|
|
// CommitTree creates a commit from a given tree id for the user with provided message |
|
func (repo *Repository) CommitTree(sig *Signature, tree *Tree, opts CommitTreeOpts) (SHA1, error) { |
|
binVersion, err := BinVersion() |
|
if err != nil { |
|
return SHA1{}, err |
|
} |
|
|
|
commitTimeStr := time.Now().Format(time.RFC3339) |
|
|
|
// Because this may call hooks we should pass in the environment |
|
env := append(os.Environ(), |
|
"GIT_AUTHOR_NAME="+sig.Name, |
|
"GIT_AUTHOR_EMAIL="+sig.Email, |
|
"GIT_AUTHOR_DATE="+commitTimeStr, |
|
"GIT_COMMITTER_NAME="+sig.Name, |
|
"GIT_COMMITTER_EMAIL="+sig.Email, |
|
"GIT_COMMITTER_DATE="+commitTimeStr, |
|
) |
|
cmd := NewCommand("commit-tree", tree.ID.String()) |
|
|
|
for _, parent := range opts.Parents { |
|
cmd.AddArguments("-p", parent) |
|
} |
|
|
|
messageBytes := new(bytes.Buffer) |
|
_, _ = messageBytes.WriteString(opts.Message) |
|
_, _ = messageBytes.WriteString("\n") |
|
|
|
if version.Compare(binVersion, "1.7.9", ">=") && (opts.KeyID != "" || opts.AlwaysSign) { |
|
cmd.AddArguments(fmt.Sprintf("-S%s", opts.KeyID)) |
|
} |
|
|
|
if version.Compare(binVersion, "2.0.0", ">=") && opts.NoGPGSign { |
|
cmd.AddArguments("--no-gpg-sign") |
|
} |
|
|
|
stdout := new(bytes.Buffer) |
|
stderr := new(bytes.Buffer) |
|
err = cmd.RunInDirTimeoutEnvFullPipeline(env, -1, repo.Path, stdout, stderr, messageBytes) |
|
|
|
if err != nil { |
|
return SHA1{}, concatenateError(err, stderr.String()) |
|
} |
|
return NewIDFromString(strings.TrimSpace(stdout.String())) |
|
}
|
|
|