lunny/gitea
Archived
1
1
Fork 1
Code Issues 1.7k Pull Requests 154 Projects Releases 128 Wiki Activity

Add checkbox to delete pull branch after successful merge #16049

Merged
lunny merged 18 commits from delete-pull-branch-on-merge into main 2021-07-12 23:26:25 +00:00
Conversation 0 Commits 18 Files Changed 14 +182 -44
jpraet commented 2021-06-02 07:07:01 +00:00
Contributor
Copy Link

Fixes #13568

Fixes #13568
❤️ 4
zeripath reviewed 2021-06-29 21:26:43 +00:00
routers/web/repo/pull.go
zeripath commented 2021-06-29 21:26:43 +00:00
Contributor

You already have the pull request, and git repo open which means that at least until 1204 is already done.

You already have the pull request, and git repo open which means that at least until 1204 is already done.
jpraet reviewed 2021-06-29 22:07:08 +00:00
routers/web/repo/pull.go
jpraet commented 2021-06-29 22:07:08 +00:00
Author
Contributor

I'll see if I can do some cleanup to avoid these unnecessary operations.
How can I access the already opened repo of the PR head?

I'll see if I can do some cleanup to avoid these unnecessary operations. How can I access the already opened repo of the PR head?
jpraet reviewed 2021-06-29 22:11:46 +00:00
routers/api/v1/repo/pull.go
jpraet commented 2021-06-29 22:11:46 +00:00
Author
Contributor

After reflecting on https://github.com/go-gitea/gitea/pull/16049#discussion_r660996140, I think this is wrong.
This only works if the pr head branch is in the same repo.
We need to delete the branch on pr.HeadRepo instead of ctx.Repo.Repository.

