perf: Update blob hash immediately after staging index buffer

Author: sindrets

lua/diffview/scene/file_entry.lua

@@ -127,41 +127,38 @@ function FileEntry:convert_layout(target_layout)
   })
 end
 
----@param adapter VCSAdapter
 ---@param stat? table
-function FileEntry:validate_stage_buffers(adapter, stat)
-  stat = stat or utils.path:stat(utils.path:join(adapter.ctx.dir, "index"))
-  local cached_stat = utils.tbl_access(fstat_cache, { adapter.ctx.toplevel, "index" })
-
-  if stat then
-    if not cached_stat or cached_stat.mtime < stat.mtime.sec then
-      for _, f in ipairs(self.layout:files()) do
-        if f.rev.type == RevType.STAGE and f:is_valid() then
-          if f.rev.stage > 0 then
-            -- We only care about stage 0 here
-            f:dispose_buffer()
-          else
-            local is_modified = vim.bo[f.bufnr].modified
-
-            if f.blob_hash then
-              local new_hash = f.adapter:file_blob_hash(f.path)
-
-              if new_hash and new_hash ~= f.blob_hash then
-                if is_modified then
-                  utils.warn((
-                    "A file was changed in the index since you started editing it!"
-                    .. " Be careful not to lose any staged changes when writing to this buffer: %s"
-                  ):format(api.nvim_buf_get_name(f.bufnr)))
-                else
-                  f:dispose_buffer()
-                end
+function FileEntry:validate_stage_buffers(stat)
+  stat = stat or utils.path:stat(utils.path:join(self.adapter.ctx.dir, "index"))
+  local cached_stat = utils.tbl_access(fstat_cache, { self.adapter.ctx.toplevel, "index" })
+
+  if stat and (not cached_stat or cached_stat.mtime < stat.mtime.sec) then
+    for _, f in ipairs(self.layout:files()) do
+      if f.rev.type == RevType.STAGE and f:is_valid() then
+        if f.rev.stage > 0 then
+          -- We only care about stage 0 here
+          f:dispose_buffer()
+        else
+          local is_modified = vim.bo[f.bufnr].modified
+
+          if f.blob_hash then
+            local new_hash = self.adapter:file_blob_hash(f.path)
+
+            if new_hash and new_hash ~= f.blob_hash then
+              if is_modified then
+                utils.warn((
+                  "A file was changed in the index since you started editing it!"
+                  .. " Be careful not to lose any staged changes when writing to this buffer: %s"
+                ):format(api.nvim_buf_get_name(f.bufnr)))
+              else
+                f:dispose_buffer()
               end
-            elseif not is_modified then
-              -- Should be very rare that we don't have an index-buffer's blob
-              -- hash. But in that case, we can't warn the user when a file
-              -- changes in the index while they're editing its index buffer.
-              f:dispose_buffer()
             end
+          elseif not is_modified then
+            -- Should be very rare that we don't have an index-buffer's blob
+            -- hash. But in that case, we can't warn the user when a file
+            -- changes in the index while they're editing its index buffer.
+            f:dispose_buffer()
           end
         end
       end

lua/diffview/scene/views/diff/diff_view.lua

@@ -357,7 +357,7 @@ DiffView.update_files = debounce.debounce_trailing(100, true, vim.schedule_wrap(
               end
 
               v.cur_files[ai].status = v.new_files[bi].status
-              v.cur_files[ai]:validate_stage_buffers(self.adapter, index_stat)
+              v.cur_files[ai]:validate_stage_buffers(index_stat)
 
               if new_head then
                 v.cur_files[ai]:update_heads(new_head)

lua/diffview/vcs/adapters/git/init.lua

@@ -1372,6 +1372,7 @@ function GitAdapter:stage_index_file(file)
       return false
     end
 
+    file.blob_hash = blob_hash
     vim.bo[file.bufnr].modified = false
     api.nvim_exec_autocmds("BufWritePost", {
       pattern = api.nvim_buf_get_name(file.bufnr),