diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2013-07-26 17:24:13 +0300 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2013-07-29 10:33:18 +0200 |
| commit | 60fa56db8e0220b255f07aceb8742e6c7491d10d (patch) | |
| tree | 01a44ed6386581514fb8eb91c0fdad26838d2411 /src | |
| parent | 044a78f7501518e89615390a467a1fc1026efc0e (diff) | |
| download | qt-creator-60fa56db8e0220b255f07aceb8742e6c7491d10d.tar.gz | |
Git: Initialize remote model directory even when no remotes found
Task-number: QTCREATORBUG-9789
Change-Id: If3626e244b9d85ad670d586438710e17bba8e927
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/git/remotedialog.cpp | 9 | ||||
| -rw-r--r-- | src/plugins/git/remotedialog.h | 2 | ||||
| -rw-r--r-- | src/plugins/git/remotemodel.cpp | 3 |
3 files changed, 6 insertions, 8 deletions
diff --git a/src/plugins/git/remotedialog.cpp b/src/plugins/git/remotedialog.cpp index 9807816829..db4cb86759 100644 --- a/src/plugins/git/remotedialog.cpp +++ b/src/plugins/git/remotedialog.cpp @@ -118,16 +118,15 @@ RemoteDialog::~RemoteDialog() void RemoteDialog::refresh(const QString &repository, bool force) { - if (m_repository == repository && !force) + if (m_remoteModel->workingDirectory() == repository && !force) return; // Refresh - m_repository = repository; - m_ui->repositoryLabel->setText(StashDialog::msgRepositoryLabel(m_repository)); - if (m_repository.isEmpty()) { + m_ui->repositoryLabel->setText(StashDialog::msgRepositoryLabel(repository)); + if (repository.isEmpty()) { m_remoteModel->clear(); } else { QString errorMessage; - if (!m_remoteModel->refresh(m_repository, &errorMessage)) + if (!m_remoteModel->refresh(repository, &errorMessage)) VcsBase::VcsBaseOutputWindow::instance()->appendError(errorMessage); } } diff --git a/src/plugins/git/remotedialog.h b/src/plugins/git/remotedialog.h index 7a8d00900b..7ab485ef04 100644 --- a/src/plugins/git/remotedialog.h +++ b/src/plugins/git/remotedialog.h @@ -92,8 +92,6 @@ private: RemoteModel *m_remoteModel; RemoteAdditionDialog *m_addDialog; - - QString m_repository; }; } // namespace Internal diff --git a/src/plugins/git/remotemodel.cpp b/src/plugins/git/remotemodel.cpp index d7ad7a3147..b6f0933e7c 100644 --- a/src/plugins/git/remotemodel.cpp +++ b/src/plugins/git/remotemodel.cpp @@ -177,6 +177,8 @@ void RemoteModel::clear() bool RemoteModel::refresh(const QString &workingDirectory, QString *errorMessage) { + m_workingDirectory = workingDirectory; + // get list of remotes. QMap<QString,QString> remotesList = m_client->synchronousRemotesList(workingDirectory, errorMessage); @@ -184,7 +186,6 @@ bool RemoteModel::refresh(const QString &workingDirectory, QString *errorMessage if (remotesList.isEmpty()) return false; - m_workingDirectory = workingDirectory; beginResetModel(); m_remotes.clear(); foreach (const QString &remoteName, remotesList.keys()) { |