Merge branch 'TimUntersberger:master' into fix/turn-it-back-to-gitcommit-filetype

Author: vinibispo

Makefile

@@ -1,5 +1,5 @@
 test:
-	NEOGIT_LOG_CONSOLE=true NEOGIT_LOG_LEVEL="debug" nvim --headless --noplugin -c "lua require(\"plenary.test_harness\").test_directory_command('tests {minimal_init = \"tests/minimal-init.nvim\"}')"
+	NEOGIT_LOG_CONSOLE=true NEOGIT_LOG_LEVEL="debug" nvim --headless -c "lua require('plenary.test_harness').test_directory('./tests//', {minimal_init='./tests/init.lua', sequential=true})"
 
 lint:
 	selene --config selene/config.toml lua

README.md

@@ -33,7 +33,7 @@ neogit.setup {}
 
 ## Usage
 
-You can either open neogit by using the `Neogit` command 
+You can either open neogit by using the `Neogit` command
 
 ```vim
 :Neogit " uses tab
@@ -112,13 +112,17 @@ neogit.setup {
   disable_hint = false,
   disable_context_highlighting = false,
   disable_commit_confirmation = false,
-  -- Neogit refreshes its internal state after specific events, which can be expensive depending on the repository size. 
+  -- Neogit refreshes its internal state after specific events, which can be expensive depending on the repository size.
   -- Disabling `auto_refresh` will make it so you have to manually refresh the status after you open it.
   auto_refresh = true,
   disable_builtin_notifications = false,
   use_magit_keybindings = false,
   -- Change the default way of opening neogit
   kind = "tab",
+  -- The time after which an output console is shown for slow running commands
+  console_timeout = 2000,
+  -- Automatically show console if a command takes more than console_timeout milliseconds
+  auto_show_console = true,
   -- Change the default way of opening the commit popup
   commit_popup = {
     kind = "split",
@@ -139,15 +143,15 @@ neogit.setup {
     -- The diffview integration enables the diff popup, which is a wrapper around `sindrets/diffview.nvim`.
     --
     -- Requires you to have `sindrets/diffview.nvim` installed.
-    -- use { 
-    --   'TimUntersberger/neogit', 
-    --   requires = { 
+    -- use {
+    --   'TimUntersberger/neogit',
+    --   requires = {
     --     'nvim-lua/plenary.nvim',
-    --     'sindrets/diffview.nvim' 
+    --     'sindrets/diffview.nvim'
     --   }
     -- }
     --
-    diffview = false  
+    diffview = false
   },
   -- Setting any section to `false` will make the section not render at all
   sections = {
@@ -311,11 +315,11 @@ The todo file does not represent ALL of the missing features. This file just sho
 
 ## Testing
 
-Assure that you have [plenary.nvim](https://github.com/nvim-lua/plenary.nvim) 
+Assure that you have [plenary.nvim](https://github.com/nvim-lua/plenary.nvim)
 installed as a plugin for your neovim instance. Afterwards, run `make test`
 to run the unit test suite.
 
 Plenary uses it's own port of busted and a bundled luassert, so consult their
-code and the respective [busted](http://olivinelabs.com/busted/) and 
-[luassert](http://olivinelabs.com/busted/#asserts) docs for what methods are 
+code and the respective [busted](http://olivinelabs.com/busted/) and
+[luassert](http://olivinelabs.com/busted/#asserts) docs for what methods are
 available.

lua/neogit/buffers/commit_editor/init.lua

@@ -40,22 +40,23 @@ function M:open()
     modifiable = true,
     readonly = false,
     autocmds = {
-      ["BufWritePost"] = function()
+      ["BufWritePre"] = function()
         written = true
       end,
       ["BufUnload"] = function()
         if written then
           if
-            config.values.disable_commit_confirmation
-            or input.get_confirmation("Are you sure you want to commit?")
+            not config.values.disable_commit_confirmation
+            and not input.get_confirmation("Are you sure you want to commit?")
           then
-            vim.cmd("silent g/^#/d | silent w!")
+            vim.cmd("silent v/^#/d | w!")
           end
         end
 
         if self.on_unload then
           self.on_unload(written)
         end
+
         require("neogit.process").defer_show_preview_buffers()
       end,
     },

lua/neogit/buffers/commit_select_view/init.lua

@@ -12,11 +12,10 @@ local function line_pos()
 end
 
 ---Opens a popup for selecting a commit
----@param commits CommitLogEntry[]
+---@param commits CommitLogEntry[]|nil
 ---@return CommitSelectViewBuffer
-function M.new(commits, action)
+function M.new(commits)
   local instance = {
-    action = action,
     commits = commits,
     buffer = nil,
   }
@@ -33,6 +32,14 @@ end
 
 ---@param action fun(commit: CommitLogEntry|nil)|nil
 function M:open(action)
+  local _, item = require("neogit.status").get_current_section_item()
+
+  local commit_at_cursor
+
+  if item and item.commit then
+    commit_at_cursor = item.commit
+  end
+
   self.buffer = Buffer.create {
     name = "NeogitCommitSelectView",
     filetype = "NeogitCommitSelectView",
@@ -46,7 +53,12 @@ function M:open(action)
               self:close()
             end)
 
-            action(self.commits[pos])
+            if pos == 1 and commit_at_cursor then
+              action(commit_at_cursor)
+            else
+              -- Subtract the top commit and blankline
+              action(self.commits[pos - (commit_at_cursor and 2 or 0)])
+            end
             action = nil
           end
         end,
@@ -61,7 +73,7 @@ function M:open(action)
       end,
     },
     render = function()
-      return ui.View(self.commits)
+      return ui.View(self.commits, commit_at_cursor)
     end,
   }
 end

lua/neogit/buffers/commit_select_view/ui.lua

@@ -1,23 +1,43 @@
 local Ui = require("neogit.lib.ui")
-local util = require("neogit.lib.util")
 
 local row = Ui.row
 local text = Ui.text
-local map = util.map
 
 local M = {}
 
-function M.View(commits)
+function M.View(commits, commit_at_cursor)
   local show_graph = true
-  return map(commits, function(commit)
-    return row {
-      text(commit.oid:sub(1, 7), { highlight = "Number" }),
-      text(" "),
-      text(show_graph and ("* "):rep(commit.level + 1) or "* ", { highlight = "Character" }),
-      text(" "),
-      text(table.concat(commit.description)),
-    }
-  end)
+
+  local res = {}
+  if commit_at_cursor then
+    table.insert(
+      res,
+      row {
+        text(commit_at_cursor.oid:sub(1, 7), { highlight = "Number" }),
+        text(" "),
+        text(show_graph and ("* "):rep(commit_at_cursor.level + 1) or "* ", { highlight = "Character" }),
+        text(" "),
+        text(table.concat(commit_at_cursor.description)),
+      }
+    )
+
+    table.insert(res, row {})
+  end
+
+  for _, commit in ipairs(commits) do
+    table.insert(
+      res,
+      row {
+        text(commit.oid:sub(1, 7), { highlight = "Number" }),
+        text(" "),
+        text(show_graph and ("* "):rep(commit.level + 1) or "* ", { highlight = "Character" }),
+        text(" "),
+        text(table.concat(commit.description)),
+      }
+    )
+  end
+
+  return res
 end
 
 return M

lua/neogit/config.lua

@@ -12,6 +12,8 @@ M.values = {
   kind = "tab",
   -- The time after which an output console is shown for slow running commands
   console_timeout = 2000,
+  -- Automatically show console if a command takes more than console_timeout milliseconds
+  auto_show_console = true,
   status = {
     recent_commit_count = 10,
   },

lua/neogit/lib/git/log.lua

@@ -193,31 +193,33 @@ local function parse_log(output)
   return commits
 end
 
+local M = {}
+
 local function update_recent(state)
   local count = config.values.status.recent_commit_count
   if count < 1 then
     return
   end
 
-  local result = cli.log.oneline.max_count(count).show_popup(false).call():trim()
+  local result = M.list { "--max-count", tostring(count) }
 
-  state.recent.items = util.map(result.stdout, function(x)
-    return { name = x }
+  state.recent.items = util.map(result, function(v)
+    return { name = string.format("%s %s", v.oid, v.description[1] or "<empty>"), oid = v.oid, commit = v }
   end)
 end
 
-return {
-  ---@param options any
-  ---@param max_count number|nil
-  ---@return CommitLogEntry[]
-  list = function(options, max_count)
-    options = util.split(options or "", " ")
-    local result = cli.log.oneline.max_count(max_count or 36).args(unpack(options)).call()
-    return parse_log(result.stdout)
-  end,
-  register = function(meta)
-    meta.update_recent = update_recent
-  end,
-  parse_log = parse_log,
-  parse = parse,
-}
+---@param options any
+---@return CommitLogEntry[]
+function M.list(options)
+  local result = cli.log.oneline.max_count(36).arg_list(options or {}).call()
+  return parse_log(result.stdout)
+end
+
+M.parse_log = parse_log
+M.parse = parse
+
+function M.register(meta)
+  meta.update_recent = update_recent
+end
+
+return M

lua/neogit/lib/git/push.lua

@@ -17,13 +17,12 @@ local function update_unmerged(state)
     return
   end
 
-  local result = cli.log.oneline.for_range("@{upstream}..").show_popup(false).call(false, true):trim().stdout
+  -- local result = cli.log.oneline.for_range("@{upstream}..").show_popup(false).call(false, true):trim().stdout
 
-  state.unmerged.items = util.filter_map(result, function(x)
-    if x == "" then
-      return
-    end
-    return { name = x }
+  local result = require("neogit.lib.git.log").list { "@{upstream}.." }
+
+  state.unmerged.items = util.map(result, function(v)
+    return { name = string.format("%s %s", v.oid, v.description[1] or "<empty>"), oid = v.oid, commit = v }
   end)
 end
 

lua/neogit/lib/git/rebase.lua

@@ -1,6 +1,5 @@
 local logger = require("neogit.logger")
 local client = require("neogit.client")
-local log = require("neogit.lib.git.log")
 local notif = require("neogit.lib.notification")
 
 local M = {}
@@ -11,7 +10,7 @@ local function rebase_command(cmd)
   local git = require("neogit.lib.git")
   cmd = cmd or git.cli.rebase
   local envs = client.get_envs_git_editor()
-  return cmd.env(envs).show_popup(false):in_pty(true).call(true)
+  return cmd.env(envs).show_popup(true):in_pty(true).call(true)
 end
 
 function M.rebase_interactive(...)
@@ -26,10 +25,10 @@ function M.rebase_interactive(...)
   status.refresh(true, "rebase_interactive")
 end
 
-function M.rebase_onto(branch)
+function M.rebase_onto(branch, args)
   a.util.scheduler()
   local git = require("neogit.lib.git")
-  local result = rebase_command(git.cli.rebase.args(branch))
+  local result = rebase_command(git.cli.rebase.args(branch).arg_list(args))
   if result.code ~= 0 then
     notif.create("Rebasing failed. Resolve conflicts before continuing", vim.log.levels.ERROR)
   end

lua/neogit/lib/git/stash.lua

@@ -67,7 +67,7 @@ end
 
 local function update_stashes(state)
   local result = cli.stash.args("list").call():trim()
-  state.stashes.items = parse(result)
+  state.stashes.items = parse(result.stdout)
 end
 
 return {