forked from qt-creator/qt-creator
Git: Allow reviewers specification in Push to Gerrit dialog
Change-Id: I6126411209d73797cc7e4f7c15a6a49b50366c63 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
committed by
Orgad Shaneh
parent
bfa85a509d
commit
fb40fd8297
@@ -379,6 +379,18 @@ void GerritPlugin::push()
|
||||
|
||||
QStringList args;
|
||||
|
||||
const QStringList reviewers = dialog->reviewers().split(QLatin1Char(','),
|
||||
QString::SkipEmptyParts);
|
||||
if (!reviewers.isEmpty()) {
|
||||
QString reviewersFlag(QLatin1String("--receive-pack=git receive-pack"));
|
||||
foreach (const QString &reviewer, reviewers) {
|
||||
const QString name = reviewer.trimmed();
|
||||
if (!name.isEmpty())
|
||||
reviewersFlag += QString::fromLatin1(" --reviewer=") + name;
|
||||
}
|
||||
args << reviewersFlag;
|
||||
}
|
||||
|
||||
args << dialog->selectedRemoteName();
|
||||
QString target = QLatin1String("HEAD:refs/") + dialog->selectedPushType() +
|
||||
QLatin1Char('/') + dialog->selectedRemoteBranchName();
|
||||
|
||||
@@ -202,5 +202,10 @@ QString GerritPushDialog::selectedTopic() const
|
||||
return m_ui->topicLineEdit->text().trimmed();
|
||||
}
|
||||
|
||||
QString GerritPushDialog::reviewers() const
|
||||
{
|
||||
return m_ui->reviewersLineEdit->text();
|
||||
}
|
||||
|
||||
} // namespace Internal
|
||||
} // namespace Gerrit
|
||||
|
||||
@@ -51,6 +51,7 @@ public:
|
||||
QString selectedRemoteBranchName() const;
|
||||
QString selectedPushType() const;
|
||||
QString selectedTopic() const;
|
||||
QString reviewers() const;
|
||||
bool localChangesFound() const;
|
||||
|
||||
private slots:
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>306</width>
|
||||
<height>331</height>
|
||||
<height>407</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
@@ -69,9 +69,9 @@
|
||||
<string>Remote Branch:</string>
|
||||
</property>
|
||||
<layout class="QFormLayout" name="formLayout">
|
||||
<item row="1" column="1">
|
||||
<widget class="QComboBox" name="remoteComboBox"/>
|
||||
</item>
|
||||
<property name="fieldGrowthPolicy">
|
||||
<enum>QFormLayout::AllNonFixedFieldsGrow</enum>
|
||||
</property>
|
||||
<item row="1" column="0">
|
||||
<widget class="QLabel" name="remoteLabel">
|
||||
<property name="text">
|
||||
@@ -82,6 +82,9 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1">
|
||||
<widget class="QComboBox" name="remoteComboBox"/>
|
||||
</item>
|
||||
<item row="2" column="0">
|
||||
<widget class="QLabel" name="branchLabel">
|
||||
<property name="text">
|
||||
@@ -98,7 +101,7 @@
|
||||
<item row="3" column="0">
|
||||
<widget class="QLabel" name="topicLabel">
|
||||
<property name="text">
|
||||
<string>&Topic</string>
|
||||
<string>&Topic:</string>
|
||||
</property>
|
||||
<property name="buddy">
|
||||
<cstring>topicLineEdit</cstring>
|
||||
@@ -111,6 +114,29 @@
|
||||
</layout>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<layout class="QFormLayout" name="reveiwersLayout">
|
||||
<item row="0" column="0">
|
||||
<widget class="QLabel" name="reviewersLabel">
|
||||
<property name="text">
|
||||
<string>R&eviewers:</string>
|
||||
</property>
|
||||
<property name="buddy">
|
||||
<cstring>reviewersLineEdit</cstring>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="1">
|
||||
<widget class="QLineEdit" name="reviewersLineEdit">
|
||||
<property name="toolTip">
|
||||
<string>Comma-separated list of reviewers.
|
||||
|
||||
Partial names can be used if they are unambiguous.</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QLabel" name="infoLabel">
|
||||
<property name="text">
|
||||
|
||||
Reference in New Issue
Block a user