Skip to content

perf(DiffScreen): Reduce git commands during hunk staging, 60-75% performance improvement #428

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tanvirtin merged 1 commit into from
Dec 5, 2025
Merged

perf(DiffScreen): Reduce git commands during hunk staging, 60-75% performance improvement #428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions lua/vgit/features/screens/DiffScreen/Model.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,19 @@ function Model:get_hunks(lines)
return self.git_file:live_hunks(lines)
end

-- Lightweight refresh that skips redundant checks (conflict, status).
-- Use after staging/unstaging when we know the file state hasn't fundamentally changed.
function Model:refresh_hunks(filename)
local lines, lines_err = self:get_lines(filename)
if lines_err then return nil, lines_err end

local hunks, hunks_err = self:get_hunks(lines)
if hunks_err then return nil, hunks_err end

self.state.diff = Diff():generate(hunks, lines, self:get_layout_type())
return self.state.diff
end

function Model:fetch(filename)
if not fs.exists(filename) then return nil, { 'Buffer has no diff associated with it' } end

Expand Down
12 changes: 6 additions & 6 deletions lua/vgit/features/screens/DiffScreen/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ function DiffScreen:reset(buffer)
self.model:reset_file(filename)

loop.free_textlock()
local _, refetch_err = self.model:fetch(buffer:get_name())
local _, refetch_err = self.model:refresh_hunks(buffer:get_name())
loop.free_textlock()

if refetch_err then
Expand Down Expand Up @@ -196,7 +196,7 @@ function DiffScreen:stage_hunk(buffer)
self.model:stage_hunk(filename, hunk)

loop.free_textlock()
local _, refetch_err = self.model:fetch(buffer:get_name())
local _, refetch_err = self.model:refresh_hunks(buffer:get_name())
loop.free_textlock()

if refetch_err then
Expand Down Expand Up @@ -228,7 +228,7 @@ function DiffScreen:unstage_hunk(buffer)
self.model:unstage_hunk(filename, hunk)

loop.free_textlock()
local _, refetch_err = self.model:fetch(buffer:get_name())
local _, refetch_err = self.model:refresh_hunks(buffer:get_name())
loop.free_textlock()

if refetch_err then
Expand Down Expand Up @@ -267,7 +267,7 @@ function DiffScreen:reset_hunk(buffer)
self.model:reset_hunk(filename, hunk)

loop.free_textlock()
local _, refetch_err = self.model:fetch(buffer:get_name())
local _, refetch_err = self.model:refresh_hunks(buffer:get_name())
loop.free_textlock()

if refetch_err then
Expand Down Expand Up @@ -295,7 +295,7 @@ function DiffScreen:stage(buffer)
self.model:stage_file(filename)

loop.free_textlock()
local _, refetch_err = self.model:fetch(buffer:get_name())
local _, refetch_err = self.model:refresh_hunks(buffer:get_name())
loop.free_textlock()

if refetch_err then
Expand All @@ -320,7 +320,7 @@ function DiffScreen:unstage(buffer)
self.model:unstage_file(filename)

loop.free_textlock()
local _, refetch_err = self.model:fetch(buffer:get_name())
local _, refetch_err = self.model:refresh_hunks(buffer:get_name())
loop.free_textlock()

if refetch_err then
Expand Down
Loading