mirror of
				https://gitee.com/gitea/gitea
				synced 2025-11-04 08:30:25 +08:00 
			
		
		
		
	Remove local clones & make hooks run on merge/edit/upload (#6672)
* 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
This commit is contained in:
		@@ -11,17 +11,15 @@ import (
 | 
			
		||||
	"io"
 | 
			
		||||
	"os"
 | 
			
		||||
	"os/exec"
 | 
			
		||||
	"path"
 | 
			
		||||
	"regexp"
 | 
			
		||||
	"strings"
 | 
			
		||||
	"time"
 | 
			
		||||
 | 
			
		||||
	"code.gitea.io/gitea/models"
 | 
			
		||||
	"code.gitea.io/gitea/modules/git"
 | 
			
		||||
	"code.gitea.io/gitea/modules/log"
 | 
			
		||||
	"code.gitea.io/gitea/modules/process"
 | 
			
		||||
	"code.gitea.io/gitea/modules/setting"
 | 
			
		||||
 | 
			
		||||
	"github.com/Unknwon/com"
 | 
			
		||||
)
 | 
			
		||||
 | 
			
		||||
// TemporaryUploadRepository is a type to wrap our upload repositories as a shallow clone
 | 
			
		||||
@@ -33,13 +31,9 @@ type TemporaryUploadRepository struct {
 | 
			
		||||
 | 
			
		||||
// NewTemporaryUploadRepository creates a new temporary upload repository
 | 
			
		||||
func NewTemporaryUploadRepository(repo *models.Repository) (*TemporaryUploadRepository, error) {
 | 
			
		||||
	timeStr := com.ToStr(time.Now().Nanosecond()) // SHOULD USE SOMETHING UNIQUE
 | 
			
		||||
	basePath := path.Join(models.LocalCopyPath(), "upload-"+timeStr+".git")
 | 
			
		||||
	if err := os.MkdirAll(path.Dir(basePath), os.ModePerm); err != nil {
 | 
			
		||||
		return nil, fmt.Errorf("failed to create dir %s: %v", basePath, err)
 | 
			
		||||
	}
 | 
			
		||||
	if repo.RepoPath() == "" {
 | 
			
		||||
		return nil, fmt.Errorf("no path to repository on system")
 | 
			
		||||
	basePath, err := models.CreateTemporaryPath("upload")
 | 
			
		||||
	if err != nil {
 | 
			
		||||
		return nil, err
 | 
			
		||||
	}
 | 
			
		||||
	t := &TemporaryUploadRepository{repo: repo, basePath: basePath}
 | 
			
		||||
	return t, nil
 | 
			
		||||
@@ -47,8 +41,8 @@ func NewTemporaryUploadRepository(repo *models.Repository) (*TemporaryUploadRepo
 | 
			
		||||
 | 
			
		||||
// Close the repository cleaning up all files
 | 
			
		||||
func (t *TemporaryUploadRepository) Close() {
 | 
			
		||||
	if _, err := os.Stat(t.basePath); !os.IsNotExist(err) {
 | 
			
		||||
		os.RemoveAll(t.basePath)
 | 
			
		||||
	if err := models.RemoveTemporaryPath(t.basePath); err != nil {
 | 
			
		||||
		log.Error("Failed to remove temporary path %s: %v", t.basePath, err)
 | 
			
		||||
	}
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
@@ -282,27 +276,8 @@ func (t *TemporaryUploadRepository) CommitTree(author, committer *models.User, t
 | 
			
		||||
 | 
			
		||||
// Push the provided commitHash to the repository branch by the provided user
 | 
			
		||||
func (t *TemporaryUploadRepository) Push(doer *models.User, commitHash string, branch string) error {
 | 
			
		||||
	isWiki := "false"
 | 
			
		||||
	if strings.HasSuffix(t.repo.Name, ".wiki") {
 | 
			
		||||
		isWiki = "true"
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	sig := doer.NewGitSig()
 | 
			
		||||
 | 
			
		||||
	// FIXME: Should we add SSH_ORIGINAL_COMMAND to this
 | 
			
		||||
	// Because calls hooks we need to pass in the environment
 | 
			
		||||
	env := append(os.Environ(),
 | 
			
		||||
		"GIT_AUTHOR_NAME="+sig.Name,
 | 
			
		||||
		"GIT_AUTHOR_EMAIL="+sig.Email,
 | 
			
		||||
		"GIT_COMMITTER_NAME="+sig.Name,
 | 
			
		||||
		"GIT_COMMITTER_EMAIL="+sig.Email,
 | 
			
		||||
		models.EnvRepoName+"="+t.repo.Name,
 | 
			
		||||
		models.EnvRepoUsername+"="+t.repo.OwnerName,
 | 
			
		||||
		models.EnvRepoIsWiki+"="+isWiki,
 | 
			
		||||
		models.EnvPusherName+"="+doer.Name,
 | 
			
		||||
		models.EnvPusherID+"="+fmt.Sprintf("%d", doer.ID),
 | 
			
		||||
		models.ProtectedBranchRepoID+"="+fmt.Sprintf("%d", t.repo.ID),
 | 
			
		||||
	)
 | 
			
		||||
	env := models.PushingEnvironment(doer, t.repo)
 | 
			
		||||
 | 
			
		||||
	if _, stderr, err := process.GetManager().ExecDirEnv(5*time.Minute,
 | 
			
		||||
		t.basePath,
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user