added keymaps for diffview
This commit is contained in:
parent
ae54f5b6dc
commit
cb31bc1848
@ -115,15 +115,22 @@ end
|
|||||||
require("which-key").add({
|
require("which-key").add({
|
||||||
-- { "<leader>g", group = "Git" },
|
-- { "<leader>g", group = "Git" },
|
||||||
{ "<leader>gvf", diffOpenFileHistory, desc = "Open DiffView on Files" },
|
{ "<leader>gvf", diffOpenFileHistory, desc = "Open DiffView on Files" },
|
||||||
{ "<leader>gt", command("DiffviewToggleFiles"), desc = "Open DiffView on Files" },
|
{ "<leader>gvt", command("DiffviewToggleFiles"), desc = "toggle diffviewfiles" },
|
||||||
|
{ "<leader>gvc", command("DiffviewClose"), desc = "Open DiffView on Files" },
|
||||||
|
{
|
||||||
|
"<leader>gvh",
|
||||||
|
function()
|
||||||
|
print("gvf with . opens commit wise history of entire codebase.")
|
||||||
|
print("gvf with % opens commit wise history of current file.")
|
||||||
|
print("gvf with <any file path> opens commit wise history of that file.")
|
||||||
|
print("gvo with HEAD opens diff of latest commit.")
|
||||||
|
print("gvo with HEAD~3 opens diff of last 3 commits.")
|
||||||
|
print("gvo with master..HEAD opens changes of your feature branch.")
|
||||||
|
end,
|
||||||
|
desc = "gvo help",
|
||||||
|
},
|
||||||
{ "<leader>gvo", diffOpenWithInput, desc = "Open DiffView" },
|
{ "<leader>gvo", diffOpenWithInput, desc = "Open DiffView" },
|
||||||
})
|
})
|
||||||
-- diffOpenFileHistory with . opens commit wise history of entire codebase.
|
|
||||||
-- diffOpenFileHistory with % opens commit wise history of current file.
|
|
||||||
-- diffOpenFileHistory with <any file path> opens commit wise history of that file.
|
|
||||||
-- diffOpenWithInput with HEAD opens diff of latest commit.
|
|
||||||
-- diffOpenWithInput with HEAD~3 opens diff of last 3 commits.
|
|
||||||
-- diffOpenWithInput with master..HEAD opens changes of your feature branch.
|
|
||||||
--
|
--
|
||||||
--
|
--
|
||||||
vim.api.nvim_set_keymap("c", "<C-j>", "<Down>", { noremap = true, silent = true })
|
vim.api.nvim_set_keymap("c", "<C-j>", "<Down>", { noremap = true, silent = true })
|
||||||
|
|||||||
@ -482,61 +482,4 @@ return {
|
|||||||
"sindrets/diffview.nvim",
|
"sindrets/diffview.nvim",
|
||||||
opts = {},
|
opts = {},
|
||||||
},
|
},
|
||||||
{
|
|
||||||
"lewis6991/gitsigns.nvim",
|
|
||||||
event = "LazyFile",
|
|
||||||
opts = {
|
|
||||||
signs = {
|
|
||||||
add = { text = "▎" },
|
|
||||||
change = { text = "▎" },
|
|
||||||
delete = { text = "" },
|
|
||||||
topdelete = { text = "" },
|
|
||||||
changedelete = { text = "▎" },
|
|
||||||
untracked = { text = "▎" },
|
|
||||||
},
|
|
||||||
signs_staged = {
|
|
||||||
add = { text = "▎" },
|
|
||||||
change = { text = "▎" },
|
|
||||||
delete = { text = "" },
|
|
||||||
topdelete = { text = "" },
|
|
||||||
changedelete = { text = "▎" },
|
|
||||||
},
|
|
||||||
on_attach = function(buffer)
|
|
||||||
local gs = package.loaded.gitsigns
|
|
||||||
|
|
||||||
local function map(mode, l, r, desc)
|
|
||||||
vim.keymap.set(mode, l, r, { buffer = buffer, desc = desc })
|
|
||||||
end
|
|
||||||
|
|
||||||
-- stylua: ignore start
|
|
||||||
map("n", "]h", function()
|
|
||||||
if vim.wo.diff then
|
|
||||||
vim.cmd.normal({ "]c", bang = true })
|
|
||||||
else
|
|
||||||
gs.nav_hunk("next")
|
|
||||||
end
|
|
||||||
end, "Next Hunk")
|
|
||||||
map("n", "[h", function()
|
|
||||||
if vim.wo.diff then
|
|
||||||
vim.cmd.normal({ "[c", bang = true })
|
|
||||||
else
|
|
||||||
gs.nav_hunk("prev")
|
|
||||||
end
|
|
||||||
end, "Prev Hunk")
|
|
||||||
map("n", "]H", function() gs.nav_hunk("last") end, "Last Hunk")
|
|
||||||
map("n", "[H", function() gs.nav_hunk("first") end, "First Hunk")
|
|
||||||
map({ "n", "v" }, "<leader>ghs", ":Gitsigns stage_hunk<CR>", "Stage Hunk")
|
|
||||||
map({ "n", "v" }, "<leader>ghr", ":Gitsigns reset_hunk<CR>", "Reset Hunk")
|
|
||||||
map("n", "<leader>ghS", gs.stage_buffer, "Stage Buffer")
|
|
||||||
map("n", "<leader>ghu", gs.undo_stage_hunk, "Undo Stage Hunk")
|
|
||||||
map("n", "<leader>ghR", gs.reset_buffer, "Reset Buffer")
|
|
||||||
map("n", "<leader>ghp", gs.preview_hunk_inline, "Preview Hunk Inline")
|
|
||||||
map("n", "<leader>ghb", function() gs.blame_line({ full = true }) end, "Blame Line")
|
|
||||||
map("n", "<leader>ghB", function() gs.blame() end, "Blame Buffer")
|
|
||||||
map("n", "<leader>ghd", gs.diffthis, "Diff This")
|
|
||||||
map("n", "<leader>ghD", function() gs.diffthis("~") end, "Diff This ~")
|
|
||||||
map({ "o", "x" }, "ih", ":<C-U>Gitsigns select_hunk<CR>", "GitSigns Select Hunk")
|
|
||||||
end,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user