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

Gerrit: Warn when probably pushing to wrong branch

Browse Source 
For rebase/merge strategies, this can cause real problems (when the target
branch is forwarded to a more recent branch...)

Task-number: QTCREATORBUG-20062
Change-Id: Ic7c282a1e0571b31d9333290141817c59daa0e7a
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Orgad Shaneh
2018-04-30 17:20:11 +03:00
committed by Orgad Shaneh
parent 9b4fabd29e
commit 366b813c5c
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/git/gerrit/gerritpushdialog.cpp
View File

@@ -32,7 +32,9 @@
#include "../gitconstants.h" #include "../gitconstants.h"
#include <utils/icon.h> #include <utils/icon.h>
#include <utils/theme/theme.h>
#include <QApplication>
#include <QDateTime> #include <QDateTime>
#include <QDir> #include <QDir>
#include <QPushButton> #include <QPushButton>
@@ -44,6 +46,8 @@ using namespace Git::Internal;
namespace Gerrit { namespace Gerrit {
namespace Internal { namespace Internal {
static const int ReasonableDistance = 100;
class PushItemDelegate : public IconItemDelegate class PushItemDelegate : public IconItemDelegate
{ {
public: public:
@@ -207,8 +211,18 @@ void GerritPushDialog::setChangeRange()
} }
m_ui->infoLabel->show(); m_ui->infoLabel->show();
const QString remote = selectedRemoteName() + '/' + remoteBranchName; const QString remote = selectedRemoteName() + '/' + remoteBranchName;
m_ui->infoLabel->setText( QString labelText = tr("Number of commits between %1 and %2: %3").arg(branch, remote, range);
tr("Number of commits between %1 and %2: %3").arg(branch, remote, range)); const int currentRange = range.toInt();
QPalette palette = QApplication::palette();
if (currentRange > ReasonableDistance) {
const QColor errorColor = Utils::creatorTheme()->color(Utils::Theme::TextColorError);
palette.setColor(QPalette::Foreground, errorColor);
palette.setColor(QPalette::ButtonText, errorColor);
labelText.append("\n" + tr("Are you sure you selected the right target branch?"));
}
m_ui->infoLabel->setPalette(palette);
m_ui->targetBranchComboBox->setPalette(palette);
m_ui->infoLabel->setText(labelText);
} }
static bool versionSupportsWip(const QString &version) static bool versionSupportsWip(const QString &version)