fix(#1970): revert git kill, to be completed via #1974 experiment

Author: alex-courtis

lua/nvim-tree/explorer/explore.lua

@@ -26,7 +26,7 @@ local function populate_children(handle, cwd, node, git_status)
 
     local abs = utils.path_join { cwd, name }
 
-    local profile = log.profile_start("explore populate_children %s", abs)
+    -- local profile = log.profile_start("explore populate_children %s", abs)
 
     t = get_type_from(t, abs)
     if
@@ -52,7 +52,7 @@ local function populate_children(handle, cwd, node, git_status)
       end
     end
 
-    log.profile_end(profile)
+    -- log.profile_end(profile)
   end
 end
 
@@ -63,7 +63,7 @@ function M.explore(node, status)
     return
   end
 
-  local profile = log.profile_start("explore init %s", node.absolute_path)
+  -- local profile = log.profile_start("explore init %s", node.absolute_path)
 
   populate_children(handle, cwd, node, status)
 
@@ -74,14 +74,14 @@ function M.explore(node, status)
     local ns = M.explore(child_folder_only, status)
     node.nodes = ns or {}
 
-    log.profile_end(profile)
+    -- log.profile_end(profile)
     return ns
   end
 
   sorters.merge_sort(node.nodes, sorters.node_comparator)
   live_filter.apply_filter(node)
 
-  log.profile_end(profile)
+  -- log.profile_end(profile)
   return node.nodes
 end
 

lua/nvim-tree/git/runner.lua

@@ -70,53 +70,46 @@ function Runner:_log_raw_output(output)
 end
 
 function Runner:_run_git_job()
-  local handle
+  local handle, pid
   local stdout = vim.loop.new_pipe(false)
   local stderr = vim.loop.new_pipe(false)
   local timer = vim.loop.new_timer()
 
-  local function on_finish(rc, signal)
-    log.line("git", "rc=%d, signal=%s", tostring(rc), tostring(signal))
+  local function on_finish(rc)
     self.rc = rc or 0
-
-    if timer and not timer:is_closing() then
-      timer:stop()
-      timer:close()
-    end
-    if stdout and not stdout:is_closing() then
-      stdout:read_stop()
-      stdout:close()
-    end
-    if stderr and not stderr:is_closing() then
-      stderr:read_stop()
-      stderr:close()
+    if timer:is_closing() or stdout:is_closing() or stderr:is_closing() or (handle and handle:is_closing()) then
+      return
     end
-    if handle and not handle:is_closing() then
+    timer:stop()
+    timer:close()
+    stdout:read_stop()
+    stderr:read_stop()
+    stdout:close()
+    stderr:close()
+    if handle then
       handle:close()
     end
+
+    pcall(vim.loop.kill, pid)
   end
 
   local opts = self:_getopts(stdout, stderr)
   log.line("git", "running job with timeout %dms", self.timeout)
   log.line("git", "git %s", table.concat(utils.array_remove_nils(opts.args), " "))
 
-  handle = vim.loop.spawn(
+  handle, pid = vim.loop.spawn(
     "git",
     opts,
-    vim.schedule_wrap(function(rc, signal)
-      on_finish(rc, signal)
+    vim.schedule_wrap(function(rc)
+      on_finish(rc)
     end)
   )
 
   timer:start(
     self.timeout,
     0,
     vim.schedule_wrap(function()
-      log.line("git", "timed out, killing")
-      self.timed_out = true
-      if handle then
-        handle:kill "sigkill"
-      end
+      on_finish(-1)
     end)
   )
 
@@ -142,7 +135,7 @@ end
 
 function Runner:_wait()
   local function is_done()
-    return self.rc ~= nil or self.timed_out
+    return self.rc ~= nil
   end
 
   while not vim.wait(30, is_done) do
@@ -160,16 +153,15 @@ function Runner.run(opts)
     list_ignored = opts.list_ignored,
     timeout = opts.timeout or 400,
     output = {},
-    rc = nil,
-    timed_out = false,
+    rc = nil, -- -1 indicates timeout
   }, Runner)
 
   self:_run_git_job()
   self:_wait()
 
   log.profile_end(profile)
 
-  if self.timed_out then
+  if self.rc == -1 then
     log.line("git", "job timed out  %s %s", opts.project_root, opts.path)
     timeouts = timeouts + 1
     if timeouts == MAX_TIMEOUTS then