gitea/tea
gitea/tea
56
129
Fork 64
Code Issues 97 Pull Requests 19 Actions Releases 16 Activity

Support auto detecting branch for PRs #525

Open
harryzcy wants to merge 17 commits from harryzcy/tea:fix-524 into main
pull from: harryzcy/tea:fix-524
merge into: gitea:main
Conversation 2 Commits 17 Files Changed 3 +120 -12
harryzcy commented 2023-01-04 08:24:06 +00:00
First-time contributor
Copy Link

Fix #524

Fix #524
harryzcy added 1 commit 2023-01-04 08:24:07 +00:00
Support auto detecting branch for PRs
Some checks failed
continuous-integration/drone/pr Build is failing
Details
bff965e84c
harryzcy added 1 commit 2023-01-04 19:29:19 +00:00
Make function unexported
All checks were successful
continuous-integration/drone/pr Build is passing
Details
e4ff7b8397
lunny reviewed 2023-01-06 07:58:23 +00:00
cmd/pulls/merge.go Outdated
@ -71,0 +92,4 @@
}
for _, pr := range prs {
if pr.Head.Ref == branch {
lunny commented 2023-01-06 07:58:23 +00:00
Owner
Copy Link

Maybe we should list multiple PRs in terminal and user could chose one.

Maybe we should list multiple PRs in terminal and user could chose one.
harryzcy marked this conversation as resolved
harryzcy added 1 commit 2023-01-07 22:47:28 +00:00
List multiple PRs and offer choice
All checks were successful
continuous-integration/drone/pr Build is passing
Details
5a0ac6e1e8
lunny reviewed 2023-01-09 05:15:48 +00:00
cmd/pulls/merge.go Outdated
@ -71,0 +87,4 @@
func getPullIndex(ctx *context.TeaContext, branch string) (int64, error) {
prs, _, err := ctx.Login.Client().ListRepoPullRequests(ctx.Owner, ctx.Repo, gitea.ListPullRequestsOptions{
State: gitea.StateOpen,
lunny commented 2023-01-09 05:15:48 +00:00
Owner
Copy Link

You can send HeadBranch or BaseBranch as options.

You can send `HeadBranch` or `BaseBranch` as options.
harryzcy commented 2023-01-11 04:56:54 +00:00
Author
First-time contributor
Copy Link

I don't see that in ListPullRequestsOptions

// ListPullRequestsOptions options for listing pull requests
type ListPullRequestsOptions struct {
	ListOptions
	State StateType `json:"state"`
	// oldest, recentupdate, leastupdate, mostcomment, leastcomment, priority
	Sort      string
	Milestone int64
}
I don't see that in `ListPullRequestsOptions` ```go // ListPullRequestsOptions options for listing pull requests type ListPullRequestsOptions struct { ListOptions State StateType `json:"state"` // oldest, recentupdate, leastupdate, mostcomment, leastcomment, priority Sort string Milestone int64 } ```
6543 marked this conversation as resolved
lunny reviewed 2023-01-09 05:18:13 +00:00
cmd/pulls/merge.go Outdated
@ -71,0 +108,4 @@
// then get the rest of the PRs
i := 1
for _, pr := range prs {
if pr.Head.Ref != branch {
lunny commented 2023-01-09 05:18:13 +00:00
Owner
Copy Link

We will get all pull requests which base branch or head branch is the current branch via ListRepoPullRequests. So maybe you mean pr.Base.Ref == branch?

We will get all pull requests which base branch or head branch is the current branch via `ListRepoPullRequests`. So maybe you mean `pr.Base.Ref == branch`?
harryzcy marked this conversation as resolved
harryzcy added 1 commit 2023-01-11 04:54:14 +00:00
Update branch filtering
All checks were successful
continuous-integration/drone/pr Build is passing
Details
783d167f37
jolheiser reviewed 2023-02-09 04:30:33 +00:00
cmd/pulls/merge.go Outdated
@ -71,0 +119,4 @@
Options: prOptions,
PageSize: 10,
}
survey.AskOne(q, &selected)
jolheiser commented 2023-02-09 04:28:40 +00:00
Owner
Copy Link

This error should probably be checked.

This error should probably be checked.
harryzcy marked this conversation as resolved
6543 added 1 commit 2023-02-15 22:01:07 +00:00
Merge branch 'main' into fix-524
All checks were successful
continuous-integration/drone/pr Build is passing
Details
90e98063c8
6543 added 1 commit 2023-02-15 22:25:58 +00:00
Merge branch 'main' into fix-524
All checks were successful
continuous-integration/drone/pr Build is passing
Details
f7587619f8
harryzcy added 1 commit 2023-02-21 19:48:19 +00:00
Check command line prompt error
All checks were successful
continuous-integration/drone/pr Build is passing
Details
26a5c6bc49
harryzcy added 1 commit 2023-02-21 19:50:09 +00:00
Merge branch 'main' into fix-524
All checks were successful
continuous-integration/drone/pr Build is passing
Details
8f0f19c5f8
6543 reviewed 2023-03-21 02:35:17 +00:00
cmd/pulls/merge.go Outdated
@ -71,0 +114,4 @@
}
selected := ""
q := &survey.Select{
6543 commented 2023-03-21 02:35:17 +00:00
Owner
Copy Link

if it gets interactive it should go into https://gitea.com/gitea/tea/src/branch/main/modules/interact

if it gets interactive it should go into https://gitea.com/gitea/tea/src/branch/main/modules/interact
harryzcy marked this conversation as resolved
6543 added 1 commit 2023-04-02 21:52:03 +00:00
Merge branch 'main' into fix-524
All checks were successful
check-and-test / check-and-test (pull_request) Successful in 1m55s
Details
807fd93554
harryzcy added 1 commit 2023-04-03 22:49:38 +00:00
Move interactive part to interact package
Some checks failed
check-and-test / check-and-test (pull_request) Failing after 1m7s
Details
86bb8dbcb8
harryzcy added 1 commit 2023-04-03 22:50:55 +00:00
Merge branch 'main' into fix-524
Some checks failed
check-and-test / check-and-test (pull_request) Failing after 28s
Details
80e4b17749
6543 added the
kind
feature
 label 2023-04-04 04:35:12 +00:00
6543 added this to the v0.10.0 milestone 2023-04-04 04:35:16 +00:00
6543 commented 2023-04-04 04:36:08 +00:00
Owner
Copy Link

CI tell us we have a lint issue

CI tell us we have a lint issue
harryzcy added 1 commit 2023-04-18 03:42:49 +00:00
Add copyright to fix lint
All checks were successful
check-and-test / check-and-test (pull_request) Successful in 33s
Details
3ce904ec7d
harryzcy added 1 commit 2023-04-18 03:43:42 +00:00
Merge branch 'main' into fix-524
All checks were successful
check-and-test / check-and-test (pull_request) Successful in 30s
Details
6413d72c22
harryzcy commented 2023-04-18 03:44:13 +00:00
Author
First-time contributor
Copy Link

CI tell us we have a lint issue

Fixed

> CI tell us we have a lint issue Fixed
appleboy requested changes 2023-05-04 08:54:12 +00:00
cmd/pulls/merge.go
@ -54,2 +55,4 @@
// If no PR index is provided, try interactive mode
return interact.MergePull(ctx)
}
appleboy commented 2023-05-04 08:53:44 +00:00
Member
Copy Link
if ctx.Args().Len() != 1 {
  return interact.MergePull(ctx)
}

for more readable.

```go if ctx.Args().Len() != 1 { return interact.MergePull(ctx) } ``` for more readable.
harryzcy commented 2023-05-06 18:06:00 +00:00
Author
First-time contributor
Copy Link

Fixed in 9fdfb1

Fixed in [9fdfb1](https://gitea.com/gitea/tea/commit/9fdfb1debca52f14bffeb68290a99e1ceadd202a)
lunny marked this conversation as resolved
modules/interact/pull_merge.go Outdated
@ -0,0 +1,90 @@
// Copyright 2020 The Gitea Authors. All rights reserved.
appleboy commented 2023-05-04 08:51:42 +00:00
Member
Copy Link

change to 2023?

change to 2023?
harryzcy commented 2023-05-06 18:05:35 +00:00
Author
First-time contributor
Copy Link

Fixed in 96ccce

Fixed in [96ccce](https://gitea.com/gitea/tea/commit/96cccedd3767ff5caa231edb1458d7652b3d6807)
lunny marked this conversation as resolved
modules/task/pull_merge.go Outdated
@ -0,0 +1,25 @@
// Copyright 2020 The Gitea Authors. All rights reserved.
appleboy commented 2023-05-04 08:51:58 +00:00
Member
Copy Link

change to 2023

change to 2023
harryzcy commented 2023-05-06 18:05:25 +00:00
Author
First-time contributor
Copy Link

Fixed in 96ccce

Fixed in [96ccce](https://gitea.com/gitea/tea/commit/96cccedd3767ff5caa231edb1458d7652b3d6807)
lunny marked this conversation as resolved
harryzcy added 1 commit 2023-05-06 18:02:02 +00:00
Change copyright to 2023
All checks were successful
check-and-test / check-and-test (pull_request) Successful in 1m33s
Details
96cccedd37
harryzcy added 1 commit 2023-05-06 18:03:36 +00:00
Readibility update
All checks were successful
check-and-test / check-and-test (pull_request) Successful in 51s
Details
9fdfb1debc
harryzcy added 1 commit 2023-06-24 02:19:33 +00:00
Merge branch 'main' into fix-524
All checks were successful
check-and-test / check-and-test (pull_request) Successful in 1m37s
Details
404439f8fd
6543 reviewed 2023-07-05 18:35:16 +00:00
modules/interact/pull_merge.go
@ -0,0 +40,4 @@
// getPullIndex interactively determines the PR index
func getPullIndex(ctx *context.TeaContext, branch string) (int64, error) {
prs, _, err := ctx.Login.Client().ListRepoPullRequests(ctx.Owner, ctx.Repo, gitea.ListPullRequestsOptions{
6543 commented 2023-07-05 18:35:16 +00:00
Owner
Copy Link

paginate over api ...

paginate over api ...
6543 added 1 commit 2024-02-15 14:55:40 +00:00
Merge branch 'main' into fix-524
Some checks failed
check-and-test / check-and-test (pull_request) Failing after 24s
Details
6f81e5135b
Some checks failed
check-and-test / check-and-test (pull_request) Failing after 24s
Required
Details
This pull request doesn't have enough approvals yet. 0 of 1 approvals granted.
This branch is out-of-date with the base branch
You are not authorized to merge this pull request.
View command line instructions.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u fix-524:harryzcy-fix-524
git checkout harryzcy-fix-524
Sign in to join this conversation.
Reviewers
No reviewers
appleboy
Labels
Clear labels   
kind/breaking

   
kind/bug

   
kind/build

   
kind/dependency

   
kind/deployment

   
kind/docs
  
kind
enhancement

  
kind
feature

  
kind/proposal
  
kind
question

  
kind
refactor

  
kind/security

   
kind/testing

   
kind/translation

   
priority/critical

   
priority/high

   
priority/low

   
priority/medium

   
reviewed/duplicate

   
reviewed/invalid

   
reviewed/wontfix

   
skip-changelog

   
status/blocked

   
status/has-backport

   
status/has-pull

   
status/needs-backport

   
status/needs-feedback

   
status/needs-reviews

   
status/wip

   
upstream/gitea

   
upstream/sdk
No Label
kind/breaking
kind/bug
kind/build
kind/dependency
kind/deployment
kind/docs
kind
enhancement
kind
feature
kind/proposal
kind
question
kind
refactor
kind/security
kind/testing
kind/translation
priority/critical
priority/high
priority/low
priority/medium
reviewed/duplicate
reviewed/invalid
reviewed/wontfix
skip-changelog
status/blocked
status/has-backport
status/has-pull
status/needs-backport
status/needs-feedback
status/needs-reviews
status/wip
upstream/gitea
upstream/sdk
Milestone
Clear milestone
No items
No Milestone
v0.10.0
Assignees
Clear assignees
No Assignees
5 Participants
Notifications
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: gitea/tea#525
No description provided.
Delete Branch "harryzcy/tea:fix-524"

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?