fix: git blame not working on renamed files

Author: tanvirtin

lua/vgit.lua

@@ -1,8 +1,10 @@
 local lazy = require('vgit.core.lazy')
+
 local env = lazy('vgit.core.env')
 local sign = lazy('vgit.core.sign')
 local libgit2 = lazy('vgit.libgit2')
 local event = lazy('vgit.core.event')
+local router = lazy('vgit.cli.router')
 local keymap = lazy('vgit.core.keymap')
 local console = lazy('vgit.core.console')
 local renderer = lazy('vgit.core.renderer')
@@ -13,19 +15,20 @@ local Hunks = lazy('vgit.features.buffer.Hunks')
 local hunks_setting = lazy('vgit.settings.hunks')
 local scene_setting = lazy('vgit.settings.scene')
 local signs_setting = lazy('vgit.settings.signs')
+local git_porcelain = lazy('vgit.cli.GitPorcelain')
 local symbols_setting = lazy('vgit.settings.symbols')
 local libgit2_setting = lazy('vgit.settings.libgit2')
 local display_service = lazy('vgit.ui.display_service')
 local Conflicts = lazy('vgit.features.buffer.Conflicts')
 local LiveBlame = lazy('vgit.features.buffer.LiveBlame')
-local status_diff_view_setting = lazy('vgit.settings.status_diff_view')
 local git_buffer_store = lazy('vgit.git.git_buffer_store')
 local LiveGutter = lazy('vgit.features.buffer.LiveGutter')
 local live_blame_setting = lazy('vgit.settings.live_blame')
 local live_gutter_setting = lazy('vgit.settings.live_gutter')
+local LiveConflict = lazy('vgit.features.buffer.LiveConflict')
 local file_diff_view_setting = lazy('vgit.settings.file_diff_view')
+local status_diff_view_setting = lazy('vgit.settings.status_diff_view')
 local project_diff_view_setting = lazy('vgit.settings.project_diff_view')
-local LiveConflict = lazy('vgit.features.buffer.LiveConflict')
 
 local hunks = Hunks()
 local conflicts = Conflicts()
@@ -214,7 +217,6 @@ controller.execute_command = event.async(function(args)
   }
 
   if porcelain_commands[cmd] then
-    local router = require('vgit.cli.router')
     router.execute(args.fargs)
     return
   end
@@ -253,7 +255,6 @@ function controller.autocomplete(arg_lead, cmd_line, _)
   end
 
   if cmd == 'diff' or cmd == 'blame' or cmd == 'hunk' then
-    local git_porcelain = require('vgit.cli.GitPorcelain')
     local porcelain = git_porcelain()
     local command_def = porcelain:get_command(cmd)
     if command_def and command_def.options then

lua/vgit/cli/commands/blame.lua

