Bugfixes and Other Minor Improvements

.github/workflows/update-gomod2nix.yaml

@@ -0,0 +1,30 @@
+name: Update gomod2nix
+
+on:
+  push:
+    branches:
+      - develop
+    paths:
+      - go.mod
+      - go.sum
+
+jobs:
+  update:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - uses: actions/checkout@v4
+
+      - uses: cachix/install-nix-action@v27
+        with:
+          nix_path: nixpkgs=channel:nixos-unstable
+
+      - name: Generate gomod2nix.toml
+        run: nix run github:nix-community/gomod2nix -- generate
+
+      - name: Commit updated gomod2nix.toml
+        uses: stefanzweifel/git-auto-commit-action@v5
+        with:
+          commit_message: "chore: update gomod2nix.toml"
+          file_pattern: gomod2nix.toml

README.md

@@ -40,7 +40,7 @@ With <a href="https://github.com/folke/lazy.nvim">Lazy</a>:
   dependencies = {
     "MunifTanjim/nui.nvim",
     "nvim-lua/plenary.nvim",
-    "sindrets/diffview.nvim",
+    "dlyongemallo/diffview.nvim", -- Maintained fork of "sindrets/diffview.nvim".
     "stevearc/dressing.nvim", -- Recommended but not required. Better UI for pickers.
     "nvim-tree/nvim-web-devicons", -- Recommended but not required. Icons in discussion tree.
   },
@@ -59,7 +59,7 @@ And with <a href="https://github.com/lewis6991/pckr.nvim">pckr.nvim</a>:
   requires = {
     "MunifTanjim/nui.nvim",
     "nvim-lua/plenary.nvim",
-    "sindrets/diffview.nvim",
+    "dlyongemallo/diffview.nvim", -- Maintained fork of "sindrets/diffview.nvim".
     "stevearc/dressing.nvim", -- Recommended but not required. Better UI for pickers.
     "nvim-tree/nvim-web-devicons", -- Recommended but not required. Icons in discussion tree.
   },
@@ -73,6 +73,8 @@ And with <a href="https://github.com/lewis6991/pckr.nvim">pckr.nvim</a>:
 
 Add `branch = "develop",` to your configuration if you want to use the (possibly unstable) development version of `gitlab.nvim`.
 
+`gitlab.nvim` uses the `diffview.nvim` plugin for showing the diffs in a MR. We recommend using [dlyongemallo's](https://github.com/dlyongemallo/diffview.nvim) fork which is the de-facto maintained version of the plugin with many fixes and improvements (e.g., marking files as viewed).
+
 ## Contributing
 
 Contributions to the plugin are welcome. Please read [.github/CONTRIBUTING.md](.github/CONTRIBUTING.md) before you start working on a pull request.
@@ -140,6 +142,7 @@ glrd	Delete reviewer
 glA	Approve MR
 glR	Revoke MR approval
 glM	Merge the feature branch to the target branch and close MR
+glm	Set MR to merge automatically when the pipeline succeeds
 glC	Create a new MR for currently checked-out feature branch
 glc	Chose MR for review
 glS	Start review for the currently checked-out branch

cmd/app/client.go

@@ -32,6 +32,7 @@ type Client struct {
 	gitlab.UsersServiceInterface
 	gitlab.DraftNotesServiceInterface
 	gitlab.ProjectMarkdownUploadsServiceInterface
+	gitlab.GraphQLInterface
 }
 
 /* NewClient parses and validates the project settings and initializes the Gitlab client. */
@@ -100,6 +101,7 @@ func NewClient() (*Client, error) {
 		client.Users,
 		client.DraftNotes,
 		client.ProjectMarkdownUploads,
+		client.GraphQL,
 	}, nil
 }
 

cmd/app/list_discussions.go

@@ -2,6 +2,7 @@ package app
 
 import (
 	"net/http"
+	"slices"
 	"sort"
 	"sync"
 	"time"
@@ -90,18 +91,16 @@ func (a discussionsListerService) ServeHTTP(w http.ResponseWriter, r *http.Reque
 		},
 	}
 
