diff --git a/web_src/less/_repository.less b/web_src/less/_repository.less
index 27a0698f7b6c..ed87131e66bd 100644
--- a/web_src/less/_repository.less
+++ b/web_src/less/_repository.less
@@ -655,6 +655,9 @@
.icon-octicon {
padding-left: 2px;
}
+ .update-button {
+ float: right;
+ }
}
.review-item {
From 26d686fe080ed2a9b7aa27534a916ebe731ac287 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Thu, 16 Jan 2020 01:51:03 +0100
Subject: [PATCH 03/35] first working version
---
routers/repo/pull.go | 69 +++++++++++
routers/routes/routes.go | 1 +
services/pull/update.go | 259 +++++++++++++++++++++++++++++++++++++++
web_src/js/index.js | 11 ++
4 files changed, 340 insertions(+)
create mode 100644 services/pull/update.go
diff --git a/routers/repo/pull.go b/routers/repo/pull.go
index 1c64defb44a4..eb7b7ed11ac1 100644
--- a/routers/repo/pull.go
+++ b/routers/repo/pull.go
@@ -594,6 +594,75 @@ func ViewPullFiles(ctx *context.Context) {
ctx.HTML(200, tplPullFiles)
}
+// UpdatePullRequest merge master into PR
+func UpdatePullRequest(ctx *context.Context) {
+
+ issue := checkPullInfo(ctx)
+ if ctx.Written() {
+ return
+ }
+ if issue.IsClosed {
+ ctx.NotFound("MergePullRequest", nil)
+ return
+ }
+
+ if issue.PullRequest.HasMerged {
+ ctx.NotFound("MergePullRequest", nil)
+ return
+ }
+
+ if err := issue.PullRequest.LoadBaseRepo(); err != nil {
+ ctx.InternalServerError(err)
+ return
+ }
+ if err := issue.PullRequest.LoadHeadRepo(); err != nil {
+ ctx.InternalServerError(err)
+ return
+ }
+
+ headRepoPerm, err := models.GetUserRepoPermission(issue.PullRequest.HeadRepo, ctx.User)
+ if err != nil {
+ ctx.ServerError("GetUserRepoPermission", err)
+ return
+ }
+
+ allowedUpdate, err := pull_service.IsUserAllowedToUpdate(issue.PullRequest, headRepoPerm, ctx.User)
+ if err != nil {
+ ctx.ServerError("IsUserAllowedToMerge", err)
+ return
+ }
+
+ // ToDo: add check if maintainers are allowed to change branch ... (need migration & co)
+ if !allowedUpdate {
+ ctx.Flash.Error(ctx.Tr("repo.pulls.update_not_allowed"))
+ ctx.Redirect(ctx.Repo.RepoLink + "/pulls/" + com.ToStr(issue.Index))
+ return
+ }
+
+ // default merge commit message
+ message := fmt.Sprintf("Merge branch '%s' into %s", issue.PullRequest.BaseBranch, issue.PullRequest.HeadBranch)
+
+ if err = pull_service.Update(issue.PullRequest, ctx.User, message); err != nil {
+ sanitize := func(x string) string {
+ runes := []rune(x)
+
+ if len(runes) > 512 {
+ x = "..." + string(runes[len(runes)-512:])
+ }
+
+ return strings.Replace(html.EscapeString(x), "\n", "
", -1)
+ }
+ if models.IsErrMergeConflicts(err) {
+ conflictError := err.(models.ErrMergeConflicts)
+ ctx.Flash.Error(ctx.Tr("repo.pulls.merge_conflict", sanitize(conflictError.StdErr), sanitize(conflictError.StdOut)))
+ ctx.Redirect(ctx.Repo.RepoLink + "/pulls/" + com.ToStr(issue.Index))
+ return
+ }
+ ctx.ServerError("Update", err)
+ return
+ }
+}
+
// MergePullRequest response for merging pull request
func MergePullRequest(ctx *context.Context, form auth.MergePullRequestForm) {
issue := checkPullInfo(ctx)
diff --git a/routers/routes/routes.go b/routers/routes/routes.go
index 58a2da82fcca..7e81f55de60f 100644
--- a/routers/routes/routes.go
+++ b/routers/routes/routes.go
@@ -855,6 +855,7 @@ func RegisterRoutes(m *macaron.Macaron) {
m.Get(".patch", repo.DownloadPullPatch)
m.Get("/commits", context.RepoRef(), repo.ViewPullCommits)
m.Post("/merge", context.RepoMustNotBeArchived(), reqRepoPullsWriter, bindIgnErr(auth.MergePullRequestForm{}), repo.MergePullRequest)
+ m.Post("/update", repo.UpdatePullRequest)
m.Post("/cleanup", context.RepoMustNotBeArchived(), context.RepoRef(), repo.CleanUpPullRequest)
m.Group("/files", func() {
m.Get("", context.RepoRef(), repo.SetEditorconfigIfExists, repo.SetDiffViewStyle, repo.SetWhitespaceBehavior, repo.ViewPullFiles)
diff --git a/services/pull/update.go b/services/pull/update.go
new file mode 100644
index 000000000000..7865123acb22
--- /dev/null
+++ b/services/pull/update.go
@@ -0,0 +1,259 @@
+// Copyright 2020 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 pull
+
+import (
+ "fmt"
+ "io/ioutil"
+ "os"
+ "path/filepath"
+ "strings"
+ "time"
+
+ "code.gitea.io/gitea/models"
+ "code.gitea.io/gitea/modules/git"
+ "code.gitea.io/gitea/modules/log"
+ "code.gitea.io/gitea/modules/setting"
+
+ "github.com/mcuadros/go-version"
+)
+
+// Update ToDo wip ...
+func Update(pull *models.PullRequest, doer *models.User, message string) (err error) {
+ binVersion, err := git.BinVersion()
+ if err != nil {
+ log.Error("git.BinVersion: %v", err)
+ return fmt.Errorf("Unable to get git version: %v", err)
+ }
+
+ //use merge functions but switch repo's and branches
+ pr := &models.PullRequest{
+ HeadRepoID: pull.BaseRepoID,
+ BaseRepoID: pull.HeadRepoID,
+ HeadBranch: pull.BaseBranch,
+ BaseBranch: pull.HeadBranch,
+ }
+
+ if err = pr.LoadHeadRepo(); err != nil {
+ log.Error("LoadHeadRepo: %v", err)
+ return fmt.Errorf("LoadHeadRepo: %v", err)
+ } else if err = pr.LoadBaseRepo(); err != nil {
+ log.Error("LoadBaseRepo: %v", err)
+ return fmt.Errorf("LoadBaseRepo: %v", err)
+ }
+
+ // Clone base repo.
+ tmpBasePath, err := createTemporaryRepo(pr)
+ if err != nil {
+ log.Error("CreateTemporaryPath: %v", err)
+ return err
+ }
+ defer func() {
+ if err := models.RemoveTemporaryPath(tmpBasePath); err != nil {
+ log.Error("Merge: RemoveTemporaryPath: %s", err)
+ }
+ }()
+
+ baseBranch := "base"
+ trackingBranch := "tracking"
+
+ var outbuf, errbuf strings.Builder
+
+ // Enable sparse-checkout
+ sparseCheckoutList, err := getDiffTree(tmpBasePath, baseBranch, trackingBranch)
+ if err != nil {
+ log.Error("getDiffTree(%s, %s, %s): %v", tmpBasePath, baseBranch, trackingBranch, err)
+ return fmt.Errorf("getDiffTree: %v", err)
+ }
+
+ infoPath := filepath.Join(tmpBasePath, ".git", "info")
+ if err := os.MkdirAll(infoPath, 0700); err != nil {
+ log.Error("Unable to create .git/info in %s: %v", tmpBasePath, err)
+ return fmt.Errorf("Unable to create .git/info in tmpBasePath: %v", err)
+ }
+
+ sparseCheckoutListPath := filepath.Join(infoPath, "sparse-checkout")
+ if err := ioutil.WriteFile(sparseCheckoutListPath, []byte(sparseCheckoutList), 0600); err != nil {
+ log.Error("Unable to write .git/info/sparse-checkout file in %s: %v", tmpBasePath, err)
+ return fmt.Errorf("Unable to write .git/info/sparse-checkout file in tmpBasePath: %v", err)
+ }
+
+ var gitConfigCommand func() *git.Command
+ if version.Compare(binVersion, "1.8.0", ">=") {
+ gitConfigCommand = func() *git.Command {
+ return git.NewCommand("config", "--local")
+ }
+ } else {
+ gitConfigCommand = func() *git.Command {
+ return git.NewCommand("config")
+ }
+ }
+
+ // Switch off LFS process (set required, clean and smudge here also)
+ if err := gitConfigCommand().AddArguments("filter.lfs.process", "").RunInDirPipeline(tmpBasePath, &outbuf, &errbuf); err != nil {
+ log.Error("git config [filter.lfs.process -> <> ]: %v\n%s\n%s", err, outbuf.String(), errbuf.String())
+ return fmt.Errorf("git config [filter.lfs.process -> <> ]: %v\n%s\n%s", err, outbuf.String(), errbuf.String())
+ }
+ outbuf.Reset()
+ errbuf.Reset()
+
+ if err := gitConfigCommand().AddArguments("filter.lfs.required", "false").RunInDirPipeline(tmpBasePath, &outbuf, &errbuf); err != nil {
+ log.Error("git config [filter.lfs.required ->
]: %v\n%s\n%s", err, outbuf.String(), errbuf.String())
+ return fmt.Errorf("git config [filter.lfs.required -> ]: %v\n%s\n%s", err, outbuf.String(), errbuf.String())
+ }
+ outbuf.Reset()
+ errbuf.Reset()
+
+ if err := gitConfigCommand().AddArguments("filter.lfs.clean", "").RunInDirPipeline(tmpBasePath, &outbuf, &errbuf); err != nil {
+ log.Error("git config [filter.lfs.clean -> <> ]: %v\n%s\n%s", err, outbuf.String(), errbuf.String())
+ return fmt.Errorf("git config [filter.lfs.clean -> <> ]: %v\n%s\n%s", err, outbuf.String(), errbuf.String())
+ }
+ outbuf.Reset()
+ errbuf.Reset()
+
+ if err := gitConfigCommand().AddArguments("filter.lfs.smudge", "").RunInDirPipeline(tmpBasePath, &outbuf, &errbuf); err != nil {
+ log.Error("git config [filter.lfs.smudge -> <> ]: %v\n%s\n%s", err, outbuf.String(), errbuf.String())
+ return fmt.Errorf("git config [filter.lfs.smudge -> <> ]: %v\n%s\n%s", err, outbuf.String(), errbuf.String())
+ }
+ outbuf.Reset()
+ errbuf.Reset()
+
+ if err := gitConfigCommand().AddArguments("core.sparseCheckout", "true").RunInDirPipeline(tmpBasePath, &outbuf, &errbuf); err != nil {
+ log.Error("git config [core.sparseCheckout -> true ]: %v\n%s\n%s", err, outbuf.String(), errbuf.String())
+ return fmt.Errorf("git config [core.sparsecheckout -> true]: %v\n%s\n%s", err, outbuf.String(), errbuf.String())
+ }
+ outbuf.Reset()
+ errbuf.Reset()
+
+ // Read base branch index
+ if err := git.NewCommand("read-tree", "HEAD").RunInDirPipeline(tmpBasePath, &outbuf, &errbuf); err != nil {
+ log.Error("git read-tree HEAD: %v\n%s\n%s", err, outbuf.String(), errbuf.String())
+ return fmt.Errorf("Unable to read base branch in to the index: %v\n%s\n%s", err, outbuf.String(), errbuf.String())
+ }
+ outbuf.Reset()
+ errbuf.Reset()
+
+ // Determine if we should sign
+ signArg := ""
+ if version.Compare(binVersion, "1.7.9", ">=") {
+ sign, keyID, _ := pr.SignMerge(doer, tmpBasePath, "HEAD", trackingBranch)
+ if sign {
+ signArg = "-S" + keyID
+ } else if version.Compare(binVersion, "2.0.0", ">=") {
+ signArg = "--no-gpg-sign"
+ }
+ }
+
+ sig := doer.NewGitSig()
+ commitTimeStr := time.Now().Format(time.RFC3339)
+
+ // 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,
+ )
+
+ // Merge commits.
+ cmd := git.NewCommand("merge", "--no-ff", "--no-commit", trackingBranch)
+ if err := runMergeCommand(pr, models.MergeStyleMerge, cmd, tmpBasePath); err != nil {
+ log.Error("Unable to merge tracking into base: %v", err)
+ return err
+ }
+
+ if err := commitAndSignNoAuthor(pr, message, signArg, tmpBasePath, env); err != nil {
+ log.Error("Unable to make final commit: %v", err)
+ return err
+ }
+
+ // OK we should cache our current head and origin/headbranch
+ mergeHeadSHA, err := git.GetFullCommitID(tmpBasePath, "HEAD")
+ if err != nil {
+ return fmt.Errorf("Failed to get full commit id for HEAD: %v", err)
+ }
+ mergeBaseSHA, err := git.GetFullCommitID(tmpBasePath, "original_"+baseBranch)
+ if err != nil {
+ return fmt.Errorf("Failed to get full commit id for origin/%s: %v", pr.BaseBranch, err)
+ }
+
+ // Now it's questionable about where this should go - either after or before the push
+ // I think in the interests of data safety - failures to push to the lfs should prevent
+ // the merge as you can always remerge.
+ if setting.LFS.StartServer {
+ if err := LFSPush(tmpBasePath, mergeHeadSHA, mergeBaseSHA, pr); err != nil {
+ return err
+ }
+ }
+
+ var headUser *models.User
+ err = pr.HeadRepo.GetOwner()
+ if err != nil {
+ if !models.IsErrUserNotExist(err) {
+ log.Error("Can't find user: %d for head repository - %v", pr.HeadRepo.OwnerID, err)
+ return err
+ }
+ log.Error("Can't find user: %d for head repository - defaulting to doer: %s - %v", pr.HeadRepo.OwnerID, doer.Name, err)
+ headUser = doer
+ } else {
+ headUser = pr.HeadRepo.Owner
+ }
+
+ env = models.FullPushingEnvironment(
+ headUser,
+ doer,
+ pr.BaseRepo,
+ pr.BaseRepo.Name,
+ pr.ID,
+ )
+
+ // Push back to upstream.
+ if err := git.NewCommand("push", "origin", baseBranch+":"+pr.BaseBranch).RunInDirTimeoutEnvPipeline(env, -1, tmpBasePath, &outbuf, &errbuf); err != nil {
+ if strings.Contains(errbuf.String(), "non-fast-forward") {
+ return models.ErrMergePushOutOfDate{
+ Style: models.MergeStyleMerge,
+ StdOut: outbuf.String(),
+ StdErr: errbuf.String(),
+ Err: err,
+ }
+ }
+ return fmt.Errorf("git push: %s", errbuf.String())
+ }
+ outbuf.Reset()
+ errbuf.Reset()
+
+ //notification.NotifyPullRequestUpdated(pr, doer)
+ //trigger hooks and co ..
+
+ return nil
+}
+
+// IsUserAllowedToUpdate check if user is allowed to update PR with given permissions and branch protections
+func IsUserAllowedToUpdate(pull *models.PullRequest, p models.Permission, user *models.User) (bool, error) {
+ if p.IsAdmin() {
+ return true, nil
+ }
+ if !p.CanWrite(models.UnitTypeCode) {
+ return false, nil
+ }
+ pr := &models.PullRequest{
+ HeadRepoID: pull.BaseRepoID,
+ BaseRepoID: pull.HeadRepoID,
+ HeadBranch: pull.BaseBranch,
+ BaseBranch: pull.HeadBranch,
+ }
+ err := pr.LoadProtectedBranch()
+ if err != nil {
+ return false, err
+ }
+
+ if pr.ProtectedBranch == nil || pr.ProtectedBranch.IsUserMergeWhitelisted(user.ID) {
+ return true, nil
+ }
+
+ return false, nil
+}
diff --git a/web_src/js/index.js b/web_src/js/index.js
index 7c3749c08b72..189592171e7d 100644
--- a/web_src/js/index.js
+++ b/web_src/js/index.js
@@ -1037,6 +1037,17 @@ function initRepository() {
$('#comment-form').submit();
});
+ // Pull Request update button
+ const $updatePRButton = $('#update-button');
+ $updatePRButton.on('click', () => {
+ $.post(`${window.location}/update`, {
+ _csrf: csrf
+ }).success(() => {
+ // eslint-disable-next-line no-restricted-globals
+ location.reload();
+ });
+ });
+
// Pull Request merge button
const $mergeButton = $('.merge-button > button');
$mergeButton.on('click', function (e) {
From d8522ac21815048152a5551e4847137e50d622e8 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Thu, 16 Jan 2020 02:11:03 +0100
Subject: [PATCH 04/35] re-use code
---
services/pull/update.go | 17 +----------------
1 file changed, 1 insertion(+), 16 deletions(-)
diff --git a/services/pull/update.go b/services/pull/update.go
index 7865123acb22..475187223cc9 100644
--- a/services/pull/update.go
+++ b/services/pull/update.go
@@ -234,26 +234,11 @@ func Update(pull *models.PullRequest, doer *models.User, message string) (err er
// IsUserAllowedToUpdate check if user is allowed to update PR with given permissions and branch protections
func IsUserAllowedToUpdate(pull *models.PullRequest, p models.Permission, user *models.User) (bool, error) {
- if p.IsAdmin() {
- return true, nil
- }
- if !p.CanWrite(models.UnitTypeCode) {
- return false, nil
- }
pr := &models.PullRequest{
HeadRepoID: pull.BaseRepoID,
BaseRepoID: pull.HeadRepoID,
HeadBranch: pull.BaseBranch,
BaseBranch: pull.HeadBranch,
}
- err := pr.LoadProtectedBranch()
- if err != nil {
- return false, err
- }
-
- if pr.ProtectedBranch == nil || pr.ProtectedBranch.IsUserMergeWhitelisted(user.ID) {
- return true, nil
- }
-
- return false, nil
+ return IsUserAllowedToMerge(pr, p, user)
}
From efe6982a70f35698757c8b14421f9067a9aca95d Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Thu, 16 Jan 2020 11:18:17 +0100
Subject: [PATCH 05/35] split raw merge commands and db-change functions
(notify, cache, ...)
---
services/pull/merge.go | 100 ++++++++++++++++++++++-------------------
1 file changed, 55 insertions(+), 45 deletions(-)
diff --git a/services/pull/merge.go b/services/pull/merge.go
index f6f0abe8362c..7bcdc7ac8485 100644
--- a/services/pull/merge.go
+++ b/services/pull/merge.go
@@ -33,11 +33,6 @@ import (
// Caller should check PR is ready to be merged (review and status checks)
// FIXME: add repoWorkingPull make sure two merges does not happen at same time.
func Merge(pr *models.PullRequest, doer *models.User, baseGitRepo *git.Repository, mergeStyle models.MergeStyle, message string) (err error) {
- binVersion, err := git.BinVersion()
- if err != nil {
- log.Error("git.BinVersion: %v", err)
- return fmt.Errorf("Unable to get git version: %v", err)
- }
if err = pr.GetHeadRepo(); err != nil {
log.Error("GetHeadRepo: %v", err)
@@ -63,6 +58,61 @@ func Merge(pr *models.PullRequest, doer *models.User, baseGitRepo *git.Repositor
go AddTestPullRequestTask(doer, pr.BaseRepo.ID, pr.BaseBranch, false, "", "")
}()
+ if err := rawMerge(pr, doer, mergeStyle, message); err != nil {
+ return err
+ }
+
+ pr.MergedCommitID, err = baseGitRepo.GetBranchCommitID(pr.BaseBranch)
+ if err != nil {
+ return fmt.Errorf("GetBranchCommit: %v", err)
+ }
+
+ pr.MergedUnix = timeutil.TimeStampNow()
+ pr.Merger = doer
+ pr.MergerID = doer.ID
+
+ if err = pr.SetMerged(); err != nil {
+ log.Error("setMerged [%d]: %v", pr.ID, err)
+ }
+
+ notification.NotifyMergePullRequest(pr, doer, baseGitRepo)
+
+ // Reset cached commit count
+ cache.Remove(pr.Issue.Repo.GetCommitsCountCacheKey(pr.BaseBranch, true))
+
+ // Resolve cross references
+ refs, err := pr.ResolveCrossReferences()
+ if err != nil {
+ log.Error("ResolveCrossReferences: %v", err)
+ return nil
+ }
+
+ for _, ref := range refs {
+ if err = ref.LoadIssue(); err != nil {
+ return err
+ }
+ if err = ref.Issue.LoadRepo(); err != nil {
+ return err
+ }
+ close := (ref.RefAction == references.XRefActionCloses)
+ if close != ref.Issue.IsClosed {
+ if err = issue_service.ChangeStatus(ref.Issue, doer, close); err != nil {
+ return err
+ }
+ }
+ }
+
+ return nil
+}
+
+// rawMerge perform the merge operation without changing any pull information in database
+func rawMerge(pr *models.PullRequest, doer *models.User, mergeStyle models.MergeStyle, message string) (err error) {
+ binVersion, err := git.BinVersion()
+ if err != nil {
+ log.Error("git.BinVersion: %v", err)
+ return fmt.Errorf("Unable to get git version: %v", err)
+ }
+
// Clone base repo.
tmpBasePath, err := createTemporaryRepo(pr)
if err != nil {
@@ -337,46 +387,6 @@ func Merge(pr *models.PullRequest, doer *models.User, baseGitRepo *git.Repositor
outbuf.Reset()
errbuf.Reset()
- pr.MergedCommitID, err = baseGitRepo.GetBranchCommitID(pr.BaseBranch)
- if err != nil {
- return fmt.Errorf("GetBranchCommit: %v", err)
- }
-
- pr.MergedUnix = timeutil.TimeStampNow()
- pr.Merger = doer
- pr.MergerID = doer.ID
-
- if err = pr.SetMerged(); err != nil {
- log.Error("setMerged [%d]: %v", pr.ID, err)
- }
-
- notification.NotifyMergePullRequest(pr, doer, baseGitRepo)
-
- // Reset cached commit count
- cache.Remove(pr.Issue.Repo.GetCommitsCountCacheKey(pr.BaseBranch, true))
-
- // Resolve cross references
- refs, err := pr.ResolveCrossReferences()
- if err != nil {
- log.Error("ResolveCrossReferences: %v", err)
- return nil
- }
-
- for _, ref := range refs {
- if err = ref.LoadIssue(); err != nil {
- return err
- }
- if err = ref.Issue.LoadRepo(); err != nil {
- return err
- }
- close := (ref.RefAction == references.XRefActionCloses)
- if close != ref.Issue.IsClosed {
- if err = issue_service.ChangeStatus(ref.Issue, doer, close); err != nil {
- return err
- }
- }
- }
-
return nil
}
From 328ecc3cefd8ffe39047dfeccb6ab7501ebf7a4c Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Thu, 16 Jan 2020 11:19:28 +0100
Subject: [PATCH 06/35] use rawMerge (remove redundant code)
---
services/pull/update.go | 195 +---------------------------------------
1 file changed, 1 insertion(+), 194 deletions(-)
diff --git a/services/pull/update.go b/services/pull/update.go
index 475187223cc9..9b9d160e8957 100644
--- a/services/pull/update.go
+++ b/services/pull/update.go
@@ -6,28 +6,13 @@ package pull
import (
"fmt"
- "io/ioutil"
- "os"
- "path/filepath"
- "strings"
- "time"
"code.gitea.io/gitea/models"
- "code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/log"
- "code.gitea.io/gitea/modules/setting"
-
- "github.com/mcuadros/go-version"
)
// Update ToDo wip ...
func Update(pull *models.PullRequest, doer *models.User, message string) (err error) {
- binVersion, err := git.BinVersion()
- if err != nil {
- log.Error("git.BinVersion: %v", err)
- return fmt.Errorf("Unable to get git version: %v", err)
- }
-
//use merge functions but switch repo's and branches
pr := &models.PullRequest{
HeadRepoID: pull.BaseRepoID,
@@ -44,187 +29,9 @@ func Update(pull *models.PullRequest, doer *models.User, message string) (err er
return fmt.Errorf("LoadBaseRepo: %v", err)
}
- // Clone base repo.
- tmpBasePath, err := createTemporaryRepo(pr)
- if err != nil {
- log.Error("CreateTemporaryPath: %v", err)
+ if err := rawMerge(pr, doer, models.MergeStyleMerge, message); err != nil {
return err
}
- defer func() {
- if err := models.RemoveTemporaryPath(tmpBasePath); err != nil {
- log.Error("Merge: RemoveTemporaryPath: %s", err)
- }
- }()
-
- baseBranch := "base"
- trackingBranch := "tracking"
-
- var outbuf, errbuf strings.Builder
-
- // Enable sparse-checkout
- sparseCheckoutList, err := getDiffTree(tmpBasePath, baseBranch, trackingBranch)
- if err != nil {
- log.Error("getDiffTree(%s, %s, %s): %v", tmpBasePath, baseBranch, trackingBranch, err)
- return fmt.Errorf("getDiffTree: %v", err)
- }
-
- infoPath := filepath.Join(tmpBasePath, ".git", "info")
- if err := os.MkdirAll(infoPath, 0700); err != nil {
- log.Error("Unable to create .git/info in %s: %v", tmpBasePath, err)
- return fmt.Errorf("Unable to create .git/info in tmpBasePath: %v", err)
- }
-
- sparseCheckoutListPath := filepath.Join(infoPath, "sparse-checkout")
- if err := ioutil.WriteFile(sparseCheckoutListPath, []byte(sparseCheckoutList), 0600); err != nil {
- log.Error("Unable to write .git/info/sparse-checkout file in %s: %v", tmpBasePath, err)
- return fmt.Errorf("Unable to write .git/info/sparse-checkout file in tmpBasePath: %v", err)
- }
-
- var gitConfigCommand func() *git.Command
- if version.Compare(binVersion, "1.8.0", ">=") {
- gitConfigCommand = func() *git.Command {
- return git.NewCommand("config", "--local")
- }
- } else {
- gitConfigCommand = func() *git.Command {
- return git.NewCommand("config")
- }
- }
-
- // Switch off LFS process (set required, clean and smudge here also)
- if err := gitConfigCommand().AddArguments("filter.lfs.process", "").RunInDirPipeline(tmpBasePath, &outbuf, &errbuf); err != nil {
- log.Error("git config [filter.lfs.process -> <> ]: %v\n%s\n%s", err, outbuf.String(), errbuf.String())
- return fmt.Errorf("git config [filter.lfs.process -> <> ]: %v\n%s\n%s", err, outbuf.String(), errbuf.String())
- }
- outbuf.Reset()
- errbuf.Reset()
-
- if err := gitConfigCommand().AddArguments("filter.lfs.required", "false").RunInDirPipeline(tmpBasePath, &outbuf, &errbuf); err != nil {
- log.Error("git config [filter.lfs.required -> ]: %v\n%s\n%s", err, outbuf.String(), errbuf.String())
- return fmt.Errorf("git config [filter.lfs.required -> ]: %v\n%s\n%s", err, outbuf.String(), errbuf.String())
- }
- outbuf.Reset()
- errbuf.Reset()
-
- if err := gitConfigCommand().AddArguments("filter.lfs.clean", "").RunInDirPipeline(tmpBasePath, &outbuf, &errbuf); err != nil {
- log.Error("git config [filter.lfs.clean -> <> ]: %v\n%s\n%s", err, outbuf.String(), errbuf.String())
- return fmt.Errorf("git config [filter.lfs.clean -> <> ]: %v\n%s\n%s", err, outbuf.String(), errbuf.String())
- }
- outbuf.Reset()
- errbuf.Reset()
-
- if err := gitConfigCommand().AddArguments("filter.lfs.smudge", "").RunInDirPipeline(tmpBasePath, &outbuf, &errbuf); err != nil {
- log.Error("git config [filter.lfs.smudge -> <> ]: %v\n%s\n%s", err, outbuf.String(), errbuf.String())
- return fmt.Errorf("git config [filter.lfs.smudge -> <> ]: %v\n%s\n%s", err, outbuf.String(), errbuf.String())
- }
- outbuf.Reset()
- errbuf.Reset()
-
- if err := gitConfigCommand().AddArguments("core.sparseCheckout", "true").RunInDirPipeline(tmpBasePath, &outbuf, &errbuf); err != nil {
- log.Error("git config [core.sparseCheckout -> true ]: %v\n%s\n%s", err, outbuf.String(), errbuf.String())
- return fmt.Errorf("git config [core.sparsecheckout -> true]: %v\n%s\n%s", err, outbuf.String(), errbuf.String())
- }
- outbuf.Reset()
- errbuf.Reset()
-
- // Read base branch index
- if err := git.NewCommand("read-tree", "HEAD").RunInDirPipeline(tmpBasePath, &outbuf, &errbuf); err != nil {
- log.Error("git read-tree HEAD: %v\n%s\n%s", err, outbuf.String(), errbuf.String())
- return fmt.Errorf("Unable to read base branch in to the index: %v\n%s\n%s", err, outbuf.String(), errbuf.String())
- }
- outbuf.Reset()
- errbuf.Reset()
-
- // Determine if we should sign
- signArg := ""
- if version.Compare(binVersion, "1.7.9", ">=") {
- sign, keyID, _ := pr.SignMerge(doer, tmpBasePath, "HEAD", trackingBranch)
- if sign {
- signArg = "-S" + keyID
- } else if version.Compare(binVersion, "2.0.0", ">=") {
- signArg = "--no-gpg-sign"
- }
- }
-
- sig := doer.NewGitSig()
- commitTimeStr := time.Now().Format(time.RFC3339)
-
- // 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,
- )
-
- // Merge commits.
- cmd := git.NewCommand("merge", "--no-ff", "--no-commit", trackingBranch)
- if err := runMergeCommand(pr, models.MergeStyleMerge, cmd, tmpBasePath); err != nil {
- log.Error("Unable to merge tracking into base: %v", err)
- return err
- }
-
- if err := commitAndSignNoAuthor(pr, message, signArg, tmpBasePath, env); err != nil {
- log.Error("Unable to make final commit: %v", err)
- return err
- }
-
- // OK we should cache our current head and origin/headbranch
- mergeHeadSHA, err := git.GetFullCommitID(tmpBasePath, "HEAD")
- if err != nil {
- return fmt.Errorf("Failed to get full commit id for HEAD: %v", err)
- }
- mergeBaseSHA, err := git.GetFullCommitID(tmpBasePath, "original_"+baseBranch)
- if err != nil {
- return fmt.Errorf("Failed to get full commit id for origin/%s: %v", pr.BaseBranch, err)
- }
-
- // Now it's questionable about where this should go - either after or before the push
- // I think in the interests of data safety - failures to push to the lfs should prevent
- // the merge as you can always remerge.
- if setting.LFS.StartServer {
- if err := LFSPush(tmpBasePath, mergeHeadSHA, mergeBaseSHA, pr); err != nil {
- return err
- }
- }
-
- var headUser *models.User
- err = pr.HeadRepo.GetOwner()
- if err != nil {
- if !models.IsErrUserNotExist(err) {
- log.Error("Can't find user: %d for head repository - %v", pr.HeadRepo.OwnerID, err)
- return err
- }
- log.Error("Can't find user: %d for head repository - defaulting to doer: %s - %v", pr.HeadRepo.OwnerID, doer.Name, err)
- headUser = doer
- } else {
- headUser = pr.HeadRepo.Owner
- }
-
- env = models.FullPushingEnvironment(
- headUser,
- doer,
- pr.BaseRepo,
- pr.BaseRepo.Name,
- pr.ID,
- )
-
- // Push back to upstream.
- if err := git.NewCommand("push", "origin", baseBranch+":"+pr.BaseBranch).RunInDirTimeoutEnvPipeline(env, -1, tmpBasePath, &outbuf, &errbuf); err != nil {
- if strings.Contains(errbuf.String(), "non-fast-forward") {
- return models.ErrMergePushOutOfDate{
- Style: models.MergeStyleMerge,
- StdOut: outbuf.String(),
- StdErr: errbuf.String(),
- Err: err,
- }
- }
- return fmt.Errorf("git push: %s", errbuf.String())
- }
- outbuf.Reset()
- errbuf.Reset()
//notification.NotifyPullRequestUpdated(pr, doer)
//trigger hooks and co ..
From 9249d47ba456fc8a2ca691d061c69b44942ae981 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Thu, 16 Jan 2020 13:37:13 +0100
Subject: [PATCH 07/35] own function to get Diverging of PRs
---
routers/repo/pull.go | 2 +-
services/pull/update.go | 81 +++++++++++++++++++++++++++++++++++++++++
2 files changed, 82 insertions(+), 1 deletion(-)
diff --git a/routers/repo/pull.go b/routers/repo/pull.go
index eb7b7ed11ac1..7db65e322894 100644
--- a/routers/repo/pull.go
+++ b/routers/repo/pull.go
@@ -342,7 +342,7 @@ func PrepareViewPullInfo(ctx *context.Context, issue *models.Issue) *git.Compare
setMergeTarget(ctx, pull)
- divergence, divergenceError := repofiles.CountDivergingCommits(repo, pull.HeadBranch)
+ divergence, divergenceError := pull_service.GetDiverging(pull)
if divergenceError != nil {
ctx.ServerError("CountDivergingCommits", divergenceError)
return nil
diff --git a/services/pull/update.go b/services/pull/update.go
index 9b9d160e8957..48c499e34c4c 100644
--- a/services/pull/update.go
+++ b/services/pull/update.go
@@ -6,8 +6,11 @@ package pull
import (
"fmt"
+ "strconv"
+ "strings"
"code.gitea.io/gitea/models"
+ "code.gitea.io/gitea/modules/git"
"code.gitea.io/gitea/modules/log"
)
@@ -29,6 +32,17 @@ func Update(pull *models.PullRequest, doer *models.User, message string) (err er
return fmt.Errorf("LoadBaseRepo: %v", err)
}
+ diffCount, err := GetDiverging(pull)
+ if err != nil {
+ return err
+ } else if diffCount.Behind == 0 {
+ return fmt.Errorf("HeadBranch of PR %d is up to date", pull.Index)
+ }
+
+ defer func() {
+ go AddTestPullRequestTask(doer, pr.HeadRepo.ID, pr.HeadBranch, false, "", "")
+ }()
+
if err := rawMerge(pr, doer, models.MergeStyleMerge, message); err != nil {
return err
}
@@ -49,3 +63,70 @@ func IsUserAllowedToUpdate(pull *models.PullRequest, p models.Permission, user *
}
return IsUserAllowedToMerge(pr, p, user)
}
+
+// GetDiverging determines how many commits a PR is ahead or behind the PR base branch
+func GetDiverging(pr *models.PullRequest) (*git.DivergeObject, error) {
+ log.Trace("PushToBaseRepo[%d]: pushing commits to base repo '%s'", pr.BaseRepoID, pr.GetGitRefName())
+
+ if pr.BaseRepo == nil {
+ if err := pr.LoadBaseRepo(); err != nil {
+ return nil, err
+ }
+ }
+ if pr.HeadRepo == nil {
+ if err := pr.LoadHeadRepo(); err != nil {
+ return nil, err
+ }
+ }
+
+ headRepoPath := pr.HeadRepo.RepoPath()
+ headGitRepo, err := git.OpenRepository(headRepoPath)
+ if err != nil {
+ return nil, fmt.Errorf("OpenRepository: %v", err)
+ }
+ defer headGitRepo.Close()
+
+ if pr.BaseRepoID == pr.HeadRepoID {
+ diff, err := git.GetDivergingCommits(pr.HeadRepo.RepoPath(), pr.BaseBranch, pr.HeadBranch)
+ return &diff, err
+ }
+
+ tmpRemoteName := fmt.Sprintf("tmp-pull-%d-base", pr.ID)
+ if err = headGitRepo.AddRemote(tmpRemoteName, pr.BaseRepo.RepoPath(), true); err != nil {
+ return nil, fmt.Errorf("headGitRepo.AddRemote: %v", err)
+ }
+ // Make sure to remove the remote even if the push fails
+ defer func() {
+ if err := headGitRepo.RemoveRemote(tmpRemoteName); err != nil {
+ log.Error("CountDiverging: RemoveRemote: %s", err)
+ }
+ }()
+
+ // $(git rev-list --count tmp-pull-1-base/master..feature) commits ahead of master
+ ahead, errorAhead := checkDivergence(headRepoPath, fmt.Sprintf("%s/%s", tmpRemoteName, pr.BaseBranch), pr.HeadBranch)
+ if errorAhead != nil {
+ return &git.DivergeObject{}, errorAhead
+ }
+
+ // $(git rev-list --count feature..tmp-pull-1-base/master) commits behind master
+ behind, errorBehind := checkDivergence(headRepoPath, pr.HeadBranch, fmt.Sprintf("%s/%s", tmpRemoteName, pr.BaseBranch))
+ if errorBehind != nil {
+ return &git.DivergeObject{}, errorBehind
+ }
+
+ return &git.DivergeObject{ahead, behind}, nil
+}
+
+func checkDivergence(repoPath string, baseBranch string, targetBranch string) (int, error) {
+ branches := fmt.Sprintf("%s..%s", baseBranch, targetBranch)
+ cmd := git.NewCommand("rev-list", "--count", branches)
+ stdout, err := cmd.RunInDir(repoPath)
+ if err != nil {
+ return -1, err
+ }
+ outInteger, errInteger := strconv.Atoi(strings.Trim(stdout, "\n"))
+ if errInteger != nil {
+ return -1, errInteger
+ }
+ return outInteger, nil
+}
From 454ee44ecab38f61974c2fc193839d33407152d5 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Thu, 16 Jan 2020 13:40:35 +0100
Subject: [PATCH 08/35] use FlashError
---
routers/repo/pull.go | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/routers/repo/pull.go b/routers/repo/pull.go
index 7db65e322894..139c62671b3f 100644
--- a/routers/repo/pull.go
+++ b/routers/repo/pull.go
@@ -658,8 +658,8 @@ func UpdatePullRequest(ctx *context.Context) {
ctx.Redirect(ctx.Repo.RepoLink + "/pulls/" + com.ToStr(issue.Index))
return
}
- ctx.ServerError("Update", err)
- return
+ ctx.Flash.Error(err.Error())
+ ctx.Redirect(ctx.Repo.RepoLink + "/pulls/" + com.ToStr(issue.Index))
}
}
From 5d5d919c0f3e078509b5791114bce7660b0baf50 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Thu, 16 Jan 2020 14:17:33 +0100
Subject: [PATCH 09/35] correct Error Msg
---
routers/repo/pull.go | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/routers/repo/pull.go b/routers/repo/pull.go
index 139c62671b3f..e2a29b2e32a1 100644
--- a/routers/repo/pull.go
+++ b/routers/repo/pull.go
@@ -344,13 +344,13 @@ func PrepareViewPullInfo(ctx *context.Context, issue *models.Issue) *git.Compare
divergence, divergenceError := pull_service.GetDiverging(pull)
if divergenceError != nil {
- ctx.ServerError("CountDivergingCommits", divergenceError)
+ ctx.ServerError("GetDiverging", divergenceError)
return nil
}
ctx.Data["Divergence"] = divergence
if err := pull.LoadProtectedBranch(); err != nil {
- ctx.ServerError("GetLatestCommitStatus", err)
+ ctx.ServerError("LoadProtectedBranch", err)
return nil
}
ctx.Data["EnableStatusCheck"] = pull.ProtectedBranch != nil && pull.ProtectedBranch.EnableStatusCheck
From 3c6157b360389820be7684e559e12c955c3da7e0 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Thu, 16 Jan 2020 15:28:50 +0100
Subject: [PATCH 10/35] hook is triggerd ... so remove comment
---
services/pull/update.go | 3 ---
1 file changed, 3 deletions(-)
diff --git a/services/pull/update.go b/services/pull/update.go
index 48c499e34c4c..07bb5e4b28aa 100644
--- a/services/pull/update.go
+++ b/services/pull/update.go
@@ -47,9 +47,6 @@ func Update(pull *models.PullRequest, doer *models.User, message string) (err er
return err
}
- //notification.NotifyPullRequestUpdated(pr, doer)
- //trigger hooks and co ..
-
return nil
}
From 88fa4c5430b8e0686efd0c20587c769d8760f6c6 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Thu, 16 Jan 2020 15:42:34 +0100
Subject: [PATCH 11/35] add "branch2" to "user2/repo1" because it unit-test
"TestPullView_ReviewerMissed" use it but dont exist jet :/
---
.../5c/050d3b6d2db231ab1f64e324f1b6b9a0b181c2 | Bin 0 -> 833 bytes
.../7c/4df115542e05c700f297519e906fd63c9c9804 | Bin 0 -> 54 bytes
.../a7/57c0ea621e63d0fd6fc353a175fdc7199e5d1d | Bin 0 -> 61 bytes
.../user2/repo1.git/refs/heads/branch2 | 1 +
.../user2/repo1.git/refs/pull/2/head | 1 +
5 files changed, 2 insertions(+)
create mode 100644 integrations/gitea-repositories-meta/user2/repo1.git/objects/5c/050d3b6d2db231ab1f64e324f1b6b9a0b181c2
create mode 100644 integrations/gitea-repositories-meta/user2/repo1.git/objects/7c/4df115542e05c700f297519e906fd63c9c9804
create mode 100644 integrations/gitea-repositories-meta/user2/repo1.git/objects/a7/57c0ea621e63d0fd6fc353a175fdc7199e5d1d
create mode 100644 integrations/gitea-repositories-meta/user2/repo1.git/refs/heads/branch2
create mode 100644 integrations/gitea-repositories-meta/user2/repo1.git/refs/pull/2/head
diff --git a/integrations/gitea-repositories-meta/user2/repo1.git/objects/5c/050d3b6d2db231ab1f64e324f1b6b9a0b181c2 b/integrations/gitea-repositories-meta/user2/repo1.git/objects/5c/050d3b6d2db231ab1f64e324f1b6b9a0b181c2
new file mode 100644
index 0000000000000000000000000000000000000000..c0cb626359e600503128d5c65213dd0fcb1c1fcf
GIT binary patch
literal 833
zcmV-H1HSxt0gY41vf@Sn%h_MicPepvZFg1PRJ?*0zzZ16&2BFk?+XU}^?5V7<}fq6jgcr3p#+l!~A8y&J#%JO}>%$^UdoHa5@luQdAs
z7y)5M`c`?cfeeHc`BiMrem_z4#Z(sH&!15At$6_M)&+sNJ;#r+$4d`gIRSeT~dGqh!M1d;D_H44<0IfA%
z{pwSywwLMNcl7Af!XB1~Q@ztT>FQkfb~#`%HXP}sux3o$9vvyb`IDfe%=#(j`W58j
z^>m%um?fTXsMdzH(EILi501YC%=k&9lZM{vO54?VOd?}84-~LA1hK6eEf1YUN70zy
z!{}+)DHvM0q=ZR2)JCp6bd00u*x_}(tDVN~diC(UI6IXBQU~X7yK6M2*Dr-#mgKeA
zd(I%;>Kc_j!ciW3E$n))DeKu9%)D7WTgB!&L{(I@6!7fevzD(+>8m?^8qyML{Vj_M
z^4SSt%1xJ*#*@Um!(s+Of@kG%uULZNXim~4j1mgyp-pZ3pI&r&~3
KjKQ-*P#yphauiYk
literal 0
HcmV?d00001
diff --git a/integrations/gitea-repositories-meta/user2/repo1.git/objects/a7/57c0ea621e63d0fd6fc353a175fdc7199e5d1d b/integrations/gitea-repositories-meta/user2/repo1.git/objects/a7/57c0ea621e63d0fd6fc353a175fdc7199e5d1d
new file mode 100644
index 0000000000000000000000000000000000000000..c3111a08b847838e2f8aac8f97e9ab2dad37bad9
GIT binary patch
literal 61
zcmV-D0K)%x0ZYosPf{>7Wl&ZqN-fAY=A|ekXC&sO
Tr-DV3iW2jZGmN+Zc=HrE6jK^Y
literal 0
HcmV?d00001
diff --git a/integrations/gitea-repositories-meta/user2/repo1.git/refs/heads/branch2 b/integrations/gitea-repositories-meta/user2/repo1.git/refs/heads/branch2
new file mode 100644
index 000000000000..38c6ece20765
--- /dev/null
+++ b/integrations/gitea-repositories-meta/user2/repo1.git/refs/heads/branch2
@@ -0,0 +1 @@
+5c050d3b6d2db231ab1f64e324f1b6b9a0b181c2
diff --git a/integrations/gitea-repositories-meta/user2/repo1.git/refs/pull/2/head b/integrations/gitea-repositories-meta/user2/repo1.git/refs/pull/2/head
new file mode 100644
index 000000000000..98593d653703
--- /dev/null
+++ b/integrations/gitea-repositories-meta/user2/repo1.git/refs/pull/2/head
@@ -0,0 +1 @@
+4a357436d925b5c974181ff12a994538ddc5a269
From 77767380e6a990be78dd8e1ed7d4e413d73a7574 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Thu, 16 Jan 2020 15:53:31 +0100
Subject: [PATCH 12/35] move GetPerm to IsUserAllowedToUpdate
---
routers/repo/pull.go | 8 +-------
services/pull/update.go | 9 +++++++--
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/routers/repo/pull.go b/routers/repo/pull.go
index e2a29b2e32a1..2c85d2887be4 100644
--- a/routers/repo/pull.go
+++ b/routers/repo/pull.go
@@ -620,13 +620,7 @@ func UpdatePullRequest(ctx *context.Context) {
return
}
- headRepoPerm, err := models.GetUserRepoPermission(issue.PullRequest.HeadRepo, ctx.User)
- if err != nil {
- ctx.ServerError("GetUserRepoPermission", err)
- return
- }
-
- allowedUpdate, err := pull_service.IsUserAllowedToUpdate(issue.PullRequest, headRepoPerm, ctx.User)
+ allowedUpdate, err := pull_service.IsUserAllowedToUpdate(issue.PullRequest, ctx.User)
if err != nil {
ctx.ServerError("IsUserAllowedToMerge", err)
return
diff --git a/services/pull/update.go b/services/pull/update.go
index 07bb5e4b28aa..ea6b4c1ac565 100644
--- a/services/pull/update.go
+++ b/services/pull/update.go
@@ -51,14 +51,19 @@ func Update(pull *models.PullRequest, doer *models.User, message string) (err er
}
// IsUserAllowedToUpdate check if user is allowed to update PR with given permissions and branch protections
-func IsUserAllowedToUpdate(pull *models.PullRequest, p models.Permission, user *models.User) (bool, error) {
+func IsUserAllowedToUpdate(pull *models.PullRequest, user *models.User) (bool, error) {
+ headRepoPerm, err := models.GetUserRepoPermission(pull.HeadRepo, user)
+ if err != nil {
+ return false, err
+ }
+
pr := &models.PullRequest{
HeadRepoID: pull.BaseRepoID,
BaseRepoID: pull.HeadRepoID,
HeadBranch: pull.BaseBranch,
BaseBranch: pull.HeadBranch,
}
- return IsUserAllowedToMerge(pr, p, user)
+ return IsUserAllowedToMerge(pr, headRepoPerm, user)
}
// GetDiverging determines how many commits a PR is ahead or behind the PR base branch
From e3adbd274143a97dc4a268a7e6ff0e0ff4e7fd8f Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Thu, 16 Jan 2020 16:30:25 +0100
Subject: [PATCH 13/35] add Flash Success MSG
---
options/locale/locale_en-US.ini | 1 +
routers/repo/pull.go | 2 ++
2 files changed, 3 insertions(+)
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 2075f98d26a6..261a4996bfb3 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -1083,6 +1083,7 @@ pulls.status_checking = Some checks are pending
pulls.status_checks_success = All checks were successful
pulls.status_checks_error = Some checks failed
pulls.update_branch = Update Branch
+pulls.update_branch_success = Update Branch was successful
milestones.new = New Milestone
milestones.open_tab = %d Open
diff --git a/routers/repo/pull.go b/routers/repo/pull.go
index 2c85d2887be4..a89ce79873d5 100644
--- a/routers/repo/pull.go
+++ b/routers/repo/pull.go
@@ -655,6 +655,8 @@ func UpdatePullRequest(ctx *context.Context) {
ctx.Flash.Error(err.Error())
ctx.Redirect(ctx.Repo.RepoLink + "/pulls/" + com.ToStr(issue.Index))
}
+ ctx.Flash.Success(ctx.Tr("repo.pulls.update_branch_success"))
+ ctx.Redirect(ctx.Repo.RepoLink + "/pulls/" + com.ToStr(issue.Index))
}
// MergePullRequest response for merging pull request
From 05c0c1b71f79cab4b611b3f6061460755dd89dba Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Thu, 16 Jan 2020 16:47:30 +0100
Subject: [PATCH 14/35] imprufe code - remove useless js chage
---
routers/routes/routes.go | 2 +-
templates/repo/issue/view_content/pull.tmpl | 11 +++++++----
web_src/js/index.js | 11 -----------
3 files changed, 8 insertions(+), 16 deletions(-)
diff --git a/routers/routes/routes.go b/routers/routes/routes.go
index 7e81f55de60f..057fd7328b74 100644
--- a/routers/routes/routes.go
+++ b/routers/routes/routes.go
@@ -855,7 +855,7 @@ func RegisterRoutes(m *macaron.Macaron) {
m.Get(".patch", repo.DownloadPullPatch)
m.Get("/commits", context.RepoRef(), repo.ViewPullCommits)
m.Post("/merge", context.RepoMustNotBeArchived(), reqRepoPullsWriter, bindIgnErr(auth.MergePullRequestForm{}), repo.MergePullRequest)
- m.Post("/update", repo.UpdatePullRequest)
+ m.Post("/update", ignSignInAndCsrf, repo.UpdatePullRequest)
m.Post("/cleanup", context.RepoMustNotBeArchived(), context.RepoRef(), repo.CleanUpPullRequest)
m.Group("/files", func() {
m.Get("", context.RepoRef(), repo.SetEditorconfigIfExists, repo.SetDiffViewStyle, repo.SetWhitespaceBehavior, repo.ViewPullFiles)
diff --git a/templates/repo/issue/view_content/pull.tmpl b/templates/repo/issue/view_content/pull.tmpl
index 7249c58c8d1f..4a416c0860e4 100644
--- a/templates/repo/issue/view_content/pull.tmpl
+++ b/templates/repo/issue/view_content/pull.tmpl
@@ -269,11 +269,14 @@
- {{if gt .Divergence.Behind 0}}
+ {{if and .Divergence (gt .Divergence.Behind 0)}}