Restore v2.0.x content after rebase

Author: tanvirtin

lua/vgit/core/Spawn.lua

@@ -62,8 +62,6 @@ function Spawn:process_chunk(chunk, buffer, callback)
         end
       end
     end
-    callback(output:sub(start, newline_pos - 1))
-    start = newline_pos + 1
   end
 
   local compact = {}

lua/vgit/features/buffer/Hunks.lua

@@ -82,9 +82,6 @@ function Hunks:cursor_stage()
   if not buffer then return end
   if buffer:editing() then return end
 
-  -- Performance: Suppress VGitSync broadcast; refresh only this buffer after delay
-  git_buffer_store.suppress_sync_and_refresh(buffer, 200)
-
   if not buffer:is_tracked() then
     local _, err = buffer:stage()
     if err then return console.debug.error(err) end

lua/vgit/git/GitFile.lua

@@ -64,10 +64,6 @@ function GitFile:unstage_hunk(hunk)
   return result, nil
 end
 
-function GitFile:reset_hunk(hunk)
-  return git_stager.reset_hunk(self.reponame, self.filename, hunk)
-end
-
 function GitFile:stage()
   local result, err = git_stager.stage(self.reponame, self.filename)
   if err then return nil, err end

lua/vgit/git/git_buffer_store.lua

@@ -14,9 +14,6 @@ local events = {
 }
 local is_registered = false
 
--- When true, VGitSync events are suppressed (e.g., during staging operations)
-local suppress_sync = false
-
 local git_buffer_store = {}
 
 git_buffer_store.register_events = event.async(function()
@@ -147,25 +144,4 @@ git_buffer_store.collect = function()
   git_buffer_store.dispatch(git_buffer, 'attach')
 end
 
--- Suppress VGitSync broadcast and refresh only the specified buffer after delay.
--- This prevents refreshing all tracked buffers when only one needs updating.
---
--- Note: External git operations during the suppression window won't trigger a
--- refresh until the next VGitSync event. This is an acceptable tradeoff given
--- the short window (typically 200ms).
-git_buffer_store.suppress_sync_and_refresh = function(buffer, ms)
-  local git_buffer = git_buffer_store.get(buffer)
-  if not git_buffer then return end
-
-  suppress_sync = true
-
-  vim.defer_fn(loop.coroutine(function()
-    suppress_sync = false
-
-    if git_buffer:is_valid() then
-      git_buffer_store.dispatch(git_buffer, 'sync')
-    end
-  end), ms)
-end
-
 return git_buffer_store

lua/vgit/git/git_hunks.lua

@@ -1,9 +1,8 @@
 local fs = require('vgit.core.fs')
 local utils = require('vgit.core.utils')
 local GitHunk = require('vgit.git.GitHunk')
-local git_setting = require('vgit.settings.git')
 
-local git_hunks = {}
+local git_hunks = { algorithm = 'myers' }
 
 function git_hunks.live(reponame, original_lines, current_lines)
   local lines_limit = 5000
@@ -59,7 +58,7 @@ function git_hunks.live(reponame, original_lines, current_lines)
 
       live_hunks[#live_hunks + 1] = hunk
     end,
-    algorithm = git_setting:get('algorithm'),
+    algorithm = git_hunks.algorithm,
   })
 
   return live_hunks
@@ -114,7 +113,7 @@ function git_hunks.list(reponame, opts)
     'core.safecrlf=false',
     'diff',
     '--color=never',
-    string.format('--diff-algorithm=%s', git_setting:get('algorithm')),
+    string.format('--diff-algorithm=%s', git_hunks.algorithm),
     '--patch-with-raw',
     '--unified=0',
   }

lua/vgit/git/git_repo.lua

@@ -2,10 +2,6 @@ local GitQueryBuilder = require('vgit.git.GitQueryBuilder')
 
 local git_repo = {}
 
--- Cache: directory path -> repo root. Stable within a session; only stale if
--- user runs `git init` in a new location (rare, restart neovim to clear).
-local discover_cache = {}
-
 function git_repo.config(reponame)
   if not reponame then return nil, { 'reponame is required' } end
   return GitQueryBuilder(reponame):raw_args('config', '--list'):execute()

lua/vgit/git/git_stager.lua

@@ -55,32 +55,4 @@ function git_stager.unstage_hunk(reponame, filename, hunk)
   return nil, err
 end
 
--- Reset (discard) a hunk in the working directory
-function git_stager.reset_hunk(reponame, filename, hunk)
-  if not reponame then return nil, { 'reponame is required' } end
-  if not filename then return nil, { 'filename is required' } end
-  if not hunk then return nil, { 'hunk is required' } end
-
-  local patch = GitPatch(filename, hunk)
-  local patch_filename = fs.tmpname()
-
-  fs.write_file(patch_filename, patch)
-
-  -- Apply the patch in reverse to the working directory (not staged)
-  local _, err = gitcli.run({
-    '-C',
-    reponame,
-    '--no-pager',
-    'apply',
-    '--reverse',
-    '--whitespace=nowarn',
-    '--unidiff-zero',
-    patch_filename,
-  })
-
-  fs.remove_file(patch_filename)
-
-  return nil, err
-end
-
 return git_stager

lua/vgit/git/gitcli.lua

@@ -1,7 +1,6 @@
 local event = require('vgit.core.event')
 local Spawn = require('vgit.core.Spawn')
 local console = require('vgit.core.console')
-local git_setting = require('vgit.settings.git')
 
 local gitcli = {}
 

lua/vgit/settings/git.lua

@@ -2,7 +2,6 @@ local Config = require('vgit.core.Config')
 
 return Config({
   cmd = 'git',
-  algorithm = 'myers',
   fallback_cwd = '',
   fallback_args = {},
 })