forked from NYANDEV/forgejo
ce8de35334
* Add options to git.Clone to make it more capable * Begin the process of removing the local copy and tidy up * Remove Wiki LocalCopy Checkouts * Remove the last LocalRepo helpers * Remove WithTemporaryFile * Enable push-hooks for these routes * Ensure tests cope with hooks Signed-off-by: Andrew Thornton <art27@cantab.net> * Remove Repository.LocalCopyPath() * Move temporary repo to use the standard temporary path * Fix the tests Signed-off-by: Andrew Thornton <art27@cantab.net> * Remove LocalWikiPath * Fix missing remove Signed-off-by: Andrew Thornton <art27@cantab.net> * Use AppURL for Oauth user link (#6894) * Use AppURL for Oauth user link Fix #6843 * Update oauth.go * Update oauth.go * internal/ssh: ignore env command totally (#6825) * ssh: ignore env command totally * Remove commented code Needed fix described in issue #6889 * Escape the commit message on issues update and title in telegram hook (#6901) * update sdk to latest (#6903) * improve description of branch protection (fix #6886) (#6906) The branch protection description text were not quite accurate. * Fix logging documentation (#6904) * ENABLE_MACARON_REDIRECT should be REDIRECT_MACARON_LOG * Allow DISABLE_ROUTER_LOG to be set in the [log] section * [skip ci] Updated translations via Crowdin * Move sdk structs to modules/structs (#6905) * move sdk structs to moduels/structs * fix tests * fix fmt * fix swagger * fix vendor
99 lines
2.3 KiB
Go
99 lines
2.3 KiB
Go
// 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 (
|
|
"fmt"
|
|
"os"
|
|
"strings"
|
|
"time"
|
|
|
|
"gopkg.in/src-d/go-git.v4/plumbing"
|
|
)
|
|
|
|
func (repo *Repository) getTree(id SHA1) (*Tree, error) {
|
|
gogitTree, err := repo.gogitRepo.TreeObject(plumbing.Hash(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", 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(plumbing.Hash(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
|
|
}
|
|
|
|
// 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) {
|
|
commitTimeStr := time.Now().Format(time.UnixDate)
|
|
|
|
// 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)
|
|
}
|
|
|
|
cmd.AddArguments("-m", opts.Message)
|
|
|
|
if opts.KeyID != "" {
|
|
cmd.AddArguments(fmt.Sprintf("-S%s", opts.KeyID))
|
|
}
|
|
|
|
if opts.NoGPGSign {
|
|
cmd.AddArguments("--no-gpg-sign")
|
|
}
|
|
|
|
res, err := cmd.RunInDirWithEnv(repo.Path, env)
|
|
|
|
if err != nil {
|
|
return SHA1{}, err
|
|
}
|
|
return NewIDFromString(strings.TrimSpace(res))
|
|
}
|