@@ -111,7 +111,8 @@ local function execute_lens_blame(opts, repo, repo_path, filename)
 
   local diff = repo:diff({
     type = 'blame',
-    filename = filename,
+    filename = blame.filename or filename,
+    old_filename = blame.old_filename,
     blame_commit = commit_hash,
     parent_commit = parent_hash,
     layout_type = layout_type,

lua/vgit/core/Buffer.lua

@@ -165,12 +165,12 @@ function Buffer:get_lines(top, bot)
 end
 
 function Buffer:get_option(key)
-  return vim.api.nvim_buf_get_option(self.bufnr, key)
+  return vim.api.nvim_get_option_value(key, { buf = self.bufnr })
 end
 
 function Buffer:set_option(key, value)
   if key == 'modifiable' then self._modifiable = value end
-  pcall(vim.api.nvim_buf_set_option, self.bufnr, key, value)
+  pcall(vim.api.nvim_set_option_value, key, value, { buf = self.bufnr })
   return self
 end
 
@@ -181,7 +181,7 @@ function Buffer:set_lines(lines, top, bot)
 
   local modifiable = self._modifiable
   if modifiable == nil then
-    modifiable = vim.api.nvim_buf_get_option(bufnr, 'modifiable')
+    modifiable = vim.api.nvim_get_option_value('modifiable', { buf = bufnr })
     self._modifiable = modifiable
   end
 
@@ -190,9 +190,9 @@ function Buffer:set_lines(lines, top, bot)
     return self
   end
 
-  vim.api.nvim_buf_set_option(bufnr, 'modifiable', true)
+  vim.api.nvim_set_option_value('modifiable', true, { buf = bufnr })
   vim.api.nvim_buf_set_lines(bufnr, top, bot, false, lines)
-  vim.api.nvim_buf_set_option(bufnr, 'modifiable', false)
+  vim.api.nvim_set_option_value('modifiable', false, { buf = bufnr })
 
   return self
 end
@@ -202,7 +202,7 @@ function Buffer:assign_options(options)
 
   for key, value in pairs(options) do
     if key == 'modifiable' then self._modifiable = value end
-    vim.api.nvim_buf_set_option(bufnr, key, value)
+    vim.api.nvim_set_option_value(key, value, { buf = bufnr })
   end
 
   return self

lua/vgit/core/Buffer_spec.lua

@@ -183,7 +183,7 @@ describe('Buffer:', function()
 
   describe('set_option', function()
     it('should set buffer option', function()
-      vim.api.nvim_buf_set_option(buffer.bufnr, 'ft', 'lua')
+      vim.api.nvim_set_option_value('ft', 'lua', { buf = buffer.bufnr })
       assert.equals(buffer:get_option('ft'), 'lua')
     end)
 

lua/vgit/core/Window.lua

@@ -18,7 +18,7 @@ function Window.open_screen(buffer, config)
 
   if config.win_options then
     for key, value in pairs(config.win_options) do
-      pcall(vim.api.nvim_win_set_option, win_id, key, value)
+      pcall(vim.api.nvim_set_option_value, key, value, { win = win_id })
     end
   end
 
@@ -80,7 +80,7 @@ function Window:set_lnum(lnum)
 end
 
 function Window:set_option(key, value)
-  pcall(vim.api.nvim_win_set_option, self.win_id, key, value)
+  pcall(vim.api.nvim_set_option_value, key, value, { win = self.win_id })
   return self
 end
 
@@ -106,15 +106,15 @@ end
 
 function Window:assign_options(options)
   for key, value in pairs(options) do
-    vim.api.nvim_win_set_option(self.win_id, key, value)
+    vim.api.nvim_set_option_value(key, value, { win = self.win_id })
   end
   return self
 end
 
 function Window:get_options(option_names)
   local options = {}
   for _, name in ipairs(option_names) do
-    local ok, value = pcall(vim.api.nvim_win_get_option, self.win_id, name)
+    local ok, value = pcall(vim.api.nvim_get_option_value, name, { win = self.win_id })
     if ok then options[name] = value end
   end
   return options

lua/vgit/core/Window_spec.lua

@@ -155,7 +155,7 @@ describe('Window:', function()
       win = Window:open(buffer, default_float_opts)
       win:set_option('wrap', false)
 
-      assert.is_false(vim.api.nvim_win_get_option(win.win_id, 'wrap'))
+      assert.is_false(vim.api.nvim_get_option_value('wrap', { win = win.win_id }))
     end)
   end)
 
@@ -196,8 +196,8 @@ describe('Window:', function()
       win = Window:open(buffer, default_float_opts)
       win:assign_options({ wrap = false, number = true })
 
-      assert.is_false(vim.api.nvim_win_get_option(win.win_id, 'wrap'))
-      assert.is_true(vim.api.nvim_win_get_option(win.win_id, 'number'))
+      assert.is_false(vim.api.nvim_get_option_value('wrap', { win = win.win_id }))
+      assert.is_true(vim.api.nvim_get_option_value('number', { win = win.win_id }))
     end)
   end)
 

lua/vgit/core/diff/DiffBuilder.lua

@@ -27,12 +27,13 @@ function DiffBuilder:_get_blame_lines(spec)
   local blame_commit = spec.blame_commit
   local parent_commit = spec.parent_commit
   local filename = spec.filename
+  local old_filename = spec.old_filename
 
   assertion.assert(blame_commit, 'blame_commit is required').assert(filename, 'filename is required')
 
   local effective_parent_commit = parent_commit or blame_commit .. '~1'
 
-  local original_lines = self._repository:file_lines(filename, effective_parent_commit)
+  local original_lines = self._repository:file_lines(old_filename or filename, effective_parent_commit)
   local current_lines = self._repository:file_lines(filename, blame_commit)
 
   return original_lines, current_lines
@@ -178,7 +179,8 @@ function DiffBuilder:build(spec)
     display_lines = original_lines
   end
 
-  local hunks = (spec.hunks and #spec.hunks > 0) and spec.hunks or hunk_generator:generate(original_lines, current_lines, spec)
+  local hunks = (spec.hunks and #spec.hunks > 0) and spec.hunks
+    or hunk_generator:generate(original_lines, current_lines, spec)
   assertion.assert(hunks, 'hunk generator returned nil')
 
   local layout_generator = DiffLayoutGenerator()

lua/vgit/core/fs_spec.lua

@@ -155,7 +155,7 @@ describe('fs:', function()
       local bufnr = vim.api.nvim_create_buf(true, true)
       local buffer = Buffer(bufnr)
 
-      vim.api.nvim_buf_set_option(bufnr, 'filetype', 'bar')
+      vim.api.nvim_set_option_value('filetype', 'bar', { buf = bufnr })
       eq(fs.filetype(buffer), 'bar')
     end)
 

lua/vgit/core/utils/math.lua

@@ -1,11 +1,13 @@
+local jit_uuid = require('vgit.vendor.jit-uuid')
+
 local M = {}
 
 function M.round(x)
   return x >= 0 and math.floor(x + 0.5) or math.ceil(x - 0.5)
 end
 
 function M.uuid()
-  return require('vgit.vendor.jit-uuid').generate_v4()
+  return jit_uuid.generate_v4()
 end
 
 function M.scale_unit_up(unit, percent)

lua/vgit/features/screens/BlameView.lua

@@ -474,7 +474,7 @@ function BlameView:enter_parent()
   })
 
   local reponame = self._opts.reponame
-  local parent_filename = blame.previous_filename or self._opts.filename
+  local parent_filename = blame.old_filename or self._opts.filename
 
   local new_blames, blame_err = git_blame.list(reponame, parent_filename, parent_hash)
   if blame_err or not new_blames or #new_blames == 0 then
@@ -550,7 +550,7 @@ function BlameView:show_commit_diff()
 
   local commit_hash = blame.commit_hash or blame.hash
   local parent_hash = blame.parent_hash or blame._parent_hash or (commit_hash .. '~1')
-  local filename = blame.previous_filename or self._opts.filename
+  local filename = blame.filename or self._opts.filename
 
   local repo, repo_err = repository.current()
   if repo_err then
@@ -563,6 +563,7 @@ function BlameView:show_commit_diff()
   local diff, diff_err = repo:diff({
     type = 'blame',
     filename = filename,
+    old_filename = blame.old_filename,
     blame_commit = commit_hash,
     parent_commit = parent_hash,
     layout_type = layout_type,