Merge branch 'NeogitOrg:master' into margin

Author: lucasadelino

README.md

@@ -38,6 +38,7 @@ Here's an example spec for [Lazy](https://github.com/folke/lazy.nvim), but you'r
     "nvim-telescope/telescope.nvim", -- optional
     "ibhagwan/fzf-lua",              -- optional
     "echasnovski/mini.pick",         -- optional
+    "folke/snacks.nvim",             -- optional
   },
 }
 ```
@@ -101,13 +102,7 @@ neogit.setup {
   -- Scope persisted settings on a per-project basis
   use_per_project_settings = true,
   -- Table of settings to never persist. Uses format "Filetype--cli-value"
-  ignored_settings = {
-    "NeogitPushPopup--force-with-lease",
-    "NeogitPushPopup--force",
-    "NeogitPullPopup--rebase",
-    "NeogitCommitPopup--allow-empty",
-    "NeogitRevertPopup--no-edit",
-  },
+  ignored_settings = {},
   -- Configure highlight group features
   highlight = {
     italic = true,
@@ -128,6 +123,14 @@ neogit.setup {
   initial_branch_name = "",
   -- Change the default way of opening neogit
   kind = "tab",
+  -- Floating window style 
+  floating = {
+    relative = "editor",
+    width = 0.8,
+    height = 0.7,
+    style = "minimal",
+    border = "rounded",
+  },
   -- Disable line numbers
   disable_line_numbers = true,
   -- Disable relative line numbers
@@ -238,6 +241,11 @@ neogit.setup {
     -- is also selected then telescope is used instead
     -- Requires you to have `echasnovski/mini.pick` installed.
     mini_pick = nil,
+
+    -- If enabled, uses snacks.picker for menu selection. If the telescope integration
+    -- is also selected then telescope is used instead
+    -- Requires you to have `folke/snacks.nvim` installed.
+    snacks = nil,
   },
   sections = {
     -- Reverting/Cherry Picking

doc/neogit.txt

@@ -128,13 +128,7 @@ to Neovim users.
     -- Scope persisted settings on a per-project basis
     use_per_project_settings = true,
     -- Table of settings to never persist. Uses format "Filetype--cli-value"
-    ignored_settings = {
-        "NeogitPushPopup--force-with-lease",
-        "NeogitPushPopup--force",
-        "NeogitPullPopup--rebase",
-        "NeogitCommitPopup--allow-empty",
-        "NeogitRevertPopup--no-edit",
-    },
+    ignored_settings = {},
     -- Configure highlight group features
     highlight = {
         italic = true,
@@ -155,6 +149,14 @@ to Neovim users.
     initial_branch_name = "",
     -- Change the default way of opening neogit
     kind = "tab",
+    -- Floating window style 
+    floating = {
+      relative = "editor",
+      width = 0.8,
+      height = 0.7,
+      style = "minimal",
+      border = "rounded",
+    },
     -- Disable line numbers
     disable_line_numbers = true,
     -- Disable relative line numbers
@@ -265,6 +267,11 @@ to Neovim users.
         -- is also selected then telescope is used instead
         -- Requires you to have `echasnovski/mini.pick` installed.
         mini_pick = nil,
+
+        -- If enabled, uses snacks.picker for menu selection. If the telescope integration
+        -- is also selected then telescope is used instead
+        -- Requires you to have `folke/snacks.nvim` installed.
+        snacks = nil,
     },
     sections = {
         -- Reverting/Cherry Picking
@@ -2136,5 +2143,21 @@ calling the setup function:
       },
     })
 <
+
+You can also customize existing popups via the Neogit config.
+Below is an example of adding a custom switch, but you can use any function 
+from the builder API. 
+>lua
+    require("neogit").setup({
+      builders = {
+        NeogitPushPopup = function(builder)
+          builder:switch('m', 'merge_request.create', 'Create merge request', { cli_prefix = '-o ', persisted = false })
+        end,
+      },
+    })
+
+Keep in mind that builder hooks are executed at the end of the popup 
+builder, so any switches or options added will be placed at the end.
+
 ------------------------------------------------------------------------------
 vim:tw=78:ts=8:ft=help:norl:

lua/neogit.lua

@@ -186,6 +186,7 @@ end
 ---@return function
 function M.action(popup, action, args)
   local util = require("neogit.lib.util")
+  local git = require("neogit.lib.git")
   local a = require("plenary.async")
 
   args = args or {}
@@ -202,15 +203,19 @@ function M.action(popup, action, args)
       if ok then
         local fn = actions[action]
         if fn then
-          fn {
-            state = { env = {} },
-            get_arguments = function()
-              return args
-            end,
-            get_internal_arguments = function()
-              return internal_args
-            end,
-          }
+          local action = function()
+            fn {
+              state = { env = {} },
+              get_arguments = function()
+                return args
+              end,
+              get_internal_arguments = function()
+                return internal_args
+              end,
+            }
+          end
+
+          git.repo:dispatch_refresh { source = "action", callback = action }
         else
           M.notification.error(
             string.format(

lua/neogit/buffers/status/actions.lua

@@ -1077,10 +1077,6 @@ M.n_stage = function(self)
                 if not git.merge.is_conflicted(selection.item.name) then
                   git.status.stage { selection.item.name }
                   self:dispatch_refresh({ update_diffs = { "*:" .. selection.item.name } }, "n_stage")
-
-                  if not git.merge.any_conflicted() then
-                    popups.open("merge")()
-                  end
                 end
               end,
             },

lua/neogit/client.lua

@@ -64,13 +64,7 @@ function M.client(opts)
   local client = fn.serverstart()
   logger.debug(("[CLIENT] Client address: %s"):format(client))
 
-  local lua_cmd =
-    fmt('lua require("neogit.client").editor("%s", "%s", %s)', file_target, client, opts.show_diff)
-
-  if vim.uv.os_uname().sysname == "Windows_NT" then
-    lua_cmd = lua_cmd:gsub("\\", "/")
-  end
-
+  local lua_cmd = fmt('lua require("neogit.client").editor(%q, %q, %s)', file_target, client, opts.show_diff)
   local rpc_server = RPC.create_connection(nvim_server)
   rpc_server:send_cmd(lua_cmd)
 end

lua/neogit/config.lua

@@ -102,6 +102,15 @@ end
 ---@class NeogitConfigPopup Popup window options
 ---@field kind WindowKind The type of window that should be opened
 
+---@class NeogitConfigFloating
+---@field relative? string
+---@field width? number
+---@field height? number
+---@field col? number
+---@field row? number
+---@field style? string
+---@field border? string
+
 ---@alias StagedDiffSplitKind
 ---| "split" Open in a split
 ---| "vsplit" Open in a vertical split
@@ -332,6 +341,7 @@ end
 ---@field sort_branches? string Value used for `--sort` for the `git branch` command
 ---@field initial_branch_name? string Default for new branch name prompts
 ---@field kind? WindowKind The default type of window neogit should open in
+---@field floating? NeogitConfigFloating The floating window style
 ---@field disable_line_numbers? boolean Whether to disable line numbers
 ---@field disable_relative_line_numbers? boolean Whether to disable line numbers
 ---@field console_timeout? integer Time in milliseconds after a console is created for long running commands
@@ -353,13 +363,14 @@ end
 ---@field preview_buffer? NeogitConfigPopup Preview options
 ---@field popup? NeogitConfigPopup Set the default way of opening popups
 ---@field signs? NeogitConfigSigns Signs used for toggled regions
----@field integrations? { diffview: boolean, telescope: boolean, fzf_lua: boolean, mini_pick: boolean } Which integrations to enable
+---@field integrations? { diffview: boolean, telescope: boolean, fzf_lua: boolean, mini_pick: boolean, snacks: boolean } Which integrations to enable
 ---@field sections? NeogitConfigSections
 ---@field ignored_settings? string[] Settings to never persist, format: "Filetype--cli-value", i.e. "NeogitCommitPopup--author"
 ---@field mappings? NeogitConfigMappings
 ---@field notification_icon? string
 ---@field use_default_keymaps? boolean
 ---@field highlight? HighlightOptions
+---@field builders? { [string]: fun(builder: PopupBuilder) }
 
 ---Returns the default Neogit configuration
 ---@return NeogitConfig
@@ -393,6 +404,13 @@ function M.get_default_values()
     fetch_after_checkout = false,
     sort_branches = "-committerdate",
     kind = "tab",
+    floating = {
+      relative = "editor",
+      width = 0.8,
+      height = 0.7,
+      style = "minimal",
+      border = "rounded",
+    },
     initial_branch_name = "",
     disable_line_numbers = true,
     disable_relative_line_numbers = true,
@@ -483,6 +501,7 @@ function M.get_default_values()
       diffview = nil,
       fzf_lua = nil,
       mini_pick = nil,
+      snacks = nil,
     },
     sections = {
       sequencer = {
@@ -534,13 +553,7 @@ function M.get_default_values()
         hidden = false,
       },
     },
-    ignored_settings = {
-      "NeogitPushPopup--force-with-lease",
-      "NeogitPushPopup--force",
-      "NeogitPullPopup--rebase",
-      "NeogitPullPopup--force",
-      "NeogitCommitPopup--allow-empty",
-    },
+    ignored_settings = {},
     mappings = {
       commit_editor = {
         ["q"] = "Close",
@@ -793,7 +806,7 @@ function M.validate_config()
   end
 
   local function validate_integrations()
-    local valid_integrations = { "diffview", "telescope", "fzf_lua", "mini_pick" }
+    local valid_integrations = { "diffview", "telescope", "fzf_lua", "mini_pick", "snacks" }
     if not validate_type(config.integrations, "integrations", "table") or #config.integrations == 0 then
       return
     end
@@ -1138,6 +1151,13 @@ function M.validate_config()
     validate_type(config.notification_icon, "notification_icon", "string")
     validate_type(config.console_timeout, "console_timeout", "number")
     validate_kind(config.kind, "kind")
+    if validate_type(config.floating, "floating", "table") then
+      validate_type(config.floating.relative, "relative", "string")
+      validate_type(config.floating.width, "width", "number")
+      validate_type(config.floating.height, "height", "number")
+      validate_type(config.floating.style, "style", "string")
+      validate_type(config.floating.border, "border", "string")
+    end
     validate_type(config.disable_line_numbers, "disable_line_numbers", "boolean")
     validate_type(config.disable_relative_line_numbers, "disable_relative_line_numbers", "boolean")
     validate_type(config.auto_show_console, "auto_show_console", "boolean")

lua/neogit/lib/buffer.lua

@@ -5,6 +5,7 @@ local util = require("neogit.lib.util")
 
 local signs = require("neogit.lib.signs")
 local Ui = require("neogit.lib.ui")
+local config = require("neogit.config")
 
 local Path = require("plenary.path")
 
@@ -317,24 +318,22 @@ function Buffer:show()
     elseif self.kind == "vsplit_left" then
       win = api.nvim_open_win(self.handle, true, { split = "left", vertical = true })
     elseif self.kind == "floating" then
-      -- Creates the border window
+      local width = config.values.floating.width
+      local height = config.values.floating.height
       local vim_height = vim.o.lines
       local vim_width = vim.o.columns
-
-      local width = math.floor(vim_width * 0.8) + 3
-      local height = math.floor(vim_height * 0.7)
-      local col = vim_width * 0.1 - 1
-      local row = vim_height * 0.15
+      width = width > 1 and width or math.floor(vim_width * width)
+      height = height > 1 and height or math.floor(vim_height * height)
 
       local content_window = api.nvim_open_win(self.handle, true, {
-        relative = "editor",
         width = width,
         height = height,
-        col = col,
-        row = row,
-        style = "minimal",
+        relative = config.values.floating.relative,
+        border = config.values.floating.border,
+        style = config.values.floating.style,
+        col = config.values.floating.col or (vim_width - width) / 2,
+        row = config.values.floating.row or (vim_height - height) / 2,
         focusable = true,
-        border = "rounded",
       })
 
       api.nvim_win_set_cursor(content_window, { 1, 0 })
@@ -431,7 +430,12 @@ end
 
 function Buffer:set_buffer_option(name, value)
   if self.handle ~= nil then
-    api.nvim_set_option_value(name, value, { scope = "local" })
+    -- TODO: Remove this at some point. Nvim 0.10 throws an error if using both buf and scope
+    if vim.fn.has("nvim-0.11") == 1 then
+      api.nvim_set_option_value(name, value, { scope = "local", buf = self.handle })
+    else
+      api.nvim_set_option_value(name, value, { buf = self.handle })
+    end
   end
 end
 
@@ -718,8 +722,8 @@ function Buffer.create(config)
   end
 
   if config.status_column then
-    buffer:set_buffer_option("statuscolumn", config.status_column)
-    buffer:set_buffer_option("signcolumn", "no")
+    buffer:set_window_option("statuscolumn", config.status_column)
+    buffer:set_window_option("signcolumn", "no")
   end
 
   if config.user_mappings then
@@ -907,7 +911,7 @@ function Buffer.create(config)
   end
 
   if config.foldmarkers then
-    buffer:set_buffer_option("signcolumn", "auto")
+    buffer:set_window_option("signcolumn", "auto")
 
     logger.debug("[BUFFER:" .. buffer.handle .. "] Setting up foldmarkers")
     buffer:create_namespace("FoldSigns")