[WIP] File Watcher

lua/neogit.lua

@@ -6,6 +6,7 @@ local hl = require("neogit.lib.hl")
 local status = require("neogit.status")
 local state = require("neogit.lib.state")
 local input = require("neogit.lib.input")
+local watcher = require("neogit.watcher")
 local logger = require("neogit.logger")
 
 local cli = require("neogit.lib.git.cli")
@@ -39,8 +40,7 @@ local setup = function(opts)
   hl.setup()
   signs.setup()
   state.setup()
-
-  require("neogit.autocmds").setup()
+  watcher.setup()
 end
 
 ---@param opts OpenOpts
@@ -71,6 +71,8 @@ local open = function(opts)
     end
   end
 
+  require("neogit.lib.git").repo:dispatch_refresh { source = "open" }
+
   if opts[1] ~= nil then
     local popup_name = opts[1]
     local has_pop, popup = pcall(require, "neogit.popups." .. popup_name)

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

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,6 @@ 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")
     view:update_files()
   end))
 

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"),
 }

lua/neogit/lib/git/diff.lua

@@ -187,6 +187,7 @@ local function build_metatable(f, raw_output_fn)
     end,
   })
 
+  logger.trace("[DIFF] Adding metatable for: " .. f.name)
   f.has_diff = true
 end
 
@@ -215,20 +216,27 @@ 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)
+    meta.update_diffs = function(repo)
+      local filter
+      if repo.invalidate[1] then
+        filter = ItemFilter.create(repo.invalidate)
       end
 
       for _, f in ipairs(repo.untracked.items) do

lua/neogit/lib/git/index.lua

@@ -109,4 +109,10 @@ function M.update()
     :spawn_async()
 end
 
+function M.register(meta)
+  meta.update_index = function(state)
+    state.index.timestamp = state.index_stat()
+  end
+end
+
 return M

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

lua/neogit/lib/git/log.lua

@@ -255,7 +255,9 @@ function M.list(options, show_popup)
     table.insert(options, "--max-count=256")
   end
 
-  local output = cli.log.format(format).graph.arg_list(options or {}).show_popup(show_popup).call():trim()
+  local output =
+    cli.log.format(format).graph.arg_list(options or {}).show_popup(show_popup).call_sync():trim()
+
   return parse_log(output.stdout, graph)
 end
 

lua/neogit/lib/git/merge.lua

@@ -7,6 +7,7 @@ local M = {}
 
 local a = require("plenary.async")
 
+-- TODO: client.wrap()
 local function merge_command(cmd)
   local envs = client.get_envs_git_editor()
   return cmd.env(envs).show_popup(true):in_pty(true).call(true)

lua/neogit/lib/git/pull.lua

@@ -3,6 +3,7 @@ local util = require("neogit.lib.util")
 
 local M = {}
 
+-- TODO: client.wrap()
 function M.pull_interactive(remote, branch, args)
   local client = require("neogit.client")
   local envs = client.get_envs_git_editor()
@@ -14,7 +15,7 @@ local function update_unpulled(state)
     return
   end
 
-  local result = cli.log.oneline.for_range("..@{upstream}").show_popup(false).call():trim().stdout
+  local result = cli.log.oneline.for_range("..@{upstream}").show_popup(false).call_sync():trim().stdout
 
   state.unpulled.items = util.map(result, function(x)
     return { name = x }

lua/neogit/lib/git/rebase.lua

@@ -6,6 +6,7 @@ local M = {}
 
 local a = require("plenary.async")
 
+-- TODO: client.wrap()
 local function rebase_command(cmd)
   local git = require("neogit.lib.git")
   cmd = cmd or git.cli.rebase
@@ -22,9 +23,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)