After reflecting on https://github.com/go-gitea/gitea/pull/16049#discussion_r660996140, I think this is wrong. This only works if the pr head branch is in the same repo. We need to delete the branch on pr.HeadRepo instead of ctx.Repo.Repository.
jpraet reviewed 2021-06-30 19:47:21 +00:00
services/pull/pull.go
@ -306,1 +306,3 @@
log.Error("GetDiverging: %v", err)
if models.IsErrBranchDoesNotExist(err) && !git.IsBranchExist(pr.HeadRepo.RepoPath(), pr.HeadBranch) {
log.Warn("Cannot test PR %s/%d: head_branch %s no longer exists", pr.BaseRepo.Name, pr.IssueID, pr.HeadBranch)
} else {
jpraet commented 2021-06-30 19:47:21 +00:00
Author
Contributor

I no longer observe this warning when testing this feature on my local instance, whereas previously I saw it most of the time.
Maybe it has been fixed by another PR. Should I revert these changes to the error handling?

I no longer observe this warning when testing this feature on my local instance, whereas previously I saw it most of the time. Maybe it has been fixed by another PR. Should I revert these changes to the error handling?
zeripath reviewed 2021-06-30 20:18:51 +00:00
services/pull/pull.go
@ -306,1 +306,3 @@
log.Error("GetDiverging: %v", err)
if models.IsErrBranchDoesNotExist(err) && !git.IsBranchExist(pr.HeadRepo.RepoPath(), pr.HeadBranch) {
log.Warn("Cannot test PR %s/%d: head_branch %s no longer exists", pr.BaseRepo.Name, pr.IssueID, pr.HeadBranch)
} else {
zeripath commented 2021-06-30 20:18:51 +00:00
Contributor

leave it in.

leave it in.
zeripath approved these changes 2021-07-05 05:24:08 +00:00
6543 (Migrated from github.com) approved these changes 2021-07-12 23:01:16 +00:00
This repo is archived. You cannot comment on pull requests.
Reviewers
No reviewers
zeripath
6543
Labels
Clear labels   
backport/done

   
backport/v1.0

   
backport/v1.1

   
backport/v1.10

   
backport/v1.11

   
backport/v1.12

   
backport/v1.13

   
backport/v1.14

   
backport/v1.15

   
backport/v1.2

   
backport/v1.3

   
backport/v1.4

   
backport/v1.5

   
backport/v1.6

   
backport/v1.7

   
backport/v1.8

   
backport/v1.9

   
bounty

   
changelog

   
dependencies

Pull requests that update a dependency file

  
frontport/done

   
frontport/main

   
good first issue

Likely to be an easy fix

  
Hacktoberfest

   
hacktoberfest-accepted

   
in progress

   
kind/api

   
kind/breaking

   
kind/bug

   
kind/build

   
kind/deployment

   
kind/deprecated

   
kind/docs

   
kind/enhancement

   
kind/feature

   
kind/lint

   
kind/misc

   
kind/moderation

features for moderateing spam, abuse, ...

  
kind/package

   
kind/proposal

   
kind/question

   
kind/refactor

   
kind/regression

   
kind/security

   
kind/summary

   
kind/testing

   
kind/translation

   
kind/ui

   
kind/upstream-related

An issue that is caused by an upstream dependency

  
kind/usability

   
kind/ux

   
lgtm/done

   
lgtm/need 1

   
lgtm/need 2

   
performance/bigrepo

Performance Issues affecting Big Repositories

  
performance/cpu

   
performance/memory

Performance issues affecting memory use

  
performance/speed

performance issues with slow downs

  
priority/critical

   
priority/low

   
priority/maybe

   
priority/medium

   
proposal/rejected

   
reviewed/confirmed

Issue has been reviewed and confirmed to be present or accepted to be implemented

  
reviewed/duplicate

   
reviewed/fixed

A fix for this issue is already in the attached milestone

  
reviewed/invalid

   
reviewed/not-a-bug

The reported issue is the intended behavior

  
reviewed/wontfix

   
skip-changelog

   
stale

   
status/blocked

   
status/needs-feedback

   
status/wip

   
theme/2fa

   
theme/authentication

   
theme/avatar

   
theme/backup-restore

   
theme/docker

Docker themed issued

  
theme/federation

   
theme/issues

   
theme/kanban

   
theme/markdown

   
theme/migration

Migration issues

  
theme/mobile

   
theme/pr

   
theme/signing

   
theme/sqlite

   
theme/timetracker

   
theme/webhook

   
theme/wiki
No Label
backport/done
backport/v1.0
backport/v1.1
backport/v1.10
backport/v1.11
backport/v1.12
backport/v1.13
backport/v1.14
backport/v1.15
backport/v1.2
backport/v1.3
backport/v1.4
backport/v1.5
backport/v1.6
backport/v1.7
backport/v1.8
backport/v1.9
bounty
changelog
dependencies
frontport/done
frontport/main
good first issue
Hacktoberfest
hacktoberfest-accepted
in progress
kind/api
kind/breaking
kind/bug
kind/build
kind/deployment
kind/deprecated
kind/docs
kind/enhancement
kind/feature
kind/lint
kind/misc
kind/moderation
kind/package
kind/proposal
kind/question
kind/refactor
kind/regression
kind/security
kind/summary
kind/testing
kind/translation
kind/ui
kind/upstream-related
kind/usability
kind/ux
lgtm/done
lgtm/need 1
lgtm/need 2
performance/bigrepo
performance/cpu
performance/memory
performance/speed
priority/critical
priority/low
priority/maybe
priority/medium
proposal/rejected
reviewed/confirmed
reviewed/duplicate
reviewed/fixed
reviewed/invalid
reviewed/not-a-bug
reviewed/wontfix
skip-changelog
stale
status/blocked
status/needs-feedback
status/wip
theme/2fa
theme/authentication
theme/avatar
theme/backup-restore
theme/docker
theme/federation
theme/issues
theme/kanban
theme/markdown
theme/migration
theme/mobile
theme/pr
theme/signing
theme/sqlite
theme/timetracker
theme/webhook
theme/wiki
Milestone
Clear milestone
No items
No Milestone
1.15.0
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
3 Participants
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: lunny/gitea#16049
No description provided.
Delete Branch "delete-pull-branch-on-merge"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?