From be5133cf72fc5c9f140ea090be12798887b885ab Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Wed, 26 Jun 2013 22:16:45 +0300 Subject: Git: Update branches dialog when repository is changed and on fetch Task-number: QTCREATORBUG-9667 Change-Id: Id2e5080502bbc28d5f7900dd0433e468dda56c82 Reviewed-by: Robert Loehning Reviewed-by: Petar Perisin Reviewed-by: Eike Ziller Reviewed-by: hjk --- src/plugins/git/gitplugin.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'src/plugins/git/gitplugin.cpp') diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp index b7d4976978..9d3dda8d81 100644 --- a/src/plugins/git/gitplugin.cpp +++ b/src/plugins/git/gitplugin.cpp @@ -689,6 +689,8 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage) connect(Core::ICore::vcsManager(), SIGNAL(repositoryChanged(QString)), this, SLOT(updateContinueAndAbortCommands())); + connect(Core::ICore::vcsManager(), SIGNAL(repositoryChanged(QString)), + this, SLOT(updateBranches(QString))); if (!Core::ICore::mimeDatabase()->addMimeTypes(QLatin1String(RC_GIT_MIME_XML), errorMessage)) return false; @@ -1427,6 +1429,12 @@ void GitPlugin::updateContinueAndAbortCommands() } } +void GitPlugin::updateBranches(const QString &repository) +{ + if (m_branchDialog && m_branchDialog->isVisible()) + m_branchDialog->refreshIfSame(repository); +} + void GitPlugin::updateRepositoryBrowserAction() { const bool repositoryEnabled = currentState().hasTopLevel(); -- cgit v1.2.1 From 45ccd7d919c23ce816ed180f5bd4ed2f2a186d06 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Sun, 7 Jul 2013 12:57:56 +0300 Subject: Git: Fix crash on checkout branch Task-number: QTCREATORBUG-9756 Change-Id: I3bdba870737bbffde6c0e6a9046a58ba78f097be Reviewed-by: Eike Ziller --- src/plugins/git/gitplugin.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/plugins/git/gitplugin.cpp') diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp index 9d3dda8d81..9f8ba007db 100644 --- a/src/plugins/git/gitplugin.cpp +++ b/src/plugins/git/gitplugin.cpp @@ -690,7 +690,7 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage) connect(Core::ICore::vcsManager(), SIGNAL(repositoryChanged(QString)), this, SLOT(updateContinueAndAbortCommands())); connect(Core::ICore::vcsManager(), SIGNAL(repositoryChanged(QString)), - this, SLOT(updateBranches(QString))); + this, SLOT(updateBranches(QString)), Qt::QueuedConnection); if (!Core::ICore::mimeDatabase()->addMimeTypes(QLatin1String(RC_GIT_MIME_XML), errorMessage)) return false; -- cgit v1.2.1