New push to head repo of head branch: regenerate patch and retest apply

Author: unknwon

cmd/serve.go

@@ -200,32 +200,34 @@ func runServ(c *cli.Context) {
 	}
 
 	if requestedMode == models.ACCESS_MODE_WRITE {
-		tasks, err := models.GetUpdateTasksByUuid(uuid)
+		task, err := models.GetUpdateTaskByUUID(uuid)
 		if err != nil {
-			log.GitLogger.Fatal(2, "GetUpdateTasksByUuid: %v", err)
+			log.GitLogger.Fatal(2, "GetUpdateTaskByUUID: %v", err)
 		}
 
-		for _, task := range tasks {
-			err = models.Update(task.RefName, task.OldCommitId, task.NewCommitId,
-				user.Name, repoUserName, repoName, user.Id)
-			if err != nil {
-				log.GitLogger.Error(2, "Failed to update: %v", err)
-			}
+		if err = models.Update(task.RefName, task.OldCommitID, task.NewCommitID,
+			user.Name, repoUserName, repoName, user.Id); err != nil {
+			log.GitLogger.Error(2, "Update: %v", err)
 		}
 
-		if err = models.DelUpdateTasksByUuid(uuid); err != nil {
-			log.GitLogger.Fatal(2, "DelUpdateTasksByUuid: %v", err)
+		if err = models.DeleteUpdateTaskByUUID(uuid); err != nil {
+			log.GitLogger.Fatal(2, "DeleteUpdateTaskByUUID: %v", err)
 		}
-	}
 
-	// Send deliver hook request.
-	reqURL := setting.AppUrl + repoUserName + "/" + repoName + "/hooks/trigger"
-	resp, err := httplib.Head(reqURL).Response()
-	if err == nil {
-		resp.Body.Close()
-		log.GitLogger.Trace("Trigger hook: %s", reqURL)
-	} else {
-		log.GitLogger.Error(2, "Fail to trigger hook: %v", err)
+		// Ask for running deliver hook and test pull request tasks.
+		reqURL := setting.AppUrl + repoUserName + "/" + repoName + "/tasks/trigger?branch=" +
+			strings.TrimPrefix(task.RefName, "refs/heads/")
+		log.GitLogger.Trace("Trigger task: %s", reqURL)
+
+		resp, err := httplib.Head(reqURL).Response()
+		if err == nil {
+			resp.Body.Close()
+			if resp.StatusCode/100 != 2 {
+				log.GitLogger.Error(2, "Fail to trigger task: not 2xx response code")
+			}
+		} else {
+			log.GitLogger.Error(2, "Fail to trigger task: %v", err)
+		}
 	}
 
 	// Update user key activity.

cmd/update.go

@@ -45,13 +45,13 @@ func runUpdate(c *cli.Context) {
 	uuid := os.Getenv("uuid")
 
 	task := models.UpdateTask{
-		Uuid:        uuid,
+		UUID:        uuid,
 		RefName:     args[0],
-		OldCommitId: args[1],
-		NewCommitId: args[2],
+		OldCommitID: args[1],
+		NewCommitID: args[2],
 	}
 
 	if err := models.AddUpdateTask(&task); err != nil {
-		log.GitLogger.Fatal(2, err.Error())
+		log.GitLogger.Fatal(2, "AddUpdateTask: %v", err)
 	}
 }

cmd/web.go

@@ -545,8 +545,8 @@ func runWeb(ctx *cli.Context) {
 		}, ignSignIn, middleware.RepoAssignment(true, true), middleware.RepoRef())
 
 		m.Group("/:reponame", func() {
-			m.Any("/*", ignSignInAndCsrf, repo.Http)
-			m.Head("/hooks/trigger", repo.TriggerHook)
+			m.Any("/*", ignSignInAndCsrf, repo.HTTP)
+			m.Head("/tasks/trigger", repo.TriggerTask)
 		})
 	})
 	// ***** END: Repository *****

conf/locale/locale_en-US.ini

@@ -498,6 +498,7 @@ pulls.reopen_to_merge = Please reopen this pull request to perform merge operati
 pulls.merged = Merged
 pulls.has_merged = This pull request has been merged successfully!
 pulls.data_broken = Data of this pull request has been broken due to deletion of fork information.
+pulls.is_checking = The conflit checking is still in progress, please refresh page in few moments.
 pulls.can_auto_merge_desc = You can perform auto-merge operation on this pull request.
 pulls.cannot_auto_merge_desc = You can't perform auto-merge operation because there are conflicts between commits.
 pulls.cannot_auto_merge_helper = Please use command line tool to solve it.

gogs.go

@@ -17,7 +17,7 @@ import (
 	"github.com/gogits/gogs/modules/setting"
 )
 
-const APP_VER = "0.6.16.1023 Beta"
+const APP_VER = "0.6.17.1024 Beta"
 
 func init() {
 	runtime.GOMAXPROCS(runtime.NumCPU())

models/issue.go

@@ -813,23 +813,22 @@ func GetRepoIssueStats(repoID, uid int64, filterMode int, isPull bool) (numOpen
 	return numOpen, numClosed
 }
 
-// updateIssue updates all fields of given issue.
 func updateIssue(e Engine, issue *Issue) error {
 	_, err := e.Id(issue.ID).AllCols().Update(issue)
 	return err
 }
 
-// updateIssueCols update specific fields of given issue.
+// UpdateIssue updates all fields of given issue.
+func UpdateIssue(issue *Issue) error {
+	return updateIssue(x, issue)
+}
+
+// updateIssueCols updates specific fields of given issue.
 func updateIssueCols(e Engine, issue *Issue, cols ...string) error {
 	_, err := e.Id(issue.ID).Cols(cols...).Update(issue)
 	return err
 }
 
-// UpdateIssue updates information of issue.
-func UpdateIssue(issue *Issue) error {
-	return updateIssue(x, issue)
-}
-
 func updateIssueUsersByStatus(e Engine, issueID int64, isClosed bool) error {
 	_, err := e.Exec("UPDATE `issue_user` SET is_closed=? WHERE issue_id=?", isClosed, issueID)
 	return err