NeogitOrg · CKolkey · Jun 25, 2023 · Jun 25, 2023 · Jun 25, 2023 · Jun 25, 2023
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,6 @@ tmp/
 
 # Generated files
 doc/tags
+
+# direnv config
+.envrc
diff --git a/lua/neogit.lua b/lua/neogit.lua
@@ -33,8 +33,6 @@ local setup = function(opts)
 
   hl.setup()
   signs.setup()
-  state.setup()
-
   require("neogit.autocmds").setup()
 end
 
@@ -66,6 +64,8 @@ local open = function(opts)
     end
   end
 
+  state.setup()
+
   if opts[1] ~= nil then
     local popup_name = opts[1]
     local has_pop, popup = pcall(require, "neogit.popups." .. popup_name)

diff --git a/lua/neogit/autocmds.lua b/lua/neogit/autocmds.lua
@@ -1,39 +1,13 @@
 local M = {}
 
 local api = vim.api
-local a = require("plenary.async")
-local status = require("neogit.status")
-local fs = require("neogit.lib.fs")
 local group = require("neogit").autocmd_group
 
 function M.setup()
   api.nvim_create_autocmd({ "ColorScheme" }, {
     callback = require("neogit.lib.hl").setup,
     group = group,
   })
-
-  api.nvim_create_autocmd({ "BufWritePost", "ShellCmdPost", "VimResume" }, {
-    callback = function(o)
-      -- Skip update if the buffer is not open
-      if not status.status_buffer then
-        return
-      end
-
-      -- Do not trigger on neogit buffers such as commit
-      if api.nvim_buf_get_option(o.buf, "filetype"):find("Neogit") then
-        return
-      end
-
-      a.run(function()
-        local path = fs.relpath_from_repository(o.file)
-        if not path then
-          return
-        end
-        status.refresh({ status = true, diffs = { "*:" .. path } }, string.format("%s:%s", o.event, o.file))
-      end, function() end)
-    end,
-    group = group,
-  })
 end
 
 return M
diff --git a/lua/neogit/client.lua b/lua/neogit/client.lua
@@ -103,9 +103,6 @@ function M.wrap(cmd, opts)
   else
     notif.create(opts.msg.fail)
   end
-
-  a.util.scheduler()
-  require("neogit.status").refresh(true, opts.refresh)
 end
 
 return M
diff --git a/lua/neogit/integrations/diffview.lua b/lua/neogit/integrations/diffview.lua
@@ -9,7 +9,6 @@ local dv_lib = require("diffview.lib")
 local dv_utils = require("diffview.utils")
 
 local neogit = require("neogit")
-local status = require("neogit.status")
 local a = require("plenary.async")
 
 local old_config
@@ -132,7 +131,7 @@ local function get_local_diff_view(selected_file_name)
   }
 
   view:on_files_staged(a.void(function(_)
-    status.refresh({ status = true, diffs = true }, "on_files_staged")
+    require("neogit.status").update()
     view:update_files()
   end))
 

diff --git a/lua/neogit/lib/git.lua b/lua/neogit/lib/git.lua
@@ -1,24 +1,24 @@
 return {
-  repo = require("neogit.lib.git.repository"),
+  branch = require("neogit.lib.git.branch"),
+  cherry_pick = require("neogit.lib.git.cherry_pick"),
   cli = require("neogit.lib.git.cli"),
-  init = require("neogit.lib.git.init"),
-  status = require("neogit.lib.git.status"),
-  stash = require("neogit.lib.git.stash"),
-  files = require("neogit.lib.git.files"),
+  config = require("neogit.lib.git.config"),
+  diff = require("neogit.lib.git.diff"),
   fetch = require("neogit.lib.git.fetch"),
+  files = require("neogit.lib.git.files"),
+  index = require("neogit.lib.git.index"),
+  init = require("neogit.lib.git.init"),
   log = require("neogit.lib.git.log"),
-  reflog = require("neogit.lib.git.reflog"),
-  branch = require("neogit.lib.git.branch"),
-  diff = require("neogit.lib.git.diff"),
-  rebase = require("neogit.lib.git.rebase"),
   merge = require("neogit.lib.git.merge"),
-  cherry_pick = require("neogit.lib.git.cherry_pick"),
+  pull = require("neogit.lib.git.pull"),
+  push = require("neogit.lib.git.push"),
+  rebase = require("neogit.lib.git.rebase"),
+  reflog = require("neogit.lib.git.reflog"),
+  remote = require("neogit.lib.git.remote"),
+  repo = require("neogit.lib.git.repository"),
   reset = require("neogit.lib.git.reset"),
   revert = require("neogit.lib.git.revert"),
-  remote = require("neogit.lib.git.remote"),
-  config = require("neogit.lib.git.config"),
   sequencer = require("neogit.lib.git.sequencer"),
-  pull = require("neogit.lib.git.pull"),
-  push = require("neogit.lib.git.push"),
-  index = require("neogit.lib.git.index"),
+  stash = require("neogit.lib.git.stash"),
+  status = require("neogit.lib.git.status"),
 }
