[Mini.pick] git hunks - Mark as git add

[Esteban528]

Contributing guidelines

• I have read CODE_OF_CONDUCT.md

Module(s)

mini.pick

Question

Hi there, I'm a bit new to this, I want to select files from :Pick git_hunks (To view unstaged files) and when I mark one, this file will be added to stage like (git add filename), I used this feature in telescope, but I don't know how I can do it in Mini.pick.

So my question is: Is it possible? mark files and add these to the git stage.

[echasnovski]

Yes, this (marking hunks, not files, to later apply them) is possible with writing custom choose_marked. Something like this:

require('mini.extra').setup()

local stage_hunk_item = function(item)
  local patch = vim.deepcopy(item.header)
  vim.list_extend(patch, item.hunk)
  local cmd = { 'git', 'apply', '--cached', '-' }
  vim.system(cmd, { stdin = patch }):wait()
end
local stage_marked = function(items_marked) vim.tbl_map(stage_hunk_item, items_marked) end

-- NOTE: Make sure `require('mini.pick').setup()` is called prior to this
MiniPick.registry.git_hunks = function(local_opts)
  MiniExtra.pickers.git_hunks(local_opts, { source = { choose_marked = stage_marked } })
end

So with this in place:

• :Pick git_hunks.
• Mark hunks you'd like to stage (navigate to it and press <C-x> with default mappings).
• After all are marked, press <Alt>+<CR> with default mappings.

Note, that this relies on some assumption about the internal structure of items in git_hunks picker, but I don't think it will change any time soon.

[Esteban528]

Thanks a lot, it is amazing! Also I can to change color to the hunk according hl group?

[echasnovski]

What colors do you want to change and where? If it about preview, then try adjusting highlight groups like diff***. To see available highlight groups, you can do :h diff and press <Tab>. The ones that start with "diff" (and not "Diff") are used for 'diff' files.

I right now realized that :Pick git_hunks preview doesn't try to use tree-sitter, but it should. After it is added, if there is tree-sitter parser installed for 'diff' language, then it will be more complicated. It will be highlight groups with .diff suffix. Like @diff.added.diff, @function.diff, etc. One way to see specific groups, is to use 'mini.git' and run :Git diff. It should show diff with tree-sitter enabled (if set up properly) and then using :Inspect will show highlight groups under cursor.

[Esteban528]

With what you tell me is enough, I thank you very much. That's just what I needed to know

[231tr0n]

-- Custom mini.nvim configuration
now(function()
	MiniPick.registry.git_hunks = function(local_opts)
		MiniExtra.pickers.git_hunks(local_opts, {
			source = {
				choose_marked = function(items_marked)
					vim.tbl_map(function(item)
						local patch = vim.deepcopy(item.header)
						vim.list_extend(patch, item.hunk)
						local cmd
						if local_opts.scope == "staged" then
							cmd = { "git", "apply", "--cached", "--reverse", "-" }
						else
							cmd = { "git", "apply", "--cached", "-" }
						end
						vim.system(cmd, { stdin = patch }):wait()
					end, items_marked)
				end,
			},
		})
	end
end)

I came up with this snippet to stage and unstage stuff using git after taking a look at your snippet. @echasnovski any chance this action can go to mini.extra for the hunks picker? This can be made the official way to stage and unstage multiple hunks.

[echasnovski]

@echasnovski any chance this action can go to mini.extra for the hunks picker? This can be made the official way to stage and unstage multiple hunks.

At the moment, I don't think so. The main idea behind pickers that reference file/buffer positions/regions is that their default usage should navigate to that position/region. The "choose marked" action is similar by placing all of them into quickfix list and allowing to navigate through them.

It might be considered a separate action, but I don't really think it is a good idea. There is 'mini.diff' for applying hunks (and can be used together with quickfix list approach to stage hunks, but not unstage sadly) and more comprehensive Git tools designed to integrate with it (I use and recommend Lazygit).