nautilus-git icon indicating copy to clipboard operation
nautilus-git copied to clipboard

side-by-side diff view

Open patriziobruno opened this issue 7 years ago • 8 comments

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

patriziobruno avatar Apr 21 '17 09:04 patriziobruno

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

fbruetting avatar May 01 '17 21:05 fbruetting

@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

bilelmoussaoui avatar May 01 '17 21:05 bilelmoussaoui

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

fbruetting avatar May 01 '17 22:05 fbruetting

@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 avatar Jun 04 '17 01:06 bilelmoussaoui

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

bilelmoussaoui avatar Jun 09 '17 18:06 bilelmoussaoui

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

bilelmoussaoui avatar Jun 15 '17 20:06 bilelmoussaoui

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

mchwalisz avatar Aug 09 '17 13:08 mchwalisz

@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 :)

bilelmoussaoui avatar Aug 09 '17 14:08 bilelmoussaoui