diff --git a/lua/neogit/lib/git/diff.lua b/lua/neogit/lib/git/diff.lua
@@ -8,6 +8,8 @@ local ItemFilter = require("neogit.lib.item_filter")
 local insert = table.insert
 local sha256 = vim.fn.sha256
 
+local M = {}
+
 local function parse_diff_stats(raw)
   if type(raw) == "string" then
     raw = vim.split(raw, ", ")
@@ -155,7 +157,7 @@ local function build_hunks(lines)
   return hunks
 end
 
-local function parse_diff(raw_diff, raw_stats)
+function M.parse(raw_diff, raw_stats)
   local header, start_idx = build_diff_header(raw_diff)
   local lines = build_lines(raw_diff, start_idx)
   local hunks = build_hunks(lines)
@@ -179,14 +181,15 @@ local function build_metatable(f, raw_output_fn)
       if method == "diff" then
         self.diff = a.util.block_on(function()
           logger.debug("[DIFF] Loading diff for: " .. f.name)
-          return parse_diff(raw_output_fn())
+          return M.parse(raw_output_fn())
         end)
 
         return self.diff
       end
     end,
   })
 
+  logger.trace("[DIFF] Adding metatable for: " .. f.name)
   f.has_diff = true
 end
 
@@ -215,40 +218,57 @@ local function raw_staged(name)
   end
 end
 
+-- When there is _no_ filter, invalidate all diffs
+-- When there _is_ a filter, only invalidate matching items
+-- And, of course, don't worry about items that haven't loaded diffs
 local function invalidate_diff(filter, section, item)
+  if not rawget(item, "diff") then
+    return
+  end
+
   if not filter or filter:accepts(section, item.name) then
-    logger.debug("[DIFF] Invalidating cached diff for: " .. item.name)
+    logger.debug(string.format("[DIFF] Invalidating diff for: %s", item.name))
     item.diff = nil
   end
 end
 
-return {
-  parse = parse_diff,
-  register = function(meta)
-    meta.update_diffs = function(repo, filter)
-      filter = filter or false
-      if filter and type(filter) == "table" then
-        filter = ItemFilter.create(filter)
-      end
+M.invalid = {}
 
-      for _, f in ipairs(repo.untracked.items) do
-        invalidate_diff(filter, "untracked", f)
-        build_metatable(f, raw_untracked(f.name))
-      end
+-- Invalidates a cached diff for a file
+function M.invalidate(...)
+  local files = { ... }
+  for _, path in ipairs(files) do
+    table.insert(M.invalid, string.format("*:%s", path))
+  end
+end
 
-      for _, f in ipairs(repo.unstaged.items) do
-        if f.mode ~= "F" then
-          invalidate_diff(filter, "unstaged", f)
-          build_metatable(f, raw_unstaged(f.name))
-        end
+function M.register(meta)
+  meta.update_diffs = function(repo)
+    local filter
+    if #M.invalid > 0 then
+      filter = ItemFilter.create(M.invalid)
+      M.invalid = {}
+    end
+
+    for _, f in ipairs(repo.untracked.items) do
+      invalidate_diff(filter, "untracked", f)
+      build_metatable(f, raw_untracked(f.name))
+    end
+
+    for _, f in ipairs(repo.unstaged.items) do
+      if f.mode ~= "F" then
+        invalidate_diff(filter, "unstaged", f)
+        build_metatable(f, raw_unstaged(f.name))
       end
+    end
 
-      for _, f in ipairs(repo.staged.items) do
-        if f.mode ~= "F" then
-          invalidate_diff(filter, "staged", f)
-          build_metatable(f, raw_staged(f.name))
-        end
+    for _, f in ipairs(repo.staged.items) do
+      if f.mode ~= "F" then
+        invalidate_diff(filter, "staged", f)
+        build_metatable(f, raw_staged(f.name))
       end
     end
-  end,
-}
+  end
+end
+
+return M
diff --git a/lua/neogit/lib/git/init.lua b/lua/neogit/lib/git/init.lua
@@ -49,8 +49,7 @@ M.init_repo = function()
   vim.cmd(string.format("cd %s", directory))
 
   M.create(directory)
-
-  status.refresh(true, "InitRepo")
+  status.refresh()
 end
 
 return M
diff --git a/lua/neogit/lib/git/rebase.lua b/lua/neogit/lib/git/rebase.lua
@@ -22,9 +22,6 @@ function M.rebase_interactive(commit, args)
   else
     notif.create("Rebased successfully", vim.log.levels.INFO)
   end
-  a.util.scheduler()
-  local status = require("neogit.status")
-  status.refresh(true, "rebase_interactive")
 end
 
 function M.rebase_onto(branch, args)