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

Git: Initialize remote model directory even when no remotes found

Browse Source 
Task-number: QTCREATORBUG-9789
Change-Id: If3626e244b9d85ad670d586438710e17bba8e927
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2013-07-26 17:24:13 +03:00
committed by Orgad Shaneh
parent 044a78f750
commit 60fa56db8e
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/git/remotedialog.cpp
View File

@@ -118,16 +118,15 @@ RemoteDialog::~RemoteDialog()
void RemoteDialog::refresh(const QString &repository, bool force) void RemoteDialog::refresh(const QString &repository, bool force)
{ {
if (m_repository == repository && !force) if (m_remoteModel->workingDirectory() == repository && !force)
return; return;
// Refresh // Refresh
m_repository = repository; m_ui->repositoryLabel->setText(StashDialog::msgRepositoryLabel(repository));
m_ui->repositoryLabel->setText(StashDialog::msgRepositoryLabel(m_repository)); if (repository.isEmpty()) {
if (m_repository.isEmpty()) {
m_remoteModel->clear(); m_remoteModel->clear();
} else { } else {
QString errorMessage; QString errorMessage;
if (!m_remoteModel->refresh(m_repository, &errorMessage)) if (!m_remoteModel->refresh(repository, &errorMessage))
VcsBase::VcsBaseOutputWindow::instance()->appendError(errorMessage); VcsBase::VcsBaseOutputWindow::instance()->appendError(errorMessage);
} }
} }

2
src/plugins/git/remotedialog.h
View File

@@ -92,8 +92,6 @@ private:
RemoteModel *m_remoteModel; RemoteModel *m_remoteModel;
RemoteAdditionDialog *m_addDialog; RemoteAdditionDialog *m_addDialog;
QString m_repository;
}; };
} // namespace Internal } // namespace Internal

3
src/plugins/git/remotemodel.cpp
View File

@@ -177,6 +177,8 @@ void RemoteModel::clear()
bool RemoteModel::refresh(const QString &workingDirectory, QString *errorMessage) bool RemoteModel::refresh(const QString &workingDirectory, QString *errorMessage)
{ {
m_workingDirectory = workingDirectory;
// get list of remotes. // get list of remotes.
QMap<QString,QString> remotesList = QMap<QString,QString> remotesList =
m_client->synchronousRemotesList(workingDirectory, errorMessage); m_client->synchronousRemotesList(workingDirectory, errorMessage);
@@ -184,7 +186,6 @@ bool RemoteModel::refresh(const QString &workingDirectory, QString *errorMessage
if (remotesList.isEmpty()) if (remotesList.isEmpty())
return false; return false;
m_workingDirectory = workingDirectory;
beginResetModel(); beginResetModel();
m_remotes.clear(); m_remotes.clear();
foreach (const QString &remoteName, remotesList.keys()) { foreach (const QString &remoteName, remotesList.keys()) {