D10883: Ability to view git diff (with difftool) for selected file

Anthony Fieroni noreply at phabricator.kde.org
Sat Mar 17 18:35:20 GMT 2018


anthonyfieroni added inline comments.

INLINE COMMENTS

> fileviewgitplugin.cpp:73
> +    m_diffFileAction = new QAction(this);
> +    m_diffFileAction->setIcon(QIcon::fromTheme("kdiff3"));
> +    m_diffFileAction->setText(xi18nd("@action:inmenu", "<application>Git</application> Diff"));

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

> fileviewgitplugin.cpp:440
> +    arguments << "-y"; //do not prompt before launching a diff tool
> +    arguments << "HEAD";
> +    arguments << "--";

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 ?

REVISION DETAIL
  https://phabricator.kde.org/D10883

To: ZaWertun, #dolphin
Cc: anthonyfieroni, elvisangelaccio
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://mail.kde.org/mailman/private/kfm-devel/attachments/20180317/a6d62def/attachment.htm>


More information about the kfm-devel mailing list