From 9654df9f1f92ab2c1548c10ca614a6ab82783ac4 Mon Sep 17 00:00:00 2001 From: Andre Hartmann Date: Thu, 25 Apr 2013 13:04:45 +0200 Subject: Git: Allow direct push after commit Git commit dialog: Added a drop-down menu to the commit button to execute "git push" or open the "Push to Gerrit" dialog directly after a commit or amend. Task-number: QTCREATORBUG-8854 Change-Id: I00ff8f816d1768e0cdaf6929126b55826788e578 Reviewed-by: Petar Perisin Reviewed-by: Orgad Shaneh --- src/plugins/git/gitplugin.cpp | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'src/plugins/git/gitplugin.cpp') diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp index bc730a339c..72d9f4bb6d 100644 --- a/src/plugins/git/gitplugin.cpp +++ b/src/plugins/git/gitplugin.cpp @@ -1121,6 +1121,14 @@ bool GitPlugin::submitEditorAboutToClose() m_gitClient->continueCommandIfNeeded(m_submitRepository); } } + + if (m_gitClient->checkCommandInProgress(m_submitRepository) == GitClient::NoCommand) { + if (editor->panelData().pushAction == CommitAndPush) + m_gitClient->push(m_submitRepository); + else if (editor->panelData().pushAction == CommitAndPushToGerrit) + connect(editor, SIGNAL(destroyed()), this, SLOT(delayedPushToGerrit())); + } + return closeEditor; } @@ -1445,6 +1453,11 @@ void GitPlugin::updateContinueAndAbortCommands() } } +void GitPlugin::delayedPushToGerrit() +{ + m_gerritPlugin->push(m_submitRepository); +} + void GitPlugin::updateBranches(const QString &repository) { if (m_branchDialog && m_branchDialog->isVisible()) -- cgit v1.2.1