Differential D10883

Ability to view git diff (with difftool) for selected file
Needs RevisionPublic
Actions

Authored by ZaWertun on Feb 27 2018, 11:16 AM.

Details

Reviewers
elvisangelaccio
meven
Group Reviewers
Dolphin
Summary

Example:

Diff Detail

Lint
Lint Skipped
Unit
Unit Tests Skipped
ZaWertun requested review of this revision.Feb 27 2018, 11:16 AM
ZaWertun created this revision.
ZaWertun added a reviewer: Dolphin.
elvisangelaccio added a subscriber: elvisangelaccio.Mar 15 2018, 10:25 PM
elvisangelaccio added inline comments.
git/fileviewgitplugin.cpp
75–76

Please use the new connect syntax here.

ZaWertun updated this revision to Diff 29757.Mar 17 2018, 4:08 PM

New signal slot syntax

anthonyfieroni added a subscriber: anthonyfieroni.Mar 17 2018, 6:35 PM
anthonyfieroni added inline comments.
git/fileviewgitplugin.cpp
73

Use view-split-left-right as same as directory diff

440

HEAD is not wanted her or we should sync with directory one. If you make a changes to file then commit but not push, then make changes again, HEAD will show 2 changes rather than only last one. It's expected ?

anthonyfieroni added inline comments.Dec 27 2019, 1:14 PM
git/fileviewgitplugin.cpp
440

Remove HEAD as parameter here, we don't want to have diff against HEAD but against last commit.

ZaWertun updated this revision to Diff 72248.Dec 27 2019, 2:09 PM
ZaWertun marked an inline comment as done.
anthonyfieroni added inline comments.Dec 27 2019, 2:14 PM
git/fileviewgitplugin.cpp
73

kdiff3 is application, view-split-left-right is what we want to match directory action icon.

anthonyfieroni added inline comments.Dec 27 2019, 2:18 PM
git/fileviewgitplugin.cpp
74

Show Local <application>Git</application> Changes as line 80

ZaWertun updated this revision to Diff 72250.Dec 27 2019, 2:25 PM
meven added a comment.Jan 4 2020, 1:43 PM

Looks good to me

meven accepted this revision as: meven.Jan 4 2020, 1:44 PM
This revision is now accepted and ready to land.Jan 4 2020, 1:44 PM
anthonyfieroni added inline comments.Jan 4 2020, 2:44 PM
git/fileviewgitplugin.cpp
73

Still not changed kdiff3 to view-split-left-right

meven requested changes to this revision.Jan 4 2020, 2:57 PM

Use view-split-left-right as icon

This revision now requires changes to proceed.Jan 4 2020, 2:57 PM

Revision Contents
Changeset List

PathPackages
Mgit/fileviewgitplugin.h (2 lines)
Mgit/fileviewgitplugin.cpp (27 lines)

Diff 72250

View Options

git/fileviewgitplugin.h

Loading...
View Options

git/fileviewgitplugin.cpp

Loading...