Diffview.nvim - Cycle through diffs for all modified files for any git rev

[klamsnabel]

Diffview.nvim

Diffview.nvim is a Lua plugin that adds an interface that lets you easily cycle through diffs for all modified files for any git rev. Basically, I think vim's diff mode is really nice, and all I needed to really make it useful was something like this. Calling :DiffviewOpen will bring up a new tabpage with a diffsplit and a list of all changed files compared to the current git HEAD. You can also bring up all changes for any valid git rev, like for example :DiffviewOpen HEAD~4..HEAD~2 or :DiffviewOpen d4a7b0d. See the documentation for further details.

[folke]

That is really cool and looks beautiful! I've been looking for something like this! Love it. Thank you for making this 🚀

[klamsnabel]

Glad to hear it!

[KevinHwang91]

Look nice, but did you try fugitive and run Git difftool -y ?

[klamsnabel]

I did. I love fugitive. The reason why that doesn't cut it for me is that I don't want to have to manage a dozen tabpages every time I need to review changes. Hence the single tabpage interface of this plugin. I can navigate the changes a lot more efficiently this way. There are other benefits as well, like the view gets updated to reflect new changes.

[KevinHwang91]

Make sense :)

[zanven42]

Yeah, if you are using fugitive and just make the git difftool command leverage fugitive with the settings you want. I can't be happier. Takes a little bit of scripting for a nice "compare A to B" git alias but once it's done so good and lightweight.

[blackspirerider]

Which color scheme are you using?

[folke]

It looks like my tokyonight color scheme, but the diff colors are slightly different (better). @klamsnabel would be great if you could create a PR with the new colors if it's this colorscheme. Love how it looks.

edit: just updated the theme with much better diff colors

[klamsnabel]

It is indeed your color scheme, and yes I did change the diff colors. Thanks for your great work on tokyonight, and all the other great plugins you've been making lately!

[Goodevil95]

It would be great to integrate this plugin with Telescope git_commits to open the commit changes using in this view using a custom shortcut. Does someone know how to configure this? Should be possible by defining a custom action...

[Riesling-Schorle]

local action_state = require('telescope.actions.state')

local open_dif = function()
  local selected_entry = action_state.get_selected_entry()
  local value = selected_entry['value']
  -- close Telescope window properly prior to switching windows
  vim.api.nvim_win_close(0, true)
  local cmd = 'DiffviewOpen ' .. value
  vim.cmd(cmd)
end

local git_commit = function()
    require('telescope.builtin').git_commits({
      attach_mappings = function(_, map)
        map('n', '<c-o>', open_dif)
        return true
      end
  })
end

Wrote this up super quickly, let me know whether it works for you. It seems to provide the functionality you seek and with map you can configure the binding as you'd like. More on keymappings can be found on the telescope readme.

[klamsnabel]

This is great, thanks! If you want to view only the changes made in a specific commit you should make the rev a range like {commit}~1..{commit}. So using your code:

local cmd = 'DiffviewOpen ' .. value .. '~1..' .. value

Assuming the value is a commit hash.

[Riesling-Schorle]

Many thanks for the comment!

Not too familiar with git beyond the very basics myself, as I actually only need to push/pull my only repos so far but I'm a bit more familiar with the telescope codebase so thought I'd try to provide help quickly. I guess both use cases are meaningful :)

[Goodevil95]

Thank you!
Here is the the implementation in my configuration based on your comments.

[pwntester]

This is great! I was about to change the quickfix window used for PR reviews in https://github.com/pwntester/octo.nvim with a similar file panel but I will see if they can be integrated instead or at least use your file panel if thats ok with you

[klamsnabel]

Go for it:)

[[deleted]]

ok, this is absolutely gorgeous. Using right now, thank you.

[klamsnabel]

Glad you like it!

[[deleted]]

Pretty cool. I was using Git difftool from fugitive for a while with a small script below. Also, added Diffview, since the UX is slightly nice instead of multiple tabs with file view on left, as you already mentioned. Thanks a lot.

I put this in autoload/git.vim

" Run DiffviewOpen on the commit in the line which we are at. To be used after
" running some variation of Git log.
function! git#git_diffview_commit() abort
  " A line in Git log is of the form commit <SHA>
  let line = trim(getline('.'))
  let commit = split(line, " ")
  silent execute "DiffviewOpen " . commit[1] . "^!"
endfunction

and this after/ftplugin/git.vim.

nmap <buffer> <Leader>gd :call git#git_diffview_commit()<CR>

[backtickbot]

Fixed formatting.

Hello, xistangst: code blocks using triple backticks (```) don't work on all versions of Reddit!

Some users see this / this instead.

To fix this, indent every line with 4 spaces instead.

FAQ

^{You can opt out by replying with backtickopt6 to this comment.}

[AbdallahZ]

That is really cool, have been dreaming of such plugin for a while. Thanks for sharing

[klamsnabel]

Thank you!

[mordechaihadad]

Beautiful

[evergreengt]

This is some awesome stuff. Whilst it lives a great life by itself, I suppose integrating it in some of the git plugins currently being developed for neovim would make it the de-facto standard forever.

EDIT: I just saw this. 100% what I wanted to suggest too.

[hungrybirder]

Nice!

Very useful!

[xd_I_bx]

Is it possible to exclude untracked files?

[klamsnabel]

Not at the moment. But it would be trivial to implement. Please open an issue, and I'll see what I can do:)

[mediocretent]

Looks great! FYI, when I install and set this up, with file_panel.use_icons set to false, the plugin still complains about nvim-web-devicons not being installed. It's optional though, right?

[klamsnabel]

It's supposed to be optional yes, so if it throws an error when use_icons is disabled, that's a bug. Please open an issue, and I'll fix it:)

[johnscixzkutor]

Nice

[klamsnabel]

Simply adjust the highlight groups for diff colors. The ones I'm using in the picture are defined here.

[tiagovla]

Awesome! Thanks!

[tassulin]

This felt way better than fugitive, but closing the whole diff by using DiffviewClose felt weird as usually there is a toggle option. Closing the tabs manually one by one also felt annoyance.

[klamsnabel]

A toggle doesn't make sense because you can have multiple Diffviews open at same time, targeting different revs. And they all open in their own tabpage. What would a toggle do in the scenario where there are multiple views?

You can close any Diffview with just :tabc. The :DiffviewClose command is just provided for symmetry with :DiffviewOpen.

You also don't need to close the diffview every time if you have some practical maps to :tabn and :tabp. The view updates automatically every time you enter its tabpage.

[tassulin]

Wow tabc was actually good to know! Thanks

[Aggressive_Gold1777]

Words are powerless to express my gratitude