Enable a way to checkout Pull Requests from remote refs
This commit is contained in:
parent
6e03f61617
commit
20403f75fb
4 changed files with 159 additions and 0 deletions
100
cmd/pull.go
Normal file
100
cmd/pull.go
Normal file
|
@ -0,0 +1,100 @@
|
||||||
|
// Copyright 2015 The Gogs 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 cmd
|
||||||
|
|
||||||
|
import (
|
||||||
|
"bufio"
|
||||||
|
"log"
|
||||||
|
"os"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
|
||||||
|
"github.com/codegangsta/cli"
|
||||||
|
"github.com/gogits/git-module"
|
||||||
|
"github.com/gogits/gogs/models"
|
||||||
|
)
|
||||||
|
|
||||||
|
var CmdPull = cli.Command{
|
||||||
|
Name: "pull",
|
||||||
|
Usage: "Filter commits for Pull Request actions",
|
||||||
|
Description: `Checks commits for potential pull request updates and takes appropriate actions.`,
|
||||||
|
Action: runPull,
|
||||||
|
Flags: []cli.Flag{
|
||||||
|
stringFlag("path, p", "", "repository path"),
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
func runPull(ctx *cli.Context) {
|
||||||
|
setup("pull.log")
|
||||||
|
|
||||||
|
if !ctx.IsSet("path") {
|
||||||
|
log.Fatal("Missing argument --path")
|
||||||
|
}
|
||||||
|
|
||||||
|
workingDirectory := ctx.String("path")
|
||||||
|
|
||||||
|
// Scan standard input (stdin) for updated refs
|
||||||
|
stdin := bufio.NewScanner(os.Stdin)
|
||||||
|
for stdin.Scan() {
|
||||||
|
// Format from post-receive is: <old-commit> <new-commit> <ref-name>
|
||||||
|
args := strings.Split(stdin.Text(), " ")
|
||||||
|
if len(args) < 3 {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
refName := args[2]
|
||||||
|
refSplits := strings.Split(refName, "/")
|
||||||
|
|
||||||
|
if len(refSplits) < 3 {
|
||||||
|
log.Fatal("Not enough elements in refs element.")
|
||||||
|
}
|
||||||
|
|
||||||
|
// if refSplits[1] == "pull" {
|
||||||
|
// log.Fatal("Not allowed to push to \"pull\" refs. Reserved for Pull Requests.")
|
||||||
|
// } else
|
||||||
|
if refSplits[1] != "heads" {
|
||||||
|
// Only push branches of ref "heads"
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
branch := strings.Join(refSplits[2:], "/")
|
||||||
|
|
||||||
|
repoPathSplits := strings.Split(workingDirectory, string(os.PathSeparator))
|
||||||
|
userName := repoPathSplits[len(repoPathSplits)-2]
|
||||||
|
repoName := repoPathSplits[len(repoPathSplits)-1]
|
||||||
|
repoName = repoName[0 : len(repoName)-4]
|
||||||
|
|
||||||
|
pr, err := models.GetUnmergedPullRequestByRepoPathAndHeadBranch(userName, repoName, branch)
|
||||||
|
if _, ok := err.(models.ErrPullRequestNotExist); ok {
|
||||||
|
// Nothing to do here if the branch has no Pull Request open
|
||||||
|
log.Printf("Skipping for %s/%s.git branch '%s'", userName, repoName, branch)
|
||||||
|
continue
|
||||||
|
} else if err != nil {
|
||||||
|
log.Fatal("Database operation failed: " + err.Error())
|
||||||
|
}
|
||||||
|
|
||||||
|
err = pr.BaseRepo.GetOwner()
|
||||||
|
if err != nil {
|
||||||
|
log.Fatal("Could not get owner data: " + err.Error())
|
||||||
|
}
|
||||||
|
|
||||||
|
prIdStr := strconv.FormatInt(pr.ID, 10)
|
||||||
|
tmpRemoteName := "tmp-pull-" + branch + "-" + prIdStr
|
||||||
|
remoteUrl := "../../" + pr.BaseRepo.Owner.LowerName + "/" + pr.BaseRepo.LowerName + ".git"
|
||||||
|
repo, err := git.OpenRepository(workingDirectory)
|
||||||
|
repo.AddRemote(tmpRemoteName, remoteUrl, false)
|
||||||
|
|
||||||
|
err = git.Push(workingDirectory, tmpRemoteName, branch+":"+"refs/pull/"+prIdStr+"/head")
|
||||||
|
if err != nil {
|
||||||
|
log.Fatal("Error pushing: " + err.Error())
|
||||||
|
}
|
||||||
|
|
||||||
|
err = repo.RemoveRemote(tmpRemoteName)
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
log.Fatal("Error deleting temporary remote: " + err.Error())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
1
gogs.go
1
gogs.go
|
@ -35,6 +35,7 @@ func main() {
|
||||||
cmd.CmdUpdate,
|
cmd.CmdUpdate,
|
||||||
cmd.CmdDump,
|
cmd.CmdDump,
|
||||||
cmd.CmdCert,
|
cmd.CmdCert,
|
||||||
|
cmd.CmdPull,
|
||||||
}
|
}
|
||||||
app.Flags = append(app.Flags, []cli.Flag{}...)
|
app.Flags = append(app.Flags, []cli.Flag{}...)
|
||||||
app.Run(os.Args)
|
app.Run(os.Args)
|
||||||
|
|
|
@ -5,6 +5,7 @@
|
||||||
package models
|
package models
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"os"
|
"os"
|
||||||
"path"
|
"path"
|
||||||
|
@ -395,6 +396,44 @@ func GetUnmergedPullRequestsByBaseInfo(repoID int64, branch string) ([]*PullRequ
|
||||||
Join("INNER", "issue", "issue.id=pull_request.issue_id").Find(&prs)
|
Join("INNER", "issue", "issue.id=pull_request.issue_id").Find(&prs)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Gets a Pull Request by the path of the forked repo and the branch from where the PR
|
||||||
|
// got submitted.
|
||||||
|
func GetUnmergedPullRequestByRepoPathAndHeadBranch(user, repo, branch string) (*PullRequest, error) {
|
||||||
|
userLower := strings.ToLower(user)
|
||||||
|
repoLower := strings.ToLower(repo)
|
||||||
|
|
||||||
|
pr := new(PullRequest)
|
||||||
|
if x == nil {
|
||||||
|
return nil, errors.New("Fail")
|
||||||
|
}
|
||||||
|
has, err := x.
|
||||||
|
Where("head_user_name=? AND head_branch=? AND has_merged=? AND issue.is_closed=? AND repository.lower_name=?", userLower, branch, 0, 0, repoLower).
|
||||||
|
Join("INNER", "repository", "repository.id=pull_request.head_repo_id").
|
||||||
|
Join("INNER", "issue", "issue.id=pull_request.issue_id").
|
||||||
|
Get(pr)
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
} else if !has {
|
||||||
|
return nil, ErrPullRequestNotExist{0, 0, 0, 0, branch, ""}
|
||||||
|
}
|
||||||
|
|
||||||
|
baseRepo := new(Repository)
|
||||||
|
has, err = x.Where("repository.id=?", pr.BaseRepoID).
|
||||||
|
Join("LEFT", "user", "user.id=repository.owner_id").
|
||||||
|
Get(baseRepo)
|
||||||
|
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
} else if !has {
|
||||||
|
return nil, ErrRepoNotExist{pr.BaseRepoID, 0, ""}
|
||||||
|
}
|
||||||
|
|
||||||
|
pr.BaseRepo = baseRepo
|
||||||
|
|
||||||
|
return pr, nil
|
||||||
|
}
|
||||||
|
|
||||||
// GetPullRequestByID returns a pull request by given ID.
|
// GetPullRequestByID returns a pull request by given ID.
|
||||||
func GetPullRequestByID(id int64) (*PullRequest, error) {
|
func GetPullRequestByID(id int64) (*PullRequest, error) {
|
||||||
pr := new(PullRequest)
|
pr := new(PullRequest)
|
||||||
|
|
|
@ -39,6 +39,7 @@ import (
|
||||||
|
|
||||||
const (
|
const (
|
||||||
_TPL_UPDATE_HOOK = "#!/usr/bin/env %s\n%s update $1 $2 $3 --config='%s'\n"
|
_TPL_UPDATE_HOOK = "#!/usr/bin/env %s\n%s update $1 $2 $3 --config='%s'\n"
|
||||||
|
_TPL_POST_RECEIVE_HOOK = "#!/usr/bin/env %s\n%s pull --path \"$(pwd)\"\n"
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
|
@ -596,6 +597,11 @@ func createUpdateHook(repoPath string) error {
|
||||||
fmt.Sprintf(_TPL_UPDATE_HOOK, setting.ScriptType, "\""+setting.AppPath+"\"", setting.CustomConf))
|
fmt.Sprintf(_TPL_UPDATE_HOOK, setting.ScriptType, "\""+setting.AppPath+"\"", setting.CustomConf))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func createPostReceiveHook(repoPath string) error {
|
||||||
|
return git.SetPostReceiveHook(repoPath,
|
||||||
|
fmt.Sprintf(_TPL_POST_RECEIVE_HOOK, setting.ScriptType, "\""+setting.AppPath+"\""))
|
||||||
|
}
|
||||||
|
|
||||||
type MigrateRepoOptions struct {
|
type MigrateRepoOptions struct {
|
||||||
Name string
|
Name string
|
||||||
Description string
|
Description string
|
||||||
|
@ -818,6 +824,8 @@ func initRepository(e Engine, repoPath string, u *User, repo *Repository, opts C
|
||||||
return fmt.Errorf("InitRepository: %v", err)
|
return fmt.Errorf("InitRepository: %v", err)
|
||||||
} else if err = createUpdateHook(repoPath); err != nil {
|
} else if err = createUpdateHook(repoPath); err != nil {
|
||||||
return fmt.Errorf("createUpdateHook: %v", err)
|
return fmt.Errorf("createUpdateHook: %v", err)
|
||||||
|
} else if err = createPostReceiveHook(repoPath); err != nil {
|
||||||
|
return fmt.Errorf("createPostReceiveHook: %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
tmpDir := filepath.Join(os.TempDir(), "gogs-"+repo.Name+"-"+com.ToStr(time.Now().Nanosecond()))
|
tmpDir := filepath.Join(os.TempDir(), "gogs-"+repo.Name+"-"+com.ToStr(time.Now().Nanosecond()))
|
||||||
|
@ -1498,6 +1506,15 @@ func RewriteRepositoryUpdateHook() error {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// RewriteRepositoryPostReceiveHook rewrites all repositories' update hook.
|
||||||
|
func RewriteRepositoryPostReceiveHook() error {
|
||||||
|
return x.Where("id > 0").Iterate(new(Repository),
|
||||||
|
func(idx int, bean interface{}) error {
|
||||||
|
repo := bean.(*Repository)
|
||||||
|
return createPostReceiveHook(repo.RepoPath())
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
// statusPool represents a pool of status with true/false.
|
// statusPool represents a pool of status with true/false.
|
||||||
type statusPool struct {
|
type statusPool struct {
|
||||||
lock sync.RWMutex
|
lock sync.RWMutex
|
||||||
|
@ -2045,6 +2062,8 @@ func ForkRepository(u *User, oldRepo *Repository, name, desc string) (_ *Reposit
|
||||||
|
|
||||||
if err = createUpdateHook(repoPath); err != nil {
|
if err = createUpdateHook(repoPath); err != nil {
|
||||||
return nil, fmt.Errorf("createUpdateHook: %v", err)
|
return nil, fmt.Errorf("createUpdateHook: %v", err)
|
||||||
|
} else if err = createPostReceiveHook(repoPath); err != nil {
|
||||||
|
return nil, fmt.Errorf("createPostReceiveHook: %v", err)
|
||||||
}
|
}
|
||||||
|
|
||||||
return repo, sess.Commit()
|
return repo, sess.Commit()
|
||||||
|
|
Loading…
Reference in a new issue