354706 – comitting single file change first tries to commit all changed files

Bug 354706 - comitting single file change first tries to commit all changed files

Summary: comitting single file change first tries to commit all changed files

Status:	RESOLVED FIXED

Alias:	None

Product:	kdevplatform
Classification:	Developer tools
Component:	git (show other bugs)
Version:	git master
Platform:	Gentoo Packages Linux

Importance:	NOR normal
Target Milestone:	---
Assignee:	kdevelop-bugs-null

URL:
Keywords:

Depends on:
Blocks:

Reported:	2015-11-01 20:26 UTC by Nicolas Werner
Modified:	2016-09-27 21:09 UTC (History)
CC List:	1 user (show)

See Also:
Latest Commit:
Version Fixed In:
Sentry Crash Report:

Attachments
Add an attachment

Note You need to log in before you can comment on or make changes to this bug.

Description Nicolas Werner 2015-11-01 20:26:09 UTC

When changing multiple files if you want to commit them, you get all changed files in the review view. When selecting a single file to commit and clicking commit, a dialogue will ask you to commit all your files. Only canceling that will open a second dialogue with your selected file. This will commit the correct file. Accepting the first dialogue will commit all files.

Reproducible: Always

Steps to Reproduce:
1. Change multiple files in a git project
2. Enter patch review with left click on the project > Git > Commit...
3. Deselect all proposed files (left click > Deselect all)
4. Select the file to commit
5. Enter your commit message
6. Optionally press update (this doesn't show the right overview)
7. Press Commit

Actual Results:  
About to commit dialogue opens, containing all changed files.
Accepting commits those files. Aborting opens the right dialogue.

Expected Results:  
About to commit dialogue opens, containing your selected file.
Accepting will commit only that file.

Git master build of kdev* packages from 31.10.2015. Should be the same as the 5.0 branch.

Comment 1 Nicolas Werner 2015-11-05 23:24:39 UTC

Ok, I got no idea, what's happening.

Changing
    connect( m_plugin->finishReviewAction(), &QAction::triggered, this, &PatchReviewToolView::finishReview );
to
    connect( m_plugin->finishReviewAction(), &QAction::triggered, this, &PatchReviewToolView::finishReview, Qt::UniqueConnection );
at kdevplatform/plugins/patchreview/patchreviewtoolview.cpp:94 doesn't change anything. When I comment this line out, no commit dialogue opens.
I also see nothing wrong in the finishedReview function, it is simply signaled twice. (at least, if I look at it with gdb)
Can anyone with more experience than me take a look?

Further informations about my system:
Kdevplatform:
KDE Frameworks 5.15.0
Qt 5.5.1, kompiliert gegen 5.5.1

Comment 2 Nicolas Werner 2015-11-05 23:35:42 UTC

I forgot to mention, that this also happens if you have all all changes selected. This just doesn't stand out much, as there is no difference in the changes, that will be committed, if you accept the first or the second dialogue. That does however suggest, that the bug is not in the file selection code.

Comment 3 Nicolas Werner 2015-11-06 00:46:15 UTC

Okay, I seem to have gotten somewhat closer to why the signal is triggered:
It seems like the ToolView is created twice. That's why the signal gets called with different parent arguments. I tried backtracing the different calls to createToolView and got this:

First call:
#0  PatchReviewPlugin::createToolView (this=0x884e4a0, parent=0x848d690)
    at /usr/src/debug/dev-util/kdevplatform-9999/kdevplatform-9999/plugins/patchreview/patchreview.cpp:522
#1  0x00007ffff5195431 in Sublime::View::widget (this=this@entry=0x889d6b0, parent=<optimized out>)
    at /usr/src/debug/dev-util/kdevplatform-9999/kdevplatform-9999/sublime/view.cpp:76
#2  0x00007ffff51976d8 in Sublime::IdealController::addView (this=0x7938c0, area=area@entry=Qt::BottomDockWidgetArea,
    view=0x889d6b0) at /usr/src/debug/dev-util/kdevplatform-9999/kdevplatform-9999/sublime/idealcontroller.cpp:87
