Beta-testing 'mini.diff'

[echasnovski]

Please leave your feedback about new mini.diff module here. Feel free to either add new comment or positively upvote existing one.

Some things I am interested to find out (obviously, besides bugs):

• Does it feel to work smoothly (both with regular visualization and with overlay)?
• Is configuration intuitive enough?
• Are default values of settings convenient for you?
• Is documentation and examples clear enough?

Thanks!

[bdillahu]

Seems good and works well... config for 'signs' or 'numbers' is a bit confusing on what the syntax is supposed to look like when combined with the vim.o.number text already there...

[echasnovski]

Seems good and works well... config for 'signs' or 'numbers' is a bit confusing on what the syntax is supposed to look like when combined with the vim.o.number text already there...

I am not sure I understand the issue.
Currently default style is "number' if line number are enabled at the time of require('mini.diff').setup() and 'sign' otherwise. If style is 'sign', actual sign text can be configured in view.signs. Hope it helps.

[bdillahu]

I understand I believe, but what syntax to use is unclear to me.

This is in the config information:

    -- Visualization style. Possible values are 'sign' and 'number'.
    style = vim.o.number and 'number' or 'sign',

do I put:

    style = vim.o.number and 'sign',

or

    style = 'sign',

to use the sign? (trial and error has it working with the first of my options, but in the spirit of beta feedback on the docs, I thought I would point out where I found it confusing.

[echasnovski]

I understand I believe, but what syntax to use is unclear to me.

If you want to always use 'sign', then:

require('mini.diff').setup({ view = { style = 'sign' } })

Conversely, if you want to always use 'number', then:

require('mini.diff').setup({ view = { style = 'number' } })

[231tr0n]

Hi, and as always i love your plugins. I just tried it out and Hunk staging is not working for me. I am able to reset hunks though. Is there anything specific i have to look out for.
Also resetting hunks saves my buffer and writes to it after resetting. Is there anyway i can prevent that by only resetting and not saving the file.

[echasnovski]

Hi, and as always i love your plugins.

❤️

I just tried it out and Hunk staging is not working for me. I am able to reset hunks though. Is there anything specific i have to look out for.

Sigh... If visualization is done properly, then it will be not easy to debug. If that is the case, my guess is that there is an error during computing or applying patch which gets silently ignored (because I assume/hope that the code will always work). So chances are, there is an error somewhere here. Do you have time/energy/enthusiasm to see where the issue occurs exactly?

First, I'd start with asking what Git version do you have?
Second, I'll add some logging behavior here and possibly here to see if there is a non-zero exit code (signalling that there were some error).

Also resetting hunks saves my buffer and writes to it after resetting. Is there anyway i can prevent that by only resetting and not saving the file.

Initially I did not like that it makes the buffer modified and prompts a save. Besides, 'gitsigns.nvim' seems to also not make buffer modified when resetting buffers.
But you know what... After you mentioned it, it is a text change which should make buffer be modified. I'll run locally with it reverted to see if there are any other issues.

[231tr0n]

Hi, and as always i love your plugins.

❤️

I just tried it out and Hunk staging is not working for me. I am able to reset hunks though. Is there anything specific i have to look out for.

Sigh... If visualization is done properly, then it will be not easy to debug. If that is the case, my guess is that there is an error during computing or applying patch which gets silently ignored (because I assume/hope that the code will always work). So chances are, there is an error somewhere here. Do you have time/energy/enthusiasm to see where the issue occurs exactly?

First, I'd start with asking what Git version do you have? Second, I'll add some logging behavior here and possibly here to see if there is a non-zero exit code (signalling that there were some error).

Also resetting hunks saves my buffer and writes to it after resetting. Is there anyway i can prevent that by only resetting and not saving the file.

Initially I did not like that it makes the buffer modified and prompts a save. Besides, 'gitsigns.nvim' seems to also not make buffer modified when resetting buffers. But you know what... After you mentioned it, it is a text change which should make buffer be modified. I'll run locally with it reverted to see if there are any other issues.

Hi yeah i am intrested in debugging this out.
This is my git version
git version 2.34.1
Let me know what else i should be doing
Also just to mention i use delta as my pager to view git diffs if that matters here.

[echasnovski]

git version 2.34.1

That should be enough. It looks like it does not support --format option in git ls-files. To double check, would you mind executing the following command from the root of some repo (replace path/to/some/file with actual path to some file inside a repo):

git ls-files --full-name --format="%(objectmode) %(path)" -- path/to/some/file

According to Git documentation, the --format option appeared in 2.38.0, which was released in October 2022. So this command should show an error for you, correct?

I presume you use the one which comes in Ubuntu 22.04? For the time being, updating version of Git should fix things.

[231tr0n]

git version 2.34.1

That should be enough. It looks like it does not support --format option in git ls-files. To double check, would you mind executing the following command from the root of some repo (replace path/to/some/file with actual path to some file inside a repo):

git ls-files --full-name --format="%(objectmode) %(path)" -- path/to/some/file

According to Git documentation, the --format option appeared in 2.38.0, which was released in October 2022. So this command should show an error for you, correct?

I presume you use the one which comes in Ubuntu 22.04? For the time being, updating version of Git should fix things.

yes you are right i am using ubuntu 22.04 in wsl2. Will try updating git first and try staging hunks again.

[231tr0n]

git version 2.34.1

That should be enough. It looks like it does not support --format option in git ls-files. To double check, would you mind executing the following command from the root of some repo (replace path/to/some/file with actual path to some file inside a repo):

git ls-files --full-name --format="%(objectmode) %(path)" -- path/to/some/file

According to Git documentation, the --format option appeared in 2.38.0, which was released in October 2022. So this command should show an error for you, correct?

I presume you use the one which comes in Ubuntu 22.04? For the time being, updating version of Git should fix things.

Yup updating git version fixes the issue. You were right. I added this ppa:git-core/ppa and updated git and staging works now.

But how do i unstage a staged hunk. Like i tried gH and it does not work. It throws out an error saying no hunks found. Also no special colors are shown for CursorLineNr for a staged hunk to identify and unstage it.

[echasnovski]

Yup updating git version fixes the issue. You were right. I added this ppa:git-core/ppa and updated git and staging works now.

Glad it works now!

But how do i unstage a staged hunk. Like i tried gH and it does not work. It throws out an error saying no hunks found. Also no special colors are shown for CursorLineNr for a staged hunk to identify and unstage it.

This is not supported. Mostly because I could not find a reasonable abstraction for this action which can be applied for any source of reference text.

[231tr0n]

Yup updating git version fixes the issue. You were right. I added this ppa:git-core/ppa and updated git and staging works now.

Glad it works now!

But how do i unstage a staged hunk. Like i tried gH and it does not work. It throws out an error saying no hunks found. Also no special colors are shown for CursorLineNr for a staged hunk to identify and unstage it.

This is not supported. Mostly because I could not find a reasonable abstraction for this action which can be applied for any source of reference text.

Yup cool thank you for this wonderful plugin once again.

[Ernest1338]

Great plugin as always!

Couple of questions.

Your plugins has the vim.b.minidiff_summary_string which is the equivalent of vim.b.gitsigns_status in gitsigns.nvim. Is there a equivalent for vim.b.gitsigns_head to display current branch in the statusline?

Is the current line blame functionality out of the scope of this plugin?