-	discussions, res, err := a.client.ListMergeRequestDiscussions(a.projectInfo.ProjectId, a.projectInfo.MergeId, &mergeRequestDiscussionOptions)
+	it, hasErr := gitlab.Scan(func(p gitlab.PaginationOptionFunc) ([]*gitlab.Discussion, *gitlab.Response, error) {
+		return a.client.ListMergeRequestDiscussions(a.projectInfo.ProjectId, a.projectInfo.MergeId, &mergeRequestDiscussionOptions, p)
+	})
+	discussions := slices.Collect(it)
 
-	if err != nil {
+	if err := hasErr(); err != nil {
 		handleError(w, err, "Could not list discussions", http.StatusInternalServerError)
 		return
 	}
 
-	if res.StatusCode >= 300 {
-		handleError(w, GenericError{r.URL.Path}, "Could not list discussions", res.StatusCode)
-		return
-	}
-
 	/* Filter out any discussions started by a blacklisted user
 	and system discussions, then return them sorted by created date */
 	var unlinkedDiscussions []*gitlab.Discussion
@@ -124,7 +123,7 @@ func (a discussionsListerService) ServeHTTP(w http.ResponseWriter, r *http.Reque
 
 	/* Collect IDs in order to fetch emojis */
 	var noteIds []int64
-	for _, discussion := range discussions {
+	for _, discussion := range slices.Concat(linkedDiscussions, unlinkedDiscussions) {
 		for _, note := range discussion.Notes {
 			noteIds = append(noteIds, note.ID)
 		}

cmd/app/list_discussions_test.go

@@ -127,17 +127,6 @@ func TestListDiscussions(t *testing.T) {
 		data, _ := getFailData(t, svc, request)
 		checkErrorFromGitlab(t, data, "Could not list discussions")
 	})
-	t.Run("Handles non-200s from Gitlab client", func(t *testing.T) {
-		request := makeRequest(t, http.MethodPost, "/mr/discussions/list", DiscussionsRequest{Blacklist: []string{}})
-		svc := middleware(
-			discussionsListerService{testProjectData, fakeDiscussionsLister{testBase: testBase{status: http.StatusSeeOther}}},
-			withMr(testProjectData, fakeMergeRequestLister{}),
-			withPayloadValidation(methodToPayload{http.MethodPost: newPayload[DiscussionsRequest]}),
-			withMethodCheck(http.MethodPost),
-		)
-		data, _ := getFailData(t, svc, request)
-		checkNon200(t, data, "Could not list discussions", "/mr/discussions/list")
-	})
 	t.Run("Handles error from emoji service", func(t *testing.T) {
 		request := makeRequest(t, http.MethodPost, "/mr/discussions/list", DiscussionsRequest{Blacklist: []string{}})
 		svc := middleware(

cmd/app/merge_mr.go

@@ -8,6 +8,7 @@ import (
 )
 
 type AcceptMergeRequestRequest struct {
+	AutoMerge     bool   `json:"auto_merge"`
 	DeleteBranch  bool   `json:"delete_branch"`
 	SquashMessage string `json:"squash_message"`
 	Squash        bool   `json:"squash"`
@@ -27,6 +28,7 @@ func (a mergeRequestAccepterService) ServeHTTP(w http.ResponseWriter, r *http.Re
 	payload := r.Context().Value(payload("payload")).(*AcceptMergeRequestRequest)
 
 	opts := gitlab.AcceptMergeRequestOptions{
+		AutoMerge:                &payload.AutoMerge,
 		Squash:                   &payload.Squash,
 		ShouldRemoveSourceBranch: &payload.DeleteBranch,
 	}
@@ -47,7 +49,13 @@ func (a mergeRequestAccepterService) ServeHTTP(w http.ResponseWriter, r *http.Re
 		return
 	}
 
-	response := SuccessResponse{Message: "MR merged successfully"}
+	var message string
+	if payload.AutoMerge {
+		message = "MR set to be merged when all checks pass"
+	} else {
+		message = "MR merged successfully"
+	}
+	response := SuccessResponse{Message: message}
 
 	w.WriteHeader(http.StatusOK)
 

cmd/app/mergeability_checks.go

@@ -0,0 +1,83 @@
+package app
+
+import (
+	"encoding/json"
+	"fmt"
+	"net/http"
+
+	gitlab "gitlab.com/gitlab-org/api/client-go"
+)
+
+type MergeabilityCheck struct {
+	Identifier string `json:"identifier"`
+	Status     string `json:"status"`
+}
+
+type MergeabilityChecksResponse struct {
+	SuccessResponse
+	MergeabilityChecks []*MergeabilityCheck `json:"mergeability_checks"`
+}
+
+type mergeabilityChecksGraphQLResponse struct {
+	Data struct {
+		Project struct {
+			MergeRequest struct {
+				MergeabilityChecks []*MergeabilityCheck `json:"mergeabilityChecks"`
+			} `json:"mergeRequest"`
+		} `json:"project"`
+	} `json:"data"`
+}
+
+const mergeabilityChecksQuery = `
+query GetMergeabilityChecks($projectPath: ID!, $iid: String!) {
+	project(fullPath: $projectPath) {
+		mergeRequest(iid: $iid) {
+			mergeabilityChecks {
+				identifier
+				status
+			}
+		}
+	}
+}
+`
+
+type mergeabilityChecksService struct {
+	data
+	client gitlab.GraphQLInterface
+}
+
+func (a mergeabilityChecksService) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	checks, err := a.fetchMergeabilityChecks()
+	if err != nil {
+		handleError(w, err, "Could not get mergeability checks", http.StatusInternalServerError)
+		return
+	}
+
+	w.WriteHeader(http.StatusOK)
+	response := MergeabilityChecksResponse{
+		SuccessResponse:    SuccessResponse{Message: "Mergeability checks retrieved"},
+		MergeabilityChecks: checks,
+	}
+
+	err = json.NewEncoder(w).Encode(response)
+	if err != nil {
+		handleError(w, err, "Could not encode response", http.StatusInternalServerError)
+	}
+}
+
+func (a mergeabilityChecksService) fetchMergeabilityChecks() ([]*MergeabilityCheck, error) {
+	var response mergeabilityChecksGraphQLResponse
+
+	_, err := a.client.Do(gitlab.GraphQLQuery{
+		Query: mergeabilityChecksQuery,
+		Variables: map[string]any{
+			"projectPath": a.gitInfo.ProjectPath(),
+			"iid":         fmt.Sprintf("%d", a.projectInfo.MergeId),
+		},
+	}, &response)
+	if err != nil {
+		return nil, fmt.Errorf("failed to fetch mergeability checks: %w", err)
+	}
+
+	return response.Data.Project.MergeRequest.MergeabilityChecks, nil
+}

cmd/app/mergeability_checks_test.go

@@ -0,0 +1,121 @@
+package app
+
+import (
+	"encoding/json"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
+	"github.com/harrisoncramer/gitlab.nvim/cmd/app/git"
+	gitlab "gitlab.com/gitlab-org/api/client-go"
+)
+
+type fakeGraphQLClient struct {
+	err      error
+	jsonData []byte
+}
+
+func (f fakeGraphQLClient) Do(query gitlab.GraphQLQuery, response any, options ...gitlab.RequestOptionFunc) (*gitlab.Response, error) {
+	if f.err != nil {
+		return nil, f.err
+	}
+
+	// Actually unmarshal JSON into the response struct
+	if err := json.Unmarshal(f.jsonData, response); err != nil {
+		return nil, err
+	}
+
+	// if resp, ok := response.(mergeabilityChecksGraphQLResponse); ok {
+	// 	resp.Data.Project.MergeRequest.MergeabilityChecks = f.checks
+	// }
+
+	return makeResponse(http.StatusOK), nil
+}
+
+var testMergeabilityData = data{
+	projectInfo: &ProjectInfo{MergeId: 123},
+	gitInfo: &git.GitData{
+		BranchName:  "feature-branch",
+		Namespace:   "test-namespace",
+		ProjectName: "test-project",
+	},
+}
+
+func TestMergeabilityChecksHandler(t *testing.T) {
+	t.Run("Returns mergeability checks", func(t *testing.T) {
+		request := makeRequest(t, http.MethodGet, "/mr/mergeability_checks", nil)
+		client := fakeGraphQLClient{
+			jsonData: []byte(`{
+				"data": {
+					"project": {
+						"mergeRequest": {
+							"mergeabilityChecks": [
+								{"identifier": "CI_MUST_PASS", "status": "SUCCESS"},
+								{"identifier": "CONFLICT", "status": "FAILED"}
+							]
+						}
+					}
+				}
+			}`),
+		}
+		svc := middleware(
+			mergeabilityChecksService{testMergeabilityData, client},
+			withMethodCheck(http.MethodGet),
+		)
+
+		res := httptest.NewRecorder()
+		svc.ServeHTTP(res, request)
+
+		var data MergeabilityChecksResponse
+		err := json.Unmarshal(res.Body.Bytes(), &data)
+		assert(t, err, nil)
+
+		assert(t, data.Message, "Mergeability checks retrieved")
+		assert(t, len(data.MergeabilityChecks), 2)
+		assert(t, data.MergeabilityChecks[0].Identifier, "CI_MUST_PASS")
+		assert(t, data.MergeabilityChecks[0].Status, "SUCCESS")
+		assert(t, data.MergeabilityChecks[1].Identifier, "CONFLICT")
+		assert(t, data.MergeabilityChecks[1].Status, "FAILED")
+	})
+
+	t.Run("Returns empty list when there are no checks", func(t *testing.T) {
+		request := makeRequest(t, http.MethodGet, "/mr/mergeability_checks", nil)
+		client := fakeGraphQLClient{
+			jsonData: []byte(`{
+				"data": {
+					"project": {
+						"mergeRequest": {
+							"mergeabilityChecks": []
+						}
+					}
+				}
+			}`),
+		}
+		svc := middleware(
+			mergeabilityChecksService{testMergeabilityData, client},
+			withMethodCheck(http.MethodGet),
+		)
+
+		res := httptest.NewRecorder()
+		svc.ServeHTTP(res, request)
+
+		var data MergeabilityChecksResponse
+		err := json.Unmarshal(res.Body.Bytes(), &data)
+		assert(t, err, nil)
+
+		assert(t, data.Message, "Mergeability checks retrieved")
+		assert(t, len(data.MergeabilityChecks), 0)
+	})
+
+	t.Run("Handles errors from Gitlab client", func(t *testing.T) {
+		request := makeRequest(t, http.MethodGet, "/mr/mergeability_checks", nil)
+		client := fakeGraphQLClient{err: errorFromGitlab}
+		svc := middleware(
+			mergeabilityChecksService{testMergeabilityData, client},
+			withMethodCheck(http.MethodGet),
+		)
+		data, _ := getFailData(t, svc, request)
+		assert(t, data.Message, "Could not get mergeability checks")
+		assert(t, data.Details, "failed to fetch mergeability checks: "+errorFromGitlab.Error())
+	})
+}

cmd/app/server.go

@@ -134,6 +134,11 @@ func CreateRouter(gitlabClient *Client, projectInfo *ProjectInfo, s *shutdownSer
 		withMr(d, gitlabClient),
 		withMethodCheck(http.MethodGet),
 	))
+	m.HandleFunc("/mr/info/mergeability", middleware(
+		mergeabilityChecksService{d, gitlabClient},
+		withMr(d, gitlabClient),
+		withMethodCheck(http.MethodGet),
+	))
 	m.HandleFunc("/mr/assignee", middleware(
 		assigneesService{d, gitlabClient},
 		withMr(d, gitlabClient),