search

bilelmoussaoui / nautilus-git

Nautilus/Nemo extension to add important information about the current git directory
GNU General Public License v3.0
149 stars 9 forks source link

side-by-side diff view #14

Open patriziobruno opened 7 years ago

patriziobruno commented 7 years ago

Would be great to have a side-by-side view for diffs, as that format is easier to read than the unified format.

fbruetting commented 7 years ago

You could include the relevant code from Meld. Maybe there's even a library for that! :)

bilelmoussaoui commented 7 years ago

@fbruetting I didn't have the time to take a look at how to handle this :) git already provide a bash command to run your favorite diff tool (like meld). at worst i will just make it do the same instead of creating a widget from scratch that handles this specific case

fbruetting commented 7 years ago

Was just an idea, wasn't sure if you knew Meld! :)

bilelmoussaoui commented 7 years ago

@fbruetting There's a built-in library that does handle the diff in python :) shouldn't be too hard to implement. Meld code is so overcomplicated and there's no way to use just their widget...

bilelmoussaoui commented 7 years ago

Not finished yet but looks fine for now :+1: screenshot from 2017-06-09 20-11-55

bilelmoussaoui commented 7 years ago

i've had some time today to work on this, and it looks much better screenshot from 2017-06-15 22-42-06

but not that smart :p (not ready yet) screenshot from 2017-06-15 22-43-07

mchwalisz commented 7 years ago

What about just starting Meld (or similar) and spend effort on other features?

bilelmoussaoui commented 7 years ago

@mchwalisz The whole feature is already on beta branch; i just need to find some time to clean the code a bit before merging it with master. Quite busy those days, i will try to do this as soon as i can :)