feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Git: Warn when commits are not found

Browse Source 
Change-Id: I5e03853f0b658d7f246538ca90e35f38cc2f49d4
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2013-05-31 12:38:48 +03:00
committed by Tobias Hunger
parent 7b5b5b13b4
commit f3eedaf300
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/plugins/git/logchangedialog.cpp
View File

@@ -31,6 +31,8 @@
#include "gitplugin.h" #include "gitplugin.h"
#include "gitclient.h" #include "gitclient.h"
#include <vcsbase/vcsbaseoutputwindow.h>
#include <QTreeView> #include <QTreeView>
#include <QLabel> #include <QLabel>
#include <QPushButton> #include <QPushButton>
@@ -67,8 +69,14 @@ LogChangeWidget::LogChangeWidget(QWidget *parent)
bool LogChangeWidget::init(const QString &repository, const QString &commit, bool includeRemote) 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; 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), selectionModel()->select(m_model->index(0, 0),
QItemSelectionModel::SelectCurrent | QItemSelectionModel::Rows); QItemSelectionModel::SelectCurrent | QItemSelectionModel::Rows);
return true; return true;
@@ -181,7 +189,7 @@ LogChangeDialog::LogChangeDialog(bool isReset, QWidget *parent) :
bool LogChangeDialog::runDialog(const QString &repository, const QString &commit, bool includeRemote) bool LogChangeDialog::runDialog(const QString &repository, const QString &commit, bool includeRemote)
{ {
if (!widget->init(repository, commit, includeRemote)) if (!widget->init(repository, commit, includeRemote))
return QDialog::Rejected; return false;
return QDialog::exec() == QDialog::Accepted; return QDialog::exec() == QDialog::Accepted;
} }