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

Git: Update branches dialog when repository is changed

Browse Source 
and on fetch

Task-number: QTCREATORBUG-9667
Change-Id: Id2e5080502bbc28d5f7900dd0433e468dda56c82
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
Orgad Shaneh
2013-06-26 22:16:45 +03:00
committed by Orgad Shaneh
parent 0159774451
commit be5133cf72
6 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/git/branchdialog.cpp
View File

@@ -97,6 +97,12 @@ void BranchDialog::refresh(const QString &repository, bool force)
m_ui->branchView->expandAll();
}
void BranchDialog::refreshIfSame(const QString &repository)
{
if (m_repository == repository)
refresh();
}
void BranchDialog::enableButtons()
{
QModelIndex idx = selectedIndex();

1
src/plugins/git/branchdialog.h
View File

@@ -61,6 +61,7 @@ public:
public slots:
void refresh(const QString &repository, bool force);
void refreshIfSame(const QString &repository);
private slots:
void enableButtons();

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

@@ -2331,6 +2331,11 @@ void GitClient::finishSubmoduleUpdate()
m_updatedSubmodules.clear();
}
void GitClient::fetchFinished(const QVariant &cookie)
{
GitPlugin::instance()->updateBranches(cookie.toString());
}
// Trim a git status file spec: "modified: foo .cpp" -> "modified: foo .cpp"
static inline QString trimFileSpecification(QString fileSpec)
{
@@ -2930,7 +2935,9 @@ void GitClient::fetch(const QString &workingDirectory, const QString &remote)
{
QStringList arguments(QLatin1String("fetch"));
arguments << (remote.isEmpty() ? QLatin1String("--all") : remote);
executeGit(workingDirectory, arguments, 0, true);
VcsBase::Command *command = executeGit(workingDirectory, arguments, 0, true);
command->setCookie(workingDirectory);
connect(command, SIGNAL(success(QVariant)), this, SLOT(fetchFinished(QVariant)));
}
bool GitClient::executeAndHandleConflicts(const QString &workingDirectory,

1
src/plugins/git/gitclient.h
View File

@@ -323,6 +323,7 @@ private slots:
void appendOutputData(const QByteArray &data) const;
void appendOutputDataSilently(const QByteArray &data) const;
void finishSubmoduleUpdate();
void fetchFinished(const QVariant &cookie);
private:
QTextCodec *getSourceCodec(const QString &file) const;

8
src/plugins/git/gitplugin.cpp
View File

@@ -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();

1
src/plugins/git/gitplugin.h
View File

@@ -102,6 +102,7 @@ public:
public slots:
void startCommit();
void updateBranches(const QString &repository);
private slots:
void diffCurrentFile();