mirror of
https://github.com/go-gitea/gitea.git
synced 2024-12-22 07:57:29 +01:00
4eb2a29910
The 4 functions are duplicated, especially as interface methods. I think we just need to keep `MustID` the only one and remove other 3. ``` MustID(b []byte) ObjectID MustIDFromString(s string) ObjectID NewID(b []byte) (ObjectID, error) NewIDFromString(s string) (ObjectID, error) ``` Introduced the new interfrace method `ComputeHash` which will replace the interface `HasherInterface`. Now we don't need to keep two interfaces. Reintroduced `git.NewIDFromString` and `git.MustIDFromString`. The new function will detect the hash length to decide which objectformat of it. If it's 40, then it's SHA1. If it's 64, then it's SHA256. This will be right if the commitID is a full one. So the parameter should be always a full commit id. @AdamMajer Please review.
68 lines
1.7 KiB
Go
68 lines
1.7 KiB
Go
// Copyright 2015 The Gogs Authors. All rights reserved.
|
|
// Copyright 2019 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package git
|
|
|
|
import (
|
|
"bytes"
|
|
"os"
|
|
"strings"
|
|
"time"
|
|
)
|
|
|
|
// 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(author, committer *Signature, tree *Tree, opts CommitTreeOpts) (ObjectID, error) {
|
|
commitTimeStr := time.Now().Format(time.RFC3339)
|
|
|
|
// Because this may call hooks we should pass in the environment
|
|
env := append(os.Environ(),
|
|
"GIT_AUTHOR_NAME="+author.Name,
|
|
"GIT_AUTHOR_EMAIL="+author.Email,
|
|
"GIT_AUTHOR_DATE="+commitTimeStr,
|
|
"GIT_COMMITTER_NAME="+committer.Name,
|
|
"GIT_COMMITTER_EMAIL="+committer.Email,
|
|
"GIT_COMMITTER_DATE="+commitTimeStr,
|
|
)
|
|
cmd := NewCommand(repo.Ctx, "commit-tree").AddDynamicArguments(tree.ID.String())
|
|
|
|
for _, parent := range opts.Parents {
|
|
cmd.AddArguments("-p").AddDynamicArguments(parent)
|
|
}
|
|
|
|
messageBytes := new(bytes.Buffer)
|
|
_, _ = messageBytes.WriteString(opts.Message)
|
|
_, _ = messageBytes.WriteString("\n")
|
|
|
|
if opts.KeyID != "" || opts.AlwaysSign {
|
|
cmd.AddOptionFormat("-S%s", opts.KeyID)
|
|
}
|
|
|
|
if opts.NoGPGSign {
|
|
cmd.AddArguments("--no-gpg-sign")
|
|
}
|
|
|
|
stdout := new(bytes.Buffer)
|
|
stderr := new(bytes.Buffer)
|
|
err := cmd.Run(&RunOpts{
|
|
Env: env,
|
|
Dir: repo.Path,
|
|
Stdin: messageBytes,
|
|
Stdout: stdout,
|
|
Stderr: stderr,
|
|
})
|
|
if err != nil {
|
|
return nil, ConcatenateError(err, stderr.String())
|
|
}
|
|
return NewIDFromString(strings.TrimSpace(stdout.String()))
|
|
}
|