From f3eedaf3000ca948816028b8e4902994bbc8db65 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Fri, 31 May 2013 12:38:48 +0300 Subject: [PATCH] Git: Warn when commits are not found Change-Id: I5e03853f0b658d7f246538ca90e35f38cc2f49d4 Reviewed-by: Tobias Hunger --- src/plugins/git/logchangedialog.cpp | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/plugins/git/logchangedialog.cpp b/src/plugins/git/logchangedialog.cpp index 78cf8b04d52..373e8f37e87 100644 --- a/src/plugins/git/logchangedialog.cpp +++ b/src/plugins/git/logchangedialog.cpp @@ -31,6 +31,8 @@ #include "gitplugin.h" #include "gitclient.h" +#include + #include #include #include @@ -67,8 +69,14 @@ LogChangeWidget::LogChangeWidget(QWidget *parent) bool LogChangeWidget::init(const QString &repository, const QString &commit, bool includeRemote) { - if (!populateLog(repository, commit, includeRemote) || !m_model->rowCount()) + if (!populateLog(repository, commit, includeRemote)) return false; + if (!m_model->rowCount()) { + VcsBase::VcsBaseOutputWindow::instance()->appendError( + includeRemote ? tr("No commits were found") + : tr("No local commits were found")); + return false; + } selectionModel()->select(m_model->index(0, 0), QItemSelectionModel::SelectCurrent | QItemSelectionModel::Rows); return true; @@ -181,7 +189,7 @@ LogChangeDialog::LogChangeDialog(bool isReset, QWidget *parent) : bool LogChangeDialog::runDialog(const QString &repository, const QString &commit, bool includeRemote) { if (!widget->init(repository, commit, includeRemote)) - return QDialog::Rejected; + return false; return QDialog::exec() == QDialog::Accepted; }