Give user a link to create PR after push

Author: JulienTant

cmd/hook.go

@@ -8,6 +8,7 @@ import (
 	"bufio"
 	"bytes"
 	"fmt"
+	"net/url"
 	"os"
 	"path/filepath"
 	"strconv"
@@ -174,6 +175,7 @@ func runHookPostReceive(c *cli.Context) error {
 	hookSetup("hooks/post-receive.log")
 
 	// the environment setted on serv command
+	repoID, _ := strconv.ParseInt(os.Getenv(models.ProtectedBranchRepoID), 10, 64)
 	repoUser := os.Getenv(models.EnvRepoUsername)
 	isWiki := (os.Getenv(models.EnvRepoIsWiki) == "true")
 	repoName := os.Getenv(models.EnvRepoName)
@@ -211,6 +213,36 @@ func runHookPostReceive(c *cli.Context) error {
 		}); err != nil {
 			log.GitLogger.Error(2, "Update: %v", err)
 		}
+
+		if strings.HasPrefix(refFullName, git.BranchPrefix) {
+			branch := strings.TrimPrefix(refFullName, git.BranchPrefix)
+			repository, err := private.GetRepository(repoID)
+			if err != nil {
+				log.GitLogger.Error(2, "get repository: %v", err)
+				break
+			}
+
+			// Don't propose to create new PR if it's default branch
+			if branch == repository.DefaultBranch {
+				break
+			}
+
+			pr, err := private.ActivePullRequest(repoID, repository.DefaultBranch, branch)
+			if err != nil {
+				log.GitLogger.Error(2, "get active pr: %v", err)
+				break
+			}
+			fmt.Fprintln(os.Stderr, "")
+			if pr == nil {
+				fmt.Fprintf(os.Stderr, "Create a new pull request for '%s':\n", branch)
+				fmt.Fprintf(os.Stderr, "  %s%s/%s/compare/%s...%s\n", setting.AppURL, repoUser, repoName, url.QueryEscape(repository.DefaultBranch), url.QueryEscape(branch))
+			} else {
+				fmt.Fprint(os.Stderr, "Visit the existing pull request:\n")
+				fmt.Fprintf(os.Stderr, "  %s%s/%s/pulls/%d\n", setting.AppURL, repoUser, repoName, pr.Index)
+			}
+			fmt.Fprintln(os.Stderr, "")
+		}
+
 	}
 
 	return nil

modules/private/repository.go

@@ -0,0 +1,62 @@
+package private
+
+import (
+	"encoding/json"
+	"fmt"
+	"net/url"
+
+	"code.gitea.io/gitea/models"
+	"code.gitea.io/gitea/modules/log"
+	"code.gitea.io/gitea/modules/setting"
+)
+
+// GetRepository return the repository by its ID
+func GetRepository(repoID int64) (*models.Repository, error) {
+	reqURL := setting.LocalURL + fmt.Sprintf("api/internal/repository/%d", repoID)
+	log.GitLogger.Trace("GetRepository: %s", reqURL)
+
+	resp, err := newInternalRequest(reqURL, "GET").Response()
+	if err != nil {
+		return nil, err
+	}
+
+	var repository *models.Repository
+	if err := json.NewDecoder(resp.Body).Decode(&repository); err != nil {
+		return nil, err
+	}
+
+	defer resp.Body.Close()
+
+	// All 2XX status codes are accepted and others will return an error
+	if resp.StatusCode/100 != 2 {
+		return nil, fmt.Errorf("failed to retrieve repository: %s", decodeJSONError(resp).Err)
+	}
+
+	return repository, nil
+}
+
+// ActivePullRequest returns an active pull request if it exists
+func ActivePullRequest(repoID int64, baseBranch, headBranch string) (*models.PullRequest, error) {
+	reqURL := setting.LocalURL + fmt.Sprintf("api/internal/active-pull-request/%d/%s...%s", repoID, url.QueryEscape(baseBranch), url.QueryEscape(headBranch))
+	log.GitLogger.Trace("ActivePullRequest: %s", reqURL)
+
+	resp, err := newInternalRequest(reqURL, "GET").Response()
+	if err != nil {
+		log.GitLogger.Trace(err.Error())
+		return nil, err
+	}
+
+	var pr *models.PullRequest
+	if err := json.NewDecoder(resp.Body).Decode(&pr); err != nil {
+		return nil, err
+	}
+
+	defer resp.Body.Close()
+
+	// All 2XX status codes are accepted and others will return an error
+	if resp.StatusCode/100 != 2 {
+		return nil, fmt.Errorf("failed to retrieve pull request: %s", decodeJSONError(resp).Err)
+	}
+
+	return pr, nil
+}

routers/private/internal.go

@@ -44,5 +44,7 @@ func RegisterRoutes(m *macaron.Macaron) {
 		m.Post("/push/update", PushUpdate)
 		m.Get("/protectedbranch/:pbid/:userid", CanUserPush)
 		m.Get("/branch/:id/*", GetProtectedBranchBy)
+		m.Get("/repository/:rid", GetRepository)
+		m.Get("/active-pull-request/:rid/*", GetActivePullRequest)
 	}, CheckInternalToken)
 }

routers/private/repository.go

@@ -0,0 +1,48 @@
+package private
+
+import (
+	"net/http"
+	"net/url"
+	"strings"
+
+	"code.gitea.io/gitea/models"
+	macaron "gopkg.in/macaron.v1"
+)
+
+// GetRepository return the default branch of a repository
+func GetRepository(ctx *macaron.Context) {
+	repoID := ctx.ParamsInt64(":rid")
+	repository, err := models.GetRepositoryByID(repoID)
+	if err != nil {
+		ctx.JSON(http.StatusInternalServerError, map[string]interface{}{
+			"err": err.Error(),
+		})
+		return
+	}
+
+	ctx.JSON(http.StatusOK, repository)
+}
+
+// GetActivePullRequest return an active pull request when it exists or an empty object
+func GetActivePullRequest(ctx *macaron.Context) {
+	repoID := ctx.ParamsInt64(":rid")
+
+	infoPath, err := url.QueryUnescape(ctx.Params("*"))
+	if err != nil {
+		ctx.JSON(http.StatusInternalServerError, map[string]interface{}{
+			"err": err.Error(),
+		})
+		return
+	}
+	infos := strings.Split(infoPath, "...")
+
+	pr, err := models.GetUnmergedPullRequest(repoID, repoID, infos[1], infos[0])
+	if err != nil && !models.IsErrPullRequestNotExist(err) {
+		ctx.JSON(http.StatusInternalServerError, map[string]interface{}{
+			"err": err.Error(),
+		})
+		return
+	}
+
+	ctx.JSON(http.StatusOK, pr)
+}