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

VCS[git]: Make push/pull synchronous commands.

Browse Source 
..for timeout handling to take effect. Also,
log window will update continuously.

Task-number: QTCREATORBUG-777
This commit is contained in:
Friedemann Kleint
2010-05-25 11:48:53 +02:00
parent 385ea8c9e0
commit 1c69b97ca6
5 changed files with 104 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -474,7 +474,7 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
createRepositoryAction(actionManager, subversionMenu,
tr("Fetch"), QLatin1String("Git.Subversion.Fetch"),
globalcontext, false, &GitClient::subversionFetch);
globalcontext, false, &GitClient::synchronousSubversionFetch);
if (0) {
const QList<QAction*> snapShotActions = createSnapShotTestActions();
@@ -735,7 +735,7 @@ void GitPlugin::pull()
case GitClient::StashUnchanged:
case GitClient::Stashed:
case GitClient::NotStashed:
m_gitClient->pull(state.topLevel());
m_gitClient->synchronousPull(state.topLevel());
default:
break;
}
@@ -745,7 +745,7 @@ void GitPlugin::push()
{
const VCSBase::VCSBasePluginState state = currentState();
QTC_ASSERT(state.hasTopLevel(), return)
m_gitClient->push(state.topLevel());
m_gitClient->synchronousPush(state.topLevel());
}
// Retrieve member function of git client stored as user data of action