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

PushToGerrit: Pass local branch to determineRemoteBranch

Browse Source 
Simpler

Change-Id: Ice180200a1b78e57b8ff6b246db7b2e8f3b39eb1
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2014-02-14 10:26:18 +02:00
committed by Orgad Shaneh
parent 0c6ee31684
commit 5a562e9239
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -59,7 +59,7 @@ protected:
} }
}; };
QString GerritPushDialog::determineRemoteBranch() QString GerritPushDialog::determineRemoteBranch(const QString &localBranch)
{ {
const QString earliestCommit = m_ui->commitView->earliestCommit(); const QString earliestCommit = m_ui->commitView->earliestCommit();
@@ -74,11 +74,10 @@ QString GerritPushDialog::determineRemoteBranch()
const QString head = QLatin1String("/HEAD"); const QString head = QLatin1String("/HEAD");
QStringList refs = output.split(QLatin1Char('\n')); QStringList refs = output.split(QLatin1Char('\n'));
QString localBranch = m_ui->localBranchComboBox->currentText(); QString remoteTrackingBranch;
if (localBranch == QLatin1String("HEAD")) if (localBranch != QLatin1String("HEAD"))
localBranch.clear(); remoteTrackingBranch = m_client->synchronousTrackingBranch(m_workingDir, localBranch);
const QString remoteTrackingBranch = m_client->synchronousTrackingBranch(m_workingDir,
localBranch);
QString remoteBranch; QString remoteBranch;
foreach (const QString &reference, refs) { foreach (const QString &reference, refs) {
const QString ref = reference.trimmed(); const QString ref = reference.trimmed();
@@ -252,7 +251,7 @@ void GerritPushDialog::updateCommits(int index)
const bool hasLocalCommits = m_ui->commitView->init(m_workingDir, branch, const bool hasLocalCommits = m_ui->commitView->init(m_workingDir, branch,
LogChangeWidget::Silent); LogChangeWidget::Silent);
const QString remoteBranch = determineRemoteBranch(); const QString remoteBranch = determineRemoteBranch(branch);
if (!remoteBranch.isEmpty()) { if (!remoteBranch.isEmpty()) {
const int slash = remoteBranch.indexOf(QLatin1Char('/')); const int slash = remoteBranch.indexOf(QLatin1Char('/'));

2
src/plugins/git/gerrit/gerritpushdialog.h
View File

@@ -68,7 +68,7 @@ private:
typedef QPair<QString, QDate> BranchDate; typedef QPair<QString, QDate> BranchDate;
typedef QMultiMap<QString, BranchDate> RemoteBranchesMap; typedef QMultiMap<QString, BranchDate> RemoteBranchesMap;
QString determineRemoteBranch(); QString determineRemoteBranch(const QString &localBranch);
void initRemoteBranches(); void initRemoteBranches();
QString calculateChangeRange(const QString &branch); QString calculateChangeRange(const QString &branch);
QString m_workingDir; QString m_workingDir;