Thread panic while loading file dif

[sgtrusty]

see comment below, issue moved to correct repo

[stefanhaller]

Did you mean to post this in the difftastic repository? It doesn't have anything to do with lazygit, it seems.

[sgtrusty]

@stefanhaller you are right! Apologies, this should be in the difftastic repository, I'll create the issue there.

[sgtrusty]

Moved to Wilfred/difftastic#1047

[stefanhaller]

While I have you though: are you using difftastic as your default diff renderer? I'm asking because I'm working on a change that will get rid of the staging view (the one that you get by pressing enter on a file, to stage individual hunks), and include that functionality directly in the main view, using the selected diff renderer. I'm wondering if that's going to work well enough with difftastic. Let me know if you would be interested in helping test that feature.

[sgtrusty]

@stefanhaller that sounds like an amazing change, please include me in your testers plan :) -- I also dislike the view and its too cluttered for my own preferences.

I also made a reference to that in #4915 (comment) ; did you happen to see it? 😆

[stefanhaller]

@stefanhaller that sounds like an amazing change, please include me in your testers plan :) -- I also dislike the view and its too cluttered for my own preferences.

Ok, you might start by watching the video in #5732 then. The prototype in that PR should be useable, but I'm also far enough with implementing it for real that you could test that instead; there's no PR for that yet, but you can check out the branch sh-integration in this repo to get the latest state. (I'm using that branch myself in my daily work.)

You need a patched version of difftastic for this to be fun; you can get it here: Wilfred/difftastic#1014. Without that, the main view will fall back to the plain git diff as soon as you focus it, and you'll lose your scroll position.

I haven't made up my mind how I will go about collecting feedback for this, this is all very fresh; for now, post it on #5732 I guess.

I also made a reference to that in #4915 (comment) ; did you happen to see it? 😆

I haven't paid too much attention to that to be honest; I dislike the split view and have plans to move to different sections for staged and unstaged changes in the side panel, like most other GUI git clients have.

[sgtrusty]

@stefanhaller I am a bit caught up between projects at the moment but I took a look at the metadata spec which is a bit beyond my current knowledge in terms of technicality, regarding SCM and hunk parametrization.

I also looked at the whole video, it was very interesting and I would like to use this tool change soon. The highlight for me was the capability to move between change hunk/diffs with a vim-like easy keybinding with 'n' (and 'p' possibly?). I did run both PRs by Claude for potential memleaks and vulnerabilities (any malformed code or malicious inputs) -- and a few potential improvements (which you may already be aware of) came up.

Path normalization:

• lazygit: pkg/commands/git_commands/patch.go (path traversal)
• difftastic: src/display/diff_line_metadata.rs (unsanitized filenames, critical)

Panic risk:

• lazygit: pkg/commands/patch/parse.go (not introduced by your changes, but neighboring them)

Full "audits" (simple prompt responses by Claude): https://gist.github.com/sgtrusty/2497a8a7af3a0b7741fce6a2f678ae08. Great job with the changes so far, I'll check them out next week as soon as I have a bit more availability.

_{^{Btw, I was surprised at the mention from one of the peers}}

I hadn't hear of Jujutsu as an alternative SCM lib, I thought mercurial SVN and git were the only ones in existance. I was quite surprised by their extensible scripting Lua ecosystem, would be interesting to look into in the future. Just a slight note for future me than anything else.

[stefanhaller]

@sgtrusty Thanks for that AI report, will have a closer look some time.

Meanwhile I have officially opened the stage-hunks-from-main-view feature for testing with a non-prototype build; see here. I would appreciate it if you could find the time to install it and give feedback if you have any.