|
12 | 12 | local git_log_on_confirm = function(picker, item) |
13 | 13 | picker:close() |
14 | 14 | local selected = picker:selected() |
| 15 | + require("lazy").load({ plugins = { "codediff.nvim" } }) |
| 16 | + local diff = require("codediff.commands").vscode_diff |
15 | 17 | if #selected == 1 then |
16 | | - vim.cmd("CodeDiff " .. selected[1].commit .. "~1 HEAD") |
| 18 | + diff({ fargs = { selected[1].commit .. "~1", "HEAD" } }) |
17 | 19 | elseif #selected > 1 then |
18 | | - local first = selected[2].commit |
19 | | - local last = selected[1].commit |
20 | | - vim.cmd("CodeDiff " .. first .. "~1 " .. last) |
| 20 | + diff({ fargs = { selected[#selected].commit .. "~1", selected[1].commit } }) |
21 | 21 | else |
22 | | - vim.cmd("CodeDiff " .. item.commit .. "~1 " .. item.commit) |
| 22 | + diff({ fargs = { item.commit .. "~1", item.commit } }) |
23 | 23 | end |
24 | 24 | end |
25 | 25 |
|
@@ -138,7 +138,7 @@ return { |
138 | 138 | { "<leader>hl%", picker("git_log_file"), desc = "Git: Log for file" }, |
139 | 139 | { "<leader>hb", picker("git_branches"), desc = "Git: Branches" }, |
140 | 140 | { "<leader>hh", picker("git_status"), desc = "Git: Status" }, |
141 | | - { "<leader>hll", picker("git_log"), desc = "Git: Search Log" }, |
| 141 | + { "<leader>hL", picker("git_log"), desc = "Git: Search Log" }, |
142 | 142 |
|
143 | 143 | { "<leader>cc", picker("qflist"), desc = "Quickfix List" }, |
144 | 144 |
|
@@ -230,10 +230,8 @@ return { |
230 | 230 | actions = { |
231 | 231 | diff = function(picker, item) |
232 | 232 | picker:close() |
233 | | - |
234 | | - -- Open diff for the branch compared to the default branch |
235 | | - local base = T.git.default_branch() |
236 | | - vim.cmd("CodeDiff " .. base .. " " .. item.branch) |
| 233 | + require("lazy").load({ plugins = { "codediff.nvim" } }) |
| 234 | + require("codediff.commands").vscode_diff({ fargs = { T.git.default_branch(), item.branch } }) |
237 | 235 | end, |
238 | 236 | toggle_filter = function(picker) |
239 | 237 | picker.opts.all = not picker.opts.all |
|
0 commit comments