#3  0x00007ffff518ec0e in Sublime::MainWindowPrivate::IdealToolViewCreator::operator() (this=this@entry=0x7fffffffbef0,
    view=view@entry=0x889d6b0, position=Sublime::Bottom)
    at /usr/src/debug/dev-util/kdevplatform-9999/kdevplatform-9999/sublime/mainwindow_p.cpp:326
#4  0x00007ffff519430d in Sublime::Area::walkToolViews<Sublime::MainWindowPrivate::IdealToolViewCreator> (this=0x9641f0, op=...,
    positions=...) at /usr/src/debug/dev-util/kdevplatform-9999/kdevplatform-9999/sublime/areawalkers.h:59
#5  0x00007ffff518ec9c in Sublime::MainWindowPrivate::toolViewAdded (this=<optimized out>, position=<optimized out>)
    at /usr/src/debug/dev-util/kdevplatform-9999/kdevplatform-9999/sublime/mainwindow_p.cpp:720
#6  0x00007ffff6acf617 in QMetaObject::activate(QObject*, int, int, void**) () from /usr/lib64/libQt5Core.so.5
#7  0x00007ffff519f100 in Sublime::Area::toolViewAdded (this=this@entry=0x9641f0, _t1=_t1@entry=0x889d6b0,
    _t2=_t2@entry=Sublime::Bottom) at /usr/src/debug/dev-util/kdevplatform-9999/kdevplatform-9999_build/sublime/moc_area.cpp:287
#8  0x00007ffff5179949 in Sublime::Area::addToolView (this=this@entry=0x9641f0, view=view@entry=0x889d6b0,
    defaultPosition=<optimized out>) at /usr/src/debug/dev-util/kdevplatform-9999/kdevplatform-9999/sublime/area.cpp:238
#9  0x00007ffff7eac439 in KDevelop::UiController::addToolViewToArea (this=this@entry=0x75c780, factory=factory@entry=0x9912910,
    doc=doc@entry=0x83c40d0, area=0x9641f0, p=p@entry=Sublime::AllPositions)
    at /usr/src/debug/dev-util/kdevplatform-9999/kdevplatform-9999/shell/uicontroller.cpp:695
#10 0x00007ffff7ead3cb in KDevelop::UiController::addToolView (this=0x75c780, name=..., factory=0x9912910)
    at /usr/src/debug/dev-util/kdevplatform-9999/kdevplatform-9999/shell/uicontroller.cpp:340
#11 0x00007fffc005a2a6 in PatchReviewPlugin::PatchReviewPlugin (this=<optimized out>, parent=<optimized out>)
    at /usr/src/debug/dev-util/kdevplatform-9999/kdevplatform-9999/plugins/patchreview/patchreview.cpp:493
#12 0x00007fffc005ebf6 in KPluginFactory::createInstance<PatchReviewPlugin, QObject> (parentWidget=<optimized out>,
    parent=<optimized out>, args=...) at /usr/include/KF5/KCoreAddons/kpluginfactory.h:477
#13 0x00007ffff78e71f0 in KPluginFactory::create(char const*, QWidget*, QObject*, QList<QVariant> const&, QString const&) ()
#14 0x00007ffff7e9d834 in create<KDevelop::IPlugin> (args=..., parent=0x878e90, this=0x9a2c960)
    at /usr/include/KF5/KCoreAddons/kpluginfactory.h:495
#15 KDevelop::PluginController::loadPluginInternal (this=this@entry=0x7cec70, pluginId=...)
    at /usr/src/debug/dev-util/kdevplatform-9999/kdevplatform-9999/shell/plugincontroller.cpp:525
#16 0x00007ffff7e9f71d in operator() (info=..., __closure=<synthetic pointer>)
    at /usr/src/debug/dev-util/kdevplatform-9999/kdevplatform-9999/shell/plugincontroller.cpp:616
#17 foreachEnabledPlugin<KDevelop::PluginController::pluginForExtension(const QString&, const QString&, const QVariantMap&)::<lambda(
const KPluginMetaData&)> > (pluginName=..., constraints=..., extension=..., func=..., this=<optimized out>)
    at /usr/src/debug/dev-util/kdevplatform-9999/kdevplatform-9999/shell/plugincontroller.cpp:220
#18 KDevelop::PluginController::pluginForExtension (this=<optimized out>, extension=..., pluginName=..., constraints=...)
    at /usr/src/debug/dev-util/kdevplatform-9999/kdevplatform-9999/shell/plugincontroller.cpp:619
#19 0x00007ffff50ca6ac in extensionForPlugin<KDevelop::IPatchReview> (pluginName=..., extension=..., this=0x7cec70)
    at /usr/src/debug/dev-util/kdevplatform-9999/kdevplatform-9999/interfaces/iplugincontroller.h:160
#20 showVcsDiff (vcsDiff=vcsDiff@entry=0x7c653f0)
    at /usr/src/debug/dev-util/kdevplatform-9999/kdevplatform-9999/vcs/widgets/vcsdiffpatchsources.cpp:287
#21 0x00007ffff7eb7086 in KDevelop::ProjectController::commitCurrentProject (this=<optimized out>)
    at /usr/src/debug/dev-util/kdevplatform-9999/kdevplatform-9999/shell/projectcontroller.cpp:1099
#22 0x00007ffff6acf617 in QMetaObject::activate(QObject*, int, int, void**) () from /usr/lib64/libQt5Core.so.5
#23 0x00007ffff72c5cb2 in QAction::triggered(bool) () from /usr/lib64/libQt5Widgets.so.5
#24 0x00007ffff72c8058 in QAction::activate(QAction::ActionEvent) () from /usr/lib64/libQt5Widgets.so.5
#25 0x00007ffff73ad260 in ?? () from /usr/lib64/libQt5Widgets.so.5
#26 0x00007ffff73ad38c in QAbstractButton::mouseReleaseEvent(QMouseEvent*) () from /usr/lib64/libQt5Widgets.so.5
#27 0x00007ffff746ee32 in QToolButton::mouseReleaseEvent(QMouseEvent*) () from /usr/lib64/libQt5Widgets.so.5
#28 0x00007ffff73115b0 in QWidget::event(QEvent*) () from /usr/lib64/libQt5Widgets.so.5
#29 0x00007ffff746ef10 in QToolButton::event(QEvent*) () from /usr/lib64/libQt5Widgets.so.5
#30 0x00007ffff72cf51c in QApplicationPrivate::notify_helper(QObject*, QEvent*) () from /usr/lib64/libQt5Widgets.so.5
#31 0x00007ffff72d501e in QApplication::notify(QObject*, QEvent*) () from /usr/lib64/libQt5Widgets.so.5
#32 0x00007ffff6aa89ac in QCoreApplication::notifyInternal(QObject*, QEvent*) () from /usr/lib64/libQt5Core.so.5
#33 0x00007ffff72d3ee2 in QApplicationPrivate::sendMouseEvent(QWidget*, QMouseEvent*, QWidget*, QWidget*, QWidget**, QPointer<QWidget
>&, bool) () from /usr/lib64/libQt5Widgets.so.5
#34 0x00007ffff732b332 in ?? () from /usr/lib64/libQt5Widgets.so.5
#35 0x00007ffff732d8e3 in ?? () from /usr/lib64/libQt5Widgets.so.5
#36 0x00007ffff72cf51c in QApplicationPrivate::notify_helper(QObject*, QEvent*) () from /usr/lib64/libQt5Widgets.so.5
#37 0x00007ffff72d48ed in QApplication::notify(QObject*, QEvent*) () from /usr/lib64/libQt5Widgets.so.5
#38 0x00007ffff6aa89ac in QCoreApplication::notifyInternal(QObject*, QEvent*) () from /usr/lib64/libQt5Core.so.5
#39 0x00007ffff6dc90fc in QGuiApplicationPrivate::processMouseEvent(QWindowSystemInterfacePrivate::MouseEvent*) ()
   from /usr/lib64/libQt5Gui.so.5
#40 0x00007ffff6dcaedd in QGuiApplicationPrivate::processWindowSystemEvent(QWindowSystemInterfacePrivate::WindowSystemEvent*) ()
   from /usr/lib64/libQt5Gui.so.5
#41 0x00007ffff6db379f in QWindowSystemInterface::sendWindowSystemEvents(QFlags<QEventLoop::ProcessEventsFlag>) ()
   from /usr/lib64/libQt5Gui.so.5
#42 0x00007fffe8083680 in ?? () from /usr/lib64/libQt5XcbQpa.so.5
#43 0x00007ffff2030bbe in g_main_context_dispatch () from /usr/lib64/libglib-2.0.so.0
#44 0x00007ffff2030e20 in ?? () from /usr/lib64/libglib-2.0.so.0
#45 0x00007ffff2030ecc in g_main_context_iteration () from /usr/lib64/libglib-2.0.so.0
#46 0x00007ffff6af3637 in QEventDispatcherGlib::processEvents(QFlags<QEventLoop::ProcessEventsFlag>) ()
   from /usr/lib64/libQt5Core.so.5
#47 0x00007ffff6aa791a in QEventLoop::exec(QFlags<QEventLoop::ProcessEventsFlag>) () from /usr/lib64/libQt5Core.so.5
#48 0x00007ffff6aae87c in QCoreApplication::exec() () from /usr/lib64/libQt5Core.so.5
#49 0x000000000040df39 in main (argc=1, argv=<optimized out>)
    at /usr/src/debug/dev-util/kdevelop-9999/kdevelop-9999/app/main.cpp:646

Second call:
#0  PatchReviewPlugin::createToolView (this=0x884e4a0, parent=0x9df5860)
    at /usr/src/debug/dev-util/kdevplatform-9999/kdevplatform-9999/plugins/patchreview/patchreview.cpp:522
#1  0x00007ffff5195431 in Sublime::View::widget (this=this@entry=0x9b80fd0, parent=<optimized out>)
    at /usr/src/debug/dev-util/kdevplatform-9999/kdevplatform-9999/sublime/view.cpp:76
#2  0x00007ffff51976d8 in Sublime::IdealController::addView (this=0x7938c0, area=area@entry=Qt::BottomDockWidgetArea,
    view=0x9b80fd0) at /usr/src/debug/dev-util/kdevplatform-9999/kdevplatform-9999/sublime/idealcontroller.cpp:87
#3  0x00007ffff518ec0e in Sublime::MainWindowPrivate::IdealToolViewCreator::operator() (this=this@entry=0x7fffffffcd10,
    view=view@entry=0x9b80fd0, position=Sublime::Bottom)
    at /usr/src/debug/dev-util/kdevplatform-9999/kdevplatform-9999/sublime/mainwindow_p.cpp:326
#4  0x00007ffff519430d in Sublime::Area::walkToolViews<Sublime::MainWindowPrivate::IdealToolViewCreator> (this=0x973060, op=...,
    positions=positions@entry=...) at /usr/src/debug/dev-util/kdevplatform-9999/kdevplatform-9999/sublime/areawalkers.h:59
#5  0x00007ffff5192330 in Sublime::MainWindowPrivate::reconstruct (this=0x8b2390)
    at /usr/src/debug/dev-util/kdevplatform-9999/kdevplatform-9999/sublime/mainwindow_p.cpp:449
#6  0x00007ffff5188e46 in Sublime::MainWindow::setArea (this=0x635730, area=area@entry=0x973060)
    at /usr/src/debug/dev-util/kdevplatform-9999/kdevplatform-9999/sublime/mainwindow.cpp:125
#7  0x00007ffff5194acb in Sublime::MainWindowOperator::setArea (this=this@entry=0x75c780, w=<optimized out>,
    area=area@entry=0x973060) at /usr/src/debug/dev-util/kdevplatform-9999/kdevplatform-9999/sublime/mainwindowoperator.cpp:27
#8  0x00007ffff5182f9e in Sublime::Controller::showAreaInternal (this=this@entry=0x75c780, area=area@entry=0x973060,
    mainWindow=<optimized out>) at /usr/src/debug/dev-util/kdevplatform-9999/kdevplatform-9999/sublime/controller.cpp:133
#9  0x00007ffff518380c in Sublime::Controller::showArea (this=0x75c780, areaTypeId=..., mainWindow=0x635730)
    at /usr/src/debug/dev-util/kdevplatform-9999/kdevplatform-9999/sublime/controller.cpp:165
#10 0x00007fffc0059219 in PatchReviewPlugin::switchToEmptyReviewArea (this=this@entry=0x884e4a0)
    at /usr/src/debug/dev-util/kdevplatform-9999/kdevplatform-9999/plugins/patchreview/patchreview.cpp:379
#11 0x00007fffc005d6a0 in PatchReviewPlugin::updateReview (this=0x884e4a0)
    at /usr/src/debug/dev-util/kdevplatform-9999/kdevplatform-9999/plugins/patchreview/patchreview.cpp:396
#12 0x00007ffff6ad0781 in QObject::event(QEvent*) () from /usr/lib64/libQt5Core.so.5
#13 0x00007ffff72cf51c in QApplicationPrivate::notify_helper(QObject*, QEvent*) () from /usr/lib64/libQt5Widgets.so.5
#14 0x00007ffff72d48ed in QApplication::notify(QObject*, QEvent*) () from /usr/lib64/libQt5Widgets.so.5
#15 0x00007ffff6aa89ac in QCoreApplication::notifyInternal(QObject*, QEvent*) () from /usr/lib64/libQt5Core.so.5
#16 0x00007ffff6aab43c in QCoreApplicationPrivate::sendPostedEvents(QObject*, int, QThreadData*) () from /usr/lib64/libQt5Core.so.5
#17 0x00007ffff6af35c3 in ?? () from /usr/lib64/libQt5Core.so.5
#18 0x00007ffff2030bbe in g_main_context_dispatch () from /usr/lib64/libglib-2.0.so.0
#19 0x00007ffff2030e20 in ?? () from /usr/lib64/libglib-2.0.so.0
#20 0x00007ffff2030ecc in g_main_context_iteration () from /usr/lib64/libglib-2.0.so.0
#21 0x00007ffff6af3637 in QEventDispatcherGlib::processEvents(QFlags<QEventLoop::ProcessEventsFlag>) ()
   from /usr/lib64/libQt5Core.so.5
#22 0x00007ffff6aa791a in QEventLoop::exec(QFlags<QEventLoop::ProcessEventsFlag>) () from /usr/lib64/libQt5Core.so.5
#23 0x00007ffff6aae87c in QCoreApplication::exec() () from /usr/lib64/libQt5Core.so.5
#24 0x000000000040df39 in main (argc=1, argv=<optimized out>)
    at /usr/src/debug/dev-util/kdevelop-9999/kdevelop-9999/app/main.cpp:646

It looks like when switching areas somewhere the signals aren't properly disconnected or so? Maybe I can look into this issue a bit more, but I won't be at home the next few days...

Comment 4 Aleix Pol 2016-09-06 19:23:18 UTC

If I follow the steps you described, it shows me the following error:
"error: No files or message specified"

Can you checked if the behavior changed during that time? If you can still reproduce please reopen.

Comment 5 Nicolas Werner 2016-09-27 21:09:29 UTC

Can't reproduce it any more. Seems to be fixed and work as intended now.