feat(forge): MergePR on the SDK, GitHub and Gitea forges

This commit is contained in:
sam committed 2026-10-05 21:36:07 +11:00
1 parent ca1bd1de11
commit ee9271e7cf
6 files changed
+390 -231

No files matched your search

+6
View File
@@ -351,6 +351,12 @@ func (c *GiteaClient) ClosePR(ctx context.Context, owner, repo string, number in
return err
}
// MergePR merges a pull request with a merge commit.
func (c *GiteaClient) MergePR(ctx context.Context, owner, repo string, number int) error {
_, _, err := c.cli.MergePullRequest(owner, repo, int64(number), gitea.MergePullRequestOption{Style: gitea.MergeStyleMerge})
return err
}
// React adds an emoji reaction to an issue.
func (c *GiteaClient) React(ctx context.Context, owner, repo string, number int, reaction string) error {
_, _, err := c.cli.PostIssueReaction(owner, repo, int64(number), reaction)
+6
View File
@@ -363,6 +363,12 @@ func (c *GitHubClient) ClosePR(ctx context.Context, owner, repo string, number i
return err
}
// MergePR merges a pull request with the repository's default method.
func (c *GitHubClient) MergePR(ctx context.Context, owner, repo string, number int) error {
_, _, err := c.gh.PullRequests.Merge(ctx, owner, repo, number, "", nil)
return err
}
// LinkBranch associates a branch with an issue (GitHub stub -- Gitea is primary).
func (c *GitHubClient) LinkBranch(ctx context.Context, owner, repo string, issueNumber int, branch string) error {
return nil
+2
View File
@@ -40,6 +40,8 @@ type Forge interface {
// ClosePR closes a pull request without merging, with an optional final
// comment.
ClosePR(ctx context.Context, owner, repo string, number int, comment string) error
// MergePR merges a pull request with the forge's default method.
MergePR(ctx context.Context, owner, repo string, number int) error
AcceptInvitations(ctx context.Context) error
VerifyPush(ctx context.Context, owner, repo string) error
LinkBranch(ctx context.Context, owner, repo string, issueNumber int, branch string) error
+8
View File
@@ -155,6 +155,14 @@ func (s *server) ClosePR(ctx context.Context, r *forgev1.ClosePRRequest) (*forge
return &forgev1.ClosePRResponse{}, fail(f.ClosePR(ctx, r.GetRepo().GetOwner(), r.GetRepo().GetRepo(), int(r.GetNumber()), r.GetComment()))
}
func (s *server) MergePR(ctx context.Context, r *forgev1.MergePRRequest) (*forgev1.MergePRResponse, error) {
f, err := s.forge()
if err != nil {
return nil, err
}
return &forgev1.MergePRResponse{}, fail(f.MergePR(ctx, r.GetRepo().GetOwner(), r.GetRepo().GetRepo(), int(r.GetNumber())))
}
func (s *server) GetPullRequest(ctx context.Context, r *forgev1.GetPullRequestRequest) (*forgev1.GetPullRequestResponse, error) {
c, err := capability[PullRequestReader](s)
if err != nil {
+330 -231
View File
File diff suppressed because it is too large. Load diff
+38
View File
@@ -29,6 +29,7 @@ const (
ForgeService_CreatePR_FullMethodName = "/forge.v1.ForgeService/CreatePR"
ForgeService_PRState_FullMethodName = "/forge.v1.ForgeService/PRState"
ForgeService_ClosePR_FullMethodName = "/forge.v1.ForgeService/ClosePR"
ForgeService_MergePR_FullMethodName = "/forge.v1.ForgeService/MergePR"
ForgeService_GetPullRequest_FullMethodName = "/forge.v1.ForgeService/GetPullRequest"
ForgeService_GetPullRequestDiff_FullMethodName = "/forge.v1.ForgeService/GetPullRequestDiff"
ForgeService_ListReviews_FullMethodName = "/forge.v1.ForgeService/ListReviews"
@@ -65,6 +66,7 @@ type ForgeServiceClient interface {
CreatePR(ctx context.Context, in *CreatePRRequest, opts ...grpc.CallOption) (*CreatePRResponse, error)
PRState(ctx context.Context, in *PRStateRequest, opts ...grpc.CallOption) (*PRStateResponse, error)
ClosePR(ctx context.Context, in *ClosePRRequest, opts ...grpc.CallOption) (*ClosePRResponse, error)
MergePR(ctx context.Context, in *MergePRRequest, opts ...grpc.CallOption) (*MergePRResponse, error)
GetPullRequest(ctx context.Context, in *GetPullRequestRequest, opts ...grpc.CallOption) (*GetPullRequestResponse, error)
GetPullRequestDiff(ctx context.Context, in *GetPullRequestDiffRequest, opts ...grpc.CallOption) (*GetPullRequestDiffResponse, error)
ListReviews(ctx context.Context, in *ListReviewsRequest, opts ...grpc.CallOption) (*ListReviewsResponse, error)
@@ -190,6 +192,16 @@ func (c *forgeServiceClient) ClosePR(ctx context.Context, in *ClosePRRequest, op
return out, nil
}
func (c *forgeServiceClient) MergePR(ctx context.Context, in *MergePRRequest, opts ...grpc.CallOption) (*MergePRResponse, error) {
cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
out := new(MergePRResponse)
err := c.cc.Invoke(ctx, ForgeService_MergePR_FullMethodName, in, out, cOpts...)
if err != nil {
return nil, err
}
return out, nil
}
func (c *forgeServiceClient) GetPullRequest(ctx context.Context, in *GetPullRequestRequest, opts ...grpc.CallOption) (*GetPullRequestResponse, error) {
cOpts := append([]grpc.CallOption{grpc.StaticMethod()}, opts...)
out := new(GetPullRequestResponse)
@@ -332,6 +344,7 @@ type ForgeServiceServer interface {
CreatePR(context.Context, *CreatePRRequest) (*CreatePRResponse, error)
PRState(context.Context, *PRStateRequest) (*PRStateResponse, error)
ClosePR(context.Context, *ClosePRRequest) (*ClosePRResponse, error)
MergePR(context.Context, *MergePRRequest) (*MergePRResponse, error)
GetPullRequest(context.Context, *GetPullRequestRequest) (*GetPullRequestResponse, error)
GetPullRequestDiff(context.Context, *GetPullRequestDiffRequest) (*GetPullRequestDiffResponse, error)
ListReviews(context.Context, *ListReviewsRequest) (*ListReviewsResponse, error)
@@ -387,6 +400,9 @@ func (UnimplementedForgeServiceServer) PRState(context.Context, *PRStateRequest)
func (UnimplementedForgeServiceServer) ClosePR(context.Context, *ClosePRRequest) (*ClosePRResponse, error) {
return nil, status.Error(codes.Unimplemented, "method ClosePR not implemented")
}
func (UnimplementedForgeServiceServer) MergePR(context.Context, *MergePRRequest) (*MergePRResponse, error) {
return nil, status.Error(codes.Unimplemented, "method MergePR not implemented")
}
func (UnimplementedForgeServiceServer) GetPullRequest(context.Context, *GetPullRequestRequest) (*GetPullRequestResponse, error) {
return nil, status.Error(codes.Unimplemented, "method GetPullRequest not implemented")
}
@@ -621,6 +637,24 @@ func _ForgeService_ClosePR_Handler(srv interface{}, ctx context.Context, dec fun
return interceptor(ctx, in, info, handler)
}
func _ForgeService_MergePR_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
in := new(MergePRRequest)
if err := dec(in); err != nil {
return nil, err
}
if interceptor == nil {
return srv.(ForgeServiceServer).MergePR(ctx, in)
}
info := &grpc.UnaryServerInfo{
Server: srv,
FullMethod: ForgeService_MergePR_FullMethodName,
}
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
return srv.(ForgeServiceServer).MergePR(ctx, req.(*MergePRRequest))
}
return interceptor(ctx, in, info, handler)
}
func _ForgeService_GetPullRequest_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
in := new(GetPullRequestRequest)
if err := dec(in); err != nil {
@@ -859,6 +893,10 @@ var ForgeService_ServiceDesc = grpc.ServiceDesc{
MethodName: "ClosePR",
Handler: _ForgeService_ClosePR_Handler,
},
{
MethodName: "MergePR",
Handler: _ForgeService_MergePR_Handler,
},
{
MethodName: "GetPullRequest",
Handler: _ForgeService_GetPullRequest